diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml index 860a54c94a74..9677f6b7aa2e 100644 --- a/.github/ISSUE_TEMPLATE/01_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml @@ -121,6 +121,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml index 22ab5035ff6b..efdd09a02a5b 100644 --- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml +++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml @@ -135,6 +135,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml index 7922c4508455..41b10ea75e50 100644 --- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml +++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml @@ -125,6 +125,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index 28aead4e1935..cd673601ea83 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -131,6 +131,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml index f13338bea71c..21466ba01fb1 100644 --- a/.github/ISSUE_TEMPLATE/05_update_request.yml +++ b/.github/ISSUE_TEMPLATE/05_update_request.yml @@ -104,6 +104,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml index 416d1166bec1..ce64b1c47517 100644 --- a/.github/ISSUE_TEMPLATE/06_module_request.yml +++ b/.github/ISSUE_TEMPLATE/06_module_request.yml @@ -79,6 +79,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/07_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml index c03306938a22..767d25176634 100644 --- a/.github/ISSUE_TEMPLATE/07_backport_request.yml +++ b/.github/ISSUE_TEMPLATE/07_backport_request.yml @@ -85,6 +85,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/08_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml index 0fc240e64cd5..608a4ba4da84 100644 --- a/.github/ISSUE_TEMPLATE/08_documentation_request.yml +++ b/.github/ISSUE_TEMPLATE/08_documentation_request.yml @@ -67,6 +67,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml index 658223e75465..e29a11380acb 100644 --- a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml +++ b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml @@ -137,6 +137,8 @@ body: 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 + - label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with it." + required: true - type: "markdown" attributes: value: | diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 45a55eb45dce..8f2c6648efe4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -27,12 +27,14 @@ For new packages please briefly describe the package or provide a link to its ho - [ ] Module addition: when adding a new NixOS module. - [ ] Module update: when the change is significant. - [ ] Fits [CONTRIBUTING.md], [pkgs/README.md], [maintainers/README.md] and other READMEs. +- [ ] Follows the [automation/AI policy]. [NixOS tests]: https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests [Package tests]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests [nixpkgs-review usage]: https://github.com/Mic92/nixpkgs-review#usage [CONTRIBUTING.md]: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md +[automation/AI policy]: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy [lib/tests]: https://github.com/NixOS/nixpkgs/blob/master/lib/tests [maintainers/README.md]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md [nixos/tests]: https://github.com/NixOS/nixpkgs/blob/master/nixos/tests diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d2b42e194d2..3fd9c4234f36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -206,7 +206,7 @@ For example, if you make a change to `texlive`, you probably would only check th #### Meets Nixpkgs contribution standards -The last checkbox is about whether it fits the guidelines in this `CONTRIBUTING.md` file. +The last two checkboxes are about whether it fits the guidelines in this `CONTRIBUTING.md` file. This document details our standards for commit messages, reviews, licensing of contributions, etc... Everyone should read and understand these standards before submitting a pull request. @@ -888,3 +888,77 @@ As mentioned previously, it is unfortunately perfectly normal for a PR to sit ar Please don't blow up situations where progress is happening but is merely not going fast enough for your tastes. Honking in a traffic jam will not make you go any faster. + +# Automation/AI policy + +Every contribution to Nixpkgs and related development venues, including code, documentation, and communication on GitHub and Matrix, must have a **responsible person in the loop** who is accountable for that contribution and reviews it before submission, and must **transparently disclose** any non‐trivial use of automation to produce it, including but not limited to LLM‐based AI tools. + +The following sections give more detail. + +## Scope + +Any use of automated tools to generate non‐trivial amounts of output as part of a contribution, in whole or in part, verbatim or edited, is covered by this policy, except as listed in the Exemptions section. +Both LLM‐based AI tools and hand‐written automation are covered. +Contributions include code and documentation in commits, commit messages, pull request summaries and reviews, issue and vulnerability reports, GitHub comments, Matrix messages, and Discourse posts. +The covered venues are the GitHub repositories for Nixpkgs and [related projects](https://github.com/orgs/NixOS/teams/nixpkgs-core/repositories) under the jurisdiction of the Nixpkgs core team, Matrix rooms that are focused on development of those projects, and Discourse topics about Nixpkgs development. + +## Accountability + +Everyone who submits a contribution to Nixpkgs is responsible for it, regardless of the use of automated tooling. +Before submission, they must establish a reasonable level of understanding of the contribution and expectation of its correctness. +A contributor submitting a contribution intended for inclusion in Nixpkgs is also responsible for ensuring that it is [appropriately licensed](https://github.com/NixOS/nixpkgs/blob/master/COPYING) and credited, and not encumbered by any incompatible copyright. + +When output from automated tooling is used in contributions, a contributor must establish confidence in that output. +This can be achieved by establishing confidence in the correctness of the tooling’s logic, manual review of the included output, or using further automation to verify the output (e.g. programmatically checking whether a refactor avoids causing rebuilds). +As the inner workings of LLM‐based AI tools cannot be sufficiently understood at present, only the latter two options are available when those are used; vibe coding without review is not permitted. +When automation is used to verify output, the verification tooling itself must be disclosed and reviewed in line with this policy. + +This policy applies equally to any further discussion of a contribution. +Comments and reviews must separately satisfy the same requirements of understanding, review, and disclosure. +Contributors are expected to be able to answer questions about their contribution and respond to feedback appropriately, without simply forwarding messages back and forth to automated tools. + +It is not permitted to submit automated contributions without any manual review or intervention, outside of standard community automation. +Automation without any manual review must not be used as the sole arbiter of whether to merge a change. + +## Transparency + +All covered use of automated tooling for a contribution must be disclosed as part of that contribution. + +In the case of LLM‐based AI tooling used for commits, this **must** be in the form of an `Assisted-by:` Git commit trailer, including at least the tool name and the primary model name and version used for the contribution. +A `Co-authored-by:` trailer does not satisfy this policy. + +Any adequate form of disclosure is permitted for other kinds of tooling and contribution. +Pull request summaries and review comments must be disclosed separately to commits. + +## Exemptions + +The following situations are fully or partially exempt: + +* Use of standard deterministic editor/IDE/formatter/text transformation tooling to produce changes that the author manually reviews and understands is exempt, including inline “auto‐completion” (even if LLM‐based) of short, rote snippets of text that do not contribute anything beyond boilerplate the author would have written anyway. + +* Use of standard community automation is exempt, such as `nix-update`, the official Nixpkgs CI bots, the @r-ryantm update bot, other maintainer‐approved bots that run update scripts, and the Nixpkgs security tracker bot. + +* Use of AI tools for research, testing, debugging, or private review is out of scope, if no substantial amount of their output is included in the resulting contribution. + However, if these tools had a significant technical influence on your contribution, you are still responsible for it per the Accountability section, and are expected to disclose this where relevant. + +* Use of machine translation is exempt from the requirement to understand the translated output. + However, the requirements of appropriate confidence in the original text, responsibility, and disclosure still apply, and you are encouraged to additionally include the original untranslated contribution. + +* Use of automation in a contribution clearly marked as not being ready for merge (e.g. a draft pull request) is exempt from the requirement for full self‐review, as long as some amount of review has been done and it is expected that the requirements will be met by the time it is marked as ready. + This does not waive any other requirement. + +* Use of automated tools to develop upstream software packaged inside Nixpkgs is not in scope. + +## Enforcement + +If you believe that someone is using automation without appropriate disclosure and review, you can politely ask them if that’s the case and point them to this policy as appropriate. +Please assume good faith and remain civil; it’s not always possible to determine, and it is more likely that someone overlooked this policy than deliberately violated it. +If you think someone is continuing to break the policy after this, please escalate to the [Nixpkgs core team](https://nixos.org/community/teams/nixpkgs-core/) rather than fighting over it. + +If a contribution is clearly in violation of the policy (e.g. the contributor admits it was not followed, or there are AI tool attributions that do not meet our required format), it can be closed or hidden, preferably after informing the contributor of the policy and giving them a chance to address the violations. +Deliberate violations of this policy are considered to break the [Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) clause against “Wasting other people’s time with low quality contributions, including but not limited to LLM and bot spam”. +Repeated violations are grounds for further moderation action. + +## Credits + +This policy takes inspiration from similar policies in [LLVM](https://llvm.org/docs/AIToolPolicy.html), [Mesa](https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-26.1.0-rc1/docs/submittingpatches.rst?ref_type=tags), [Fedora](https://docs.fedoraproject.org/en-US/council/policy/ai-contribution-policy/), and the [Linux kernel](https://docs.kernel.org/7.0/process/coding-assistants.html), along with [a proposal by the author of Anubis](https://xeiaso.net/notes/2025/assisted-by-footer/). diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 0fa2851ff38b..c952499cec54 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -483,7 +483,6 @@ module.exports = async ({ github, context, core, dry }) => { dry, pull_request, reviews, - events, // TODO: Use maintainer map instead of the artifact. user_maintainers: Object.keys( JSON.parse( diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js index 6fc6ede00f96..be458ba4eb32 100644 --- a/ci/github-script/reviewers.js +++ b/ci/github-script/reviewers.js @@ -6,7 +6,6 @@ async function handleReviewers({ dry, pull_request, reviews, - events, user_maintainers, team_maintainers, owners, @@ -15,28 +14,20 @@ async function handleReviewers({ }) { const pull_number = pull_request.number - // Users currently requested for review (pending). - const pending_users = new Set( - pull_request.requested_reviewers.map(({ login }) => login.toLowerCase()), - ) - // Users who actually submitted a review in this PR (any state, including DISMISSED). - const users_engaged = new Set( - reviews.map(({ user }) => user.login.toLowerCase()), - ) - // Users the PR has already reached: pending OR engaged. - const users_reached = pending_users.union(users_engaged) + // Users that the PR has already reached, e.g. they've left a review or have been requested for one + const users_reached = new Set([ + ...pull_request.requested_reviewers.map(({ login }) => login.toLowerCase()), + ...reviews.map(({ user }) => user.login.toLowerCase()), + ]) log('reviewers - users_reached', Array.from(users_reached).join(', ')) - // Same for teams. A team is engaged only via `onBehalfOf` reviews. - const pending_teams = new Set( - pull_request.requested_teams.map(({ slug }) => slug.toLowerCase()), - ) - const teams_engaged = new Set( - reviews.flatMap(({ onBehalfOf }) => + // Same for teams + const teams_reached = new Set([ + ...pull_request.requested_teams.map(({ slug }) => slug.toLowerCase()), + ...reviews.flatMap(({ onBehalfOf }) => onBehalfOf.nodes.map(({ slug }) => slug.toLowerCase()), ), - ) - const teams_reached = pending_teams.union(teams_engaged) + ]) log('reviewers - teams_reached', Array.from(teams_reached).join(', ')) // Early sanity check, before we start making any API requests. The list of maintainers @@ -158,101 +149,37 @@ async function handleReviewers({ ) log('reviewers - teams_not_yet_reached', teams_not_yet_reached.join(', ')) - // The usernames of bots that make review requests we may auto-revoke. - const revokable_requesters = ['github-actions[bot]', 'nixpkgs-ci[bot]'] - - // Find latest `review_requested` actor per reviewer / team. - const last_request_actor_for_user = new Map() - const last_request_actor_for_team = new Map() - for (const ev of events) { - if (ev.event !== 'review_requested') continue - if (ev.requested_reviewer?.login) { - last_request_actor_for_user.set( - ev.requested_reviewer.login.toLowerCase(), - ev.actor?.login ?? '', - ) - } - if (ev.requested_team?.slug) { - last_request_actor_for_team.set( - ev.requested_team.slug.toLowerCase(), - ev.actor?.login ?? '', - ) - } - } - - // Pending requests no longer in the to_reach set, excluding the engaged - // and anything not requested by our own bot. - const users_to_remove = Array.from( - pending_users.difference(users_to_reach).difference(users_engaged), - ).filter((login) => - revokable_requesters.includes(last_request_actor_for_user.get(login)), - ) - log('reviewers - users_to_remove', users_to_remove.join(', ')) - - // Same for teams. - const teams_to_remove = Array.from( - pending_teams.difference(teams_to_reach).difference(teams_engaged), - ).filter((slug) => - revokable_requesters.includes(last_request_actor_for_team.get(slug)), - ) - log('reviewers - teams_to_remove', teams_to_remove.join(', ')) - - const has_adds = - users_not_yet_reached.length > 0 || teams_not_yet_reached.length > 0 - const has_removals = users_to_remove.length > 0 || teams_to_remove.length > 0 - - if (!has_adds && !has_removals) { + if ( + users_not_yet_reached.length === 0 && + teams_not_yet_reached.length === 0 + ) { log('Has reviewer changes', 'false (skipped)') } else if (dry) { - if (has_adds) { - core.info( - `Requesting user reviewers for #${pull_number}: ${users_not_yet_reached.join(', ')} (dry)`, - ) - core.info( - `Requesting team reviewers for #${pull_number}: ${teams_not_yet_reached.join(', ')} (dry)`, - ) - } - if (has_removals) { - core.info( - `Revoking stale reviewers for #${pull_number}: users=[${users_to_remove.join(', ')}], teams=[${teams_to_remove.join(', ')}] (dry)`, - ) - } + core.info( + `Requesting user reviewers for #${pull_number}: ${users_not_yet_reached.join(', ')} (dry)`, + ) + core.info( + `Requesting team reviewers for #${pull_number}: ${teams_not_yet_reached.join(', ')} (dry)`, + ) } else { // We had tried the "request all reviewers at once" thing in the past, but it didn't work out: // https://github.com/NixOS/nixpkgs/commit/034613f860fcd339bd2c20c8f6bc259a2f9dc034 // If we're hitting API errors here again, we'll need to investigate - and possibly reverse // course. - // Add and remove sets are disjoint by construction. Parallel is safe. - await Promise.all( - [ - has_adds && - github.rest.pulls.requestReviewers({ - ...context.repo, - pull_number, - reviewers: users_not_yet_reached, - team_reviewers: teams_not_yet_reached, - }), - has_removals && - github.rest.pulls.removeRequestedReviewers({ - ...context.repo, - pull_number, - reviewers: users_to_remove, - team_reviewers: teams_to_remove, - }), - ].filter(Boolean), - ) + await github.rest.pulls.requestReviewers({ + ...context.repo, + pull_number, + reviewers: users_not_yet_reached, + team_reviewers: teams_not_yet_reached, + }) } - // Subtract the just-revoked so revoking the last pending reviewer flips the label. - const users_still_reached = users_reached.difference(new Set(users_to_remove)) - const teams_still_reached = teams_reached.difference(new Set(teams_to_remove)) - // Return a boolean on whether the "needs: reviewers" label should be set. return ( users_not_yet_reached.length === 0 && teams_not_yet_reached.length === 0 && - users_still_reached.size === 0 && - teams_still_reached.size === 0 + users_reached.size === 0 && + teams_reached.size === 0 ) } diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix index 2b8d6b5f2470..a77c9d5dd6f8 100644 --- a/doc/doc-support/epub.nix +++ b/doc/doc-support/epub.nix @@ -37,16 +37,16 @@ runCommand "manual.epub" ''; - passAsFile = [ "epub" ]; + __structuredAttrs = true; } '' mkdir scratch - xsltproc \ + printf "%s" "$epub" | xsltproc \ --param chapter.autolabel 0 \ --nonet \ --output scratch/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $epubPath + - echo "application/epub+zip" > mimetype zip -0Xq -b "$TMPDIR" "$out" mimetype diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index d7bb32d856af..b79e6e60493a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -871,6 +871,15 @@ general. A number of other parameters can be overridden: (hello { }).override { extraRustcOpts = "-Z debuginfo=2"; } ``` +- Extra arguments passed to `rustc` when the crate is a proc-macro, + replacing `extraRustcOpts`. Useful to keep instrumentation flags + (sanitizers, coverage) off host dylibs. Defaults to `null`, which + inherits `extraRustcOpts`: + + ```nix + (myProcMacro { }).override { extraRustcOptsForProcMacro = [ ]; } + ``` + - The lint level cap passed to `rustc`. Defaults to `null`, which auto-resolves to `"allow"` (silences all lints) when `lints` is empty, or `"forbid"` (no cap) when `lints` is set. Because `rustc` diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index be6156e37c28..8543f1c32907 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -204,8 +204,8 @@ lib.mapAttrs mkLicense ( }; bola11 = { - url = "https://blitiri.com.ar/p/bola/"; - fullName = "Buena Onda License Agreement 1.1"; + spdxId = "BOLA-1.1"; + fullName = "Buena Onda License Agreement v1.1"; }; boost = { @@ -326,8 +326,8 @@ lib.mapAttrs mkLicense ( }; capec = { - fullName = "Common Attack Pattern Enumeration and Classification"; - url = "https://capec.mitre.org/about/termsofuse.html"; + fullName = "Common Attack Pattern Enumeration and Classification License"; + spdxId = "CAPEC-tou"; }; clArtistic = { @@ -475,6 +475,11 @@ lib.mapAttrs mkLicense ( fullName = "CeCILL-C Free Software License Agreement"; }; + cfitsio = { + spdxId = "CFITSIO"; + fullName = "CFITSIO License"; + }; + classpathException20 = { spdxId = "Classpath-exception-2.0"; fullName = "Classpath exception 2.0"; @@ -760,14 +765,7 @@ lib.mapAttrs mkLicense ( hpndSellVariantSafetyClause = { fullName = "HPND - sell variant with safety critical systems clause"; - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo/-/blob/68a5b6d98ae34749cca889f4373b4043d00bfe6a/src/voodoo_dga.c#L12-33"; - # TODO: if the license gets accepted to spdx then - # add spdxId - # else - # remove license - # && replace reference with whatever this license is supposed to be then - # https://github.com/spdx/license-list-XML/issues/2922 - # spdxId = "HPND-sell-variant-safety-clause"; + spdxId = "HPND-sell-variant-critical-systems"; }; hpndDec = { @@ -1257,8 +1255,8 @@ lib.mapAttrs mkLicense ( }; paratype = { - fullName = "ParaType Free Font Licensing Agreement"; - url = "https://web.archive.org/web/20161209023955/http://www.paratype.ru/public/pt_openlicense_eng.asp"; + spdxId = "ParaType-Free-Font-1.3"; + fullName = "ParaType Free Font Licensing Agreement v1.3"; }; parity70 = { @@ -1337,7 +1335,8 @@ lib.mapAttrs mkLicense ( # Gentoo seems to treat it as a license: # https://gitweb.gentoo.org/repo/gentoo.git/tree/licenses/SGMLUG?id=7d999af4a47bf55e53e54713d98d145f935935c1 sgmlug = { - fullName = "SGML UG SGML Parser Materials license"; + spdxId = "SGMLUG-PM"; + fullName = "SGMLUG Parser Materials License"; }; sissl11 = { @@ -1434,11 +1433,8 @@ lib.mapAttrs mkLicense ( }; tekHvcLicense = { + spdxId = "TekHVC"; fullName = "TekHVC License"; - url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/7f8305c779ac6948d7261764f5ffb8ae9aa975b1/COPYING#L138-171"; - # TODO: add spdxId when it gets accepted to spdx - # https://tools.spdx.org/app/license_requests/458 - # https://github.com/spdx/license-list-XML/issues/2757 }; torque11 = { @@ -1459,8 +1455,8 @@ lib.mapAttrs mkLicense ( }; tost = { + spdxId = "Pixar"; fullName = "Tomorrow Open Source Technology License 1.0"; - url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"; }; ubdlException = { diff --git a/lib/trivial.nix b/lib/trivial.nix index fcd9a8791dcf..fd48a0456b66 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1101,11 +1101,10 @@ in ``` */ functionArgs = - f: - if f ? __functor then - f.__functionArgs or (functionArgs (f.__functor f)) - else - builtins.functionArgs f; + let + functionArgs = builtins.functionArgs; + in + f: if f ? __functor then f.__functionArgs or (functionArgs (f.__functor f)) else functionArgs f; /** Check whether something is a function or something @@ -1123,7 +1122,11 @@ in isFunction : Any -> Bool ``` */ - isFunction = f: builtins.isFunction f || (f ? __functor && isFunction (f.__functor f)); + isFunction = + let + isFunction = builtins.isFunction; + in + f: isFunction f || (f ? __functor && isFunction (f.__functor f)); /** `mirrorFunctionArgs f g` creates a new function `g'` with the same behavior as `g` (`g' x == g x`) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d02117ff6d45..39262cf203c9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11203,13 +11203,6 @@ githubId = 2332070; name = "Serge Baltic"; }; - hyshka = { - name = "Bryan Hyshka"; - email = "bryan@hyshka.com"; - github = "hyshka"; - githubId = 2090758; - keys = [ { fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; } ]; - }; hythera = { name = "Hythera"; github = "Hythera"; @@ -11386,6 +11379,12 @@ githubId = 12570166; name = "Igor Ramazanov"; }; + igorcafe = { + email = "igoracmelo@protonmail.com"; + github = "igorcafe"; + githubId = 85039990; + name = "Igor Melo"; + }; igsha = { email = "igor.sharonov@gmail.com"; github = "igsha"; @@ -11675,6 +11674,12 @@ name = "Silvan Mosberger"; keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ]; }; + iniw = { + email = "git@vini.cat"; + github = "iniw"; + githubId = 30220881; + name = "Vinicius Deolindo"; + }; insipx = { email = "github@andrewplaza.dev"; github = "insipx"; @@ -25672,6 +25677,11 @@ github = "skohtv"; githubId = 101289702; }; + skonotopov = { + name = "Sergey Konotopov"; + github = "kinkou"; + githubId = 931329; + }; skovati = { github = "skovati"; githubId = 49844593; @@ -28697,6 +28707,12 @@ github = "usrfriendly"; githubId = 2502060; }; + usu171 = { + email = "usu171@proton.me"; + github = "Usu171"; + githubId = 52230991; + name = "Usu171"; + }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; @@ -29086,12 +29102,6 @@ githubId = 59029586; name = "Vitor Pavan"; }; - vizanto = { - email = "danny@prime.vc"; - github = "vizanto"; - githubId = 326263; - name = "Danny Wilson"; - }; vizid = { email = "mail@vizqq.cc"; github = "ViZiD"; @@ -29329,6 +29339,11 @@ githubId = 115360611; name = "Wölfchen"; }; + w1lldu = { + name = "William Du"; + github = "w1lldu"; + githubId = 70287641; + }; waelwindows = { email = "waelwindows9922@gmail.com"; github = "Waelwindows"; @@ -29627,6 +29642,12 @@ githubId = 5185341; name = "Will Cohen"; }; + WillemToorenburgh = { + email = "willemtoorenburgh@gmail.com"; + github = "willemtoorenburgh"; + githubId = 50425141; + name = "Willem Toorenburgh"; + }; willfish = { email = "willfish@pescado.mozmail.com"; github = "willfish"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7db072c80629..a62d6279a230 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -435,6 +435,7 @@ with lib.maintainers; libretro = { members = [ aanderse + igorcafe thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 137010637f09..c8afe6167a7d 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -250,17 +250,17 @@ rec { ''; - passAsFile = [ "doc" ]; + __structuredAttrs = true; } '' # Generate the epub manual. dst=$out/${common.outputPath} - xsltproc \ + printf "%s" "$doc" | xsltproc \ --param chapter.autolabel 0 \ --nonet --xinclude --output $dst/epub/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $docPath + - echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 0cc258346b8e..3569cdb0abdb 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -98,6 +98,8 @@ - [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable) +- [clevis-luks-askpass](https://github.com/latchset/clevis), automatic LUKS unlocking in initrd using clevis token bindings stored in LUKS headers. Available as [boot.initrd.clevisLuksAskpass](#opt-boot.initrd.clevisLuksAskpass.enable). + - [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable). - [hyprwhspr-rs](https://github.com/better-slop/hyprwhspr-rs), a keybind activated speech-to-text voice dictation utility built for use with Hyprland. Available as `services.hyprwhspr-rs` diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 3d043b330fc7..5b9d862db823 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -36,16 +36,23 @@ in i18n = { glibcLocales = lib.mkOption { - type = lib.types.path; - default = pkgs.glibcLocales.override { - allLocales = lib.elem "all" cfg.supportedLocales; - locales = cfg.supportedLocales; - }; + type = lib.types.nullOr lib.types.path; + default = + if pkgs.glibcLocales != null then + pkgs.glibcLocales.override { + allLocales = lib.elem "all" cfg.supportedLocales; + locales = cfg.supportedLocales; + } + else + null; defaultText = lib.literalExpression '' - pkgs.glibcLocales.override { - allLocales = lib.elem "all" config.i18n.supportedLocales; - locales = config.i18n.supportedLocales; - } + if pkgs.glibcLocales != null then + pkgs.glibcLocales.override { + allLocales = lib.elem "all" config.i18n.supportedLocales; + locales = config.i18n.supportedLocales; + } + else + null ''; example = lib.literalExpression "pkgs.glibcLocales"; description = '' @@ -186,7 +193,9 @@ in environment.systemPackages = # We increase the priority a little, so that plain glibc in systemPackages can't win. - lib.optional (cfg.supportedLocales != [ ]) (lib.setPrio (-1) cfg.glibcLocales); + lib.optional (cfg.glibcLocales != null && cfg.supportedLocales != [ ]) ( + lib.setPrio (-1) cfg.glibcLocales + ); environment.sessionVariables = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; @@ -200,7 +209,7 @@ in // cfg.extraLocaleSettings ); - systemd.globalEnvironment = lib.mkIf (cfg.supportedLocales != [ ]) { + systemd.globalEnvironment = lib.mkIf (cfg.glibcLocales != null && cfg.supportedLocales != [ ]) { LOCALE_ARCHIVE = "${cfg.glibcLocales}/lib/locale/locale-archive"; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 370dc1fc5ee1..6995f3ba1ed2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1366,6 +1366,7 @@ ./services/networking/rdnssd.nix ./services/networking/realm.nix ./services/networking/redsocks.nix + ./services/networking/reframe.nix ./services/networking/resilio.nix ./services/networking/robustirc-bridge.nix ./services/networking/rosenpass.nix @@ -1896,6 +1897,7 @@ ./system/activation/switchable-system.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix + ./system/boot/clevis-luks-askpass.nix ./system/boot/clevis.nix ./system/boot/emergency-mode.nix ./system/boot/grow-partition.nix diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 744f7af70fe5..8e6e7ea3f2f4 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -83,6 +83,15 @@ in { environment.systemPackages = [ cfg.package ]; + # Hyprland needs permissions to give itself SCHED_RR on startup: + # https://github.com/hyprwm/Hyprland/blob/main/src/init/initHelpers.cpp + security.wrappers.Hyprland = { + owner = "root"; + group = "root"; + capabilities = "cap_sys_nice+ep"; + source = lib.getExe cfg.package; + }; + xdg.portal = { enable = true; extraPortals = [ cfg.portalPackage ]; diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index 4929681b56b7..a449916a4641 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -95,7 +95,9 @@ in include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base" ${pkgs.stdenv.cc.libc}/share/locale/** r, ${pkgs.stdenv.cc.libc}/share/locale.alias r, - ${config.i18n.glibcLocales}/lib/locale/locale-archive r, + ${lib.optionalString ( + config.i18n.glibcLocales != null + ) "${config.i18n.glibcLocales}/lib/locale/locale-archive r,"} ${etcRule "localtime"} ${pkgs.tzdata}/share/zoneinfo/** r, ${pkgs.stdenv.cc.libc}/share/i18n/** r, diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index 353db2e2207c..1ae773c35bcd 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -77,6 +77,8 @@ let BindReadOnlyPaths = [ "/etc" "/run/systemd" + ] + ++ lib.optionals (config.i18n.glibcLocales != null) [ "${config.i18n.glibcLocales}" ] ++ mapAttrsToList (name: inbox: inbox.description) cfg.inboxes diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 15fe66fac29f..3e93b6fe444e 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -10,6 +10,12 @@ let format = pkgs.formats.keyValue { listsAsDuplicateKeys = true; }; cfgfile = format.generate "minidlna.conf" cfg.settings; + # Match a media_dir entry under /home, allowing an optional `A,`/`V,`/`P,` + # media-type prefix. + mediaDirsUnderHome = lib.any ( + dir: builtins.match "([AVP],)?/home/.*" dir != null + ) cfg.settings.media_dir; + in { options.services.minidlna.enable = lib.mkEnableOption "MiniDLNA, a simple DLNA server. Consider adding `openFirewall = true` into your config"; @@ -133,6 +139,49 @@ in RuntimeDirectory = "minidlna"; PIDFile = "/run/minidlna/pid"; ExecStart = "${lib.getExe cfg.package} -S -P /run/minidlna/pid -f ${cfgfile}"; + + # Hardening + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + # Many users keep media under /home; auto-disable ProtectHome when + # any media_dir entry is under /home. Override explicitly to force. + ProtectHome = lib.mkDefault (!mediaDirsUnderHome); + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + # AF_NETLINK is required for getifaddrs() to enumerate interfaces + # for SSDP multicast (239.255.255.250:1900) advertisements. + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; }; }; }; diff --git a/nixos/modules/services/networking/pihole-ftl-setup-script.nix b/nixos/modules/services/networking/pihole-ftl-setup-script.nix index 692d9fc2b050..944d180dda17 100644 --- a/nixos/modules/services/networking/pihole-ftl-setup-script.nix +++ b/nixos/modules/services/networking/pihole-ftl-setup-script.nix @@ -41,7 +41,8 @@ in local payload="$1" echo "Adding list: $payload" - local result=$(PostFTLData "lists" "$payload") + local type=$($jq -r '.type' <<< "$payload") + local result=$(PostFTLData "lists?type=$type" "$payload") local error="$($jq '.error' <<< "$result")" if [[ "$error" != "null" ]]; then diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 28b8a06c2271..7081bd73c16e 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -1010,12 +1010,11 @@ in { User = cfg.user; Group = cfg.group; - Type = "simple"; + Type = "notify-reload"; RuntimeDirectory = "prosody"; PIDFile = "/run/prosody/prosody.pid"; Environment = "PROSODY_CONFIG=/run/prosody/prosody.cfg.lua"; ExecStart = "${lib.getExe cfg.package} -F"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abnormal"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/networking/reframe.nix b/nixos/modules/services/networking/reframe.nix index 81e1f4ab1e16..7bd9ff892a40 100644 --- a/nixos/modules/services/networking/reframe.nix +++ b/nixos/modules/services/networking/reframe.nix @@ -6,160 +6,47 @@ }: let cfg = config.services.reframe; - iniFmt = pkgs.formats.ini { }; + settingsFormat = pkgs.formats.ini { }; in { options.services.reframe = { enable = lib.mkEnableOption "DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login…"; package = lib.mkPackageOption pkgs "reframe" { }; configs = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule { - options = { + type = lib.types.submodule { + freeformType = settingsFormat.type; + }; + default = { }; + + description = "Configurations for ReFrame"; + example = '' + { + main = { reframe = { - card = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Select monitor via DRM card. All available cards and connectors can be found in `/sys/class/drm/`."; - example = "card0"; - }; - connector = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Select monitor via connector. All available cards and connectors can be found in `/sys/class/drm/`."; - example = "eDP-1"; - }; - rotation = lib.mkOption { - type = lib.types.enum [ - 0 - 90 - 180 - 270 - ]; - default = 0; - description = '' - This is the angle you rotate the monitor, not the angle of display content relative to the monitor! - Valid angles are clockwise `0`, `90`, `180`, `270`. - ''; - }; - desktop-width = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If you have more than 1 monitor, set those values to the logical size of the whole virtual desktop. - You can get those value by finding the pointer position of the right most and bottom most border of your monitors. - ''; - }; - desktop-height = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If you have more than 1 monitor, set those values to the logical size of the whole virtual desktop. - You can get those value by finding the pointer position of the right most and bottom most border of your monitors. - ''; - }; - monitor-x = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If you have more than 1 monitor, set those values to the logical position of the top left corner of your selected monitor. - ''; - }; - monitor-y = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If you have more than 1 monitor, set those values to the logical position of the top left corner of your selected monitor. - ''; - }; - default-width = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If your client does not support resizing, use those to force a size. Empty or `0` means monitor size. - ''; - }; - default-height = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - If your client does not support resizing, use those to force a size. Empty or `0` means monitor size. - ''; - }; - resize = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Set to `false` to prohibit client resizing. - ''; - }; - cursor = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Set to `false` to ignore DRM cursor plane. - ''; - }; - wakeup = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Set to `false` if you already disabled automatic screen blank. - ''; - }; - damage = lib.mkOption { - type = lib.types.enum [ - "" - "cpu" - "gpu" - ]; - default = "cpu"; - description = '' - Set to `gpu` to use GPU damage region detection, which may be more efficiency but may cause artifacts depending on GPU vendors. - Set to `cpu` to use CPU damage region detection if you get bugs with `gpu`. - Empty to disable damage region detection, which may require higher network bandwidth. - ''; - }; - fps = lib.mkOption { - type = lib.types.int; - default = 30; - }; + card = "card0"; + connector = "eDP-1"; + rotation = 0; + desktop-width = 1920; + desktop-height = 1080; + monitor-x = 0; + monitor-y = 0; + default-width = 1920; + default-height = 1080; + resize = true; + cursor = true; + wakeup = true; + damage = "cpu"; + fps = 30; }; vnc = { - ip = lib.mkOption { - type = lib.types.str; - default = ""; - description = '' - Empty means accept all incoming connections. - ''; - }; - port = lib.mkOption { - type = lib.types.port; - default = 5933; - }; - password = lib.mkOption { - type = lib.types.str; - default = ""; - description = '' - Empty means no password. - ''; - }; - type = lib.mkOption { - type = lib.types.enum [ - "libvncserver" - "neatvnc" - ]; - default = "libvncserver"; - description = '' - Set to `neatvnc` to prefer neatvnc, which provides more efficient encoding methods but maybe more unstable. - ''; - }; + ip = "0.0.0.0"; + port = 5933; + password = "password"; + type = "libvncserver"; }; }; } - ); - default = { }; - description = "Configurations for ReFrame"; + ''; }; }; @@ -179,7 +66,7 @@ in mode = "0644"; user = "root"; group = "root"; - source = iniFmt.generate "${name}.conf" value; + source = settingsFormat.generate "${name}.conf" value; } ) cfg.configs; systemd.services = lib.mapAttrs' ( diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index dd322f468f3b..a1e9f9c23d80 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -39,8 +39,12 @@ let # Ensure that clipboard works for non-ASCII characters sed -i -e '/.*SessionVariables.*/ a\ - LANG=${config.i18n.defaultLocale}\ - LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive + LANG=${config.i18n.defaultLocale}${ + lib.optionalString (config.i18n.glibcLocales != null) '' + \ + LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive + '' + } ' $out/sesman.ini ${cfg.extraConfDirCommands} diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix index ae42d30168ab..42089dd56dcb 100644 --- a/nixos/modules/services/scheduling/prefect.nix +++ b/nixos/modules/services/scheduling/prefect.nix @@ -174,7 +174,7 @@ in ProtectControlGroups = true; MemoryAccounting = true; - ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}"; + ExecStart = "${lib.getExe cfg.package} server start --host ${cfg.host} --port ${toString cfg.port}"; Restart = "always"; WorkingDirectory = cfg.dataDir; }; @@ -216,7 +216,7 @@ in ProtectControlGroups = true; MemoryAccounting = true; ExecStart = '' - ${pkgs.prefect}/bin/prefect worker start \ + ${lib.getExe cfg.package} worker start \ --pool ${poolName} \ --type process \ --install-policy ${poolCfg.installPolicy} diff --git a/nixos/modules/services/web-apps/goupile.nix b/nixos/modules/services/web-apps/goupile.nix index 0cb986e1c7f4..2472cc3588a5 100644 --- a/nixos/modules/services/web-apps/goupile.nix +++ b/nixos/modules/services/web-apps/goupile.nix @@ -60,7 +60,8 @@ in hostName = lib.mkOption { type = lib.types.str; - default = "goupile"; + default = config.networking.fqdnOrHostName; + defaultText = lib.literalExpression "config.networking.fqdnOrHostName"; description = "Nginx service name for goupile service."; }; }; @@ -70,7 +71,7 @@ in services.nginx = { enable = lib.mkDefault true; virtualHosts.${cfg.hostName} = { - locations."/".proxyPass = "http://${cfg.hostName}:${builtins.toString cfg.settings.HTTP.Port}"; + locations."/".proxyPass = "http://127.0.0.1:${builtins.toString cfg.settings.HTTP.Port}"; }; }; } diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 2fd1332d5f9b..2130427813f5 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -149,7 +149,10 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service"; + requires = lib.optionals cfg.createDatabaseLocally [ + "miniflux-dbsetup.service" + "postgresql.target" + ]; after = [ "network.target" ] diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index f6a52ea808e3..a99e882a884a 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -50,7 +50,7 @@ in epkgs: [ epkgs.emms epkgs.magit - epkgs.proofgeneral + epkgs.proof-general ] ''; description = '' diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index d34223bc96a1..7919cc5804aa 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -58,7 +58,11 @@ --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \ --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \ --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \ - --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \ + ${ + lib.optionalString ( + config.i18n.glibcLocales != null + ) "--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive" + } \ --set SYSTEMD ${config.systemd.package} ) ''; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 8ac90f40663d..5273b55b7308 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -353,7 +353,6 @@ in # Legacy environment variables. These were used by the activation script, # but some other script might still depend on them, although unlikely. installBootLoader = config.system.build.installBootLoader; - localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive"; distroId = config.system.nixos.distroId; perl = pkgs.perl.withPackages ( p: with p; [ @@ -376,6 +375,9 @@ in # option, as opposed to `system.extraDependencies`. passedChecks = concatStringsSep " " config.system.checks; } + // lib.optionalAttrs (config.i18n.glibcLocales != null) { + localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive"; + } // lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != [ ]) { closureInfo = pkgs.closureInfo { rootPaths = [ diff --git a/nixos/modules/system/boot/clevis-luks-askpass.nix b/nixos/modules/system/boot/clevis-luks-askpass.nix new file mode 100644 index 000000000000..1d9685ff889c --- /dev/null +++ b/nixos/modules/system/boot/clevis-luks-askpass.nix @@ -0,0 +1,84 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.boot.initrd.clevisLuksAskpass; +in +{ + options = { + boot.initrd.clevisLuksAskpass.enable = lib.mkEnableOption '' + clevis-luks-askpass in initrd. + + Watches for systemd password requests during boot and answers them + using clevis tokens bound to LUKS headers. Runs in parallel with + the interactive password prompt. If clevis cannot unlock a device + (tang unreachable, no binding, etc.) the user can still type the + passphrase. + + Prerequisites: + - Bind clevis to each LUKS device: + clevis luks bind -d /dev/xxx tang '{"url":"..."}' + - Configure networking in the initrd so tang servers are reachable + ''; + + boot.initrd.clevisLuksAskpass.package = lib.mkPackageOption pkgs "clevis" { }; + + boot.initrd.clevisLuksAskpass.useTang = lib.mkOption { + description = "Whether the Clevis headers used to decrypt the devices uses a Tang server as a pin."; + default = false; + type = lib.types.bool; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = "clevis-luks-askpass requires boot.initrd.systemd.enable = true"; + } + ]; + + warnings = + if + cfg.useTang && !config.boot.initrd.network.enable && !config.boot.initrd.systemd.network.enable + then + [ "In order to use a Tang pinned secret you must configure networking in initrd" ] + else + [ ]; + + boot.initrd.systemd = { + # Install upstream clevis-luks-askpass.path and clevis-luks-askpass.service into the initrd + packages = [ cfg.package ]; + + storePaths = [ + cfg.package + "${pkgs.systemd}/lib/systemd/systemd-reply-password" + "${pkgs.jose}/bin/jose" + "${pkgs.curl}/bin/curl" + "${pkgs.cryptsetup}/bin/cryptsetup" + "${pkgs.gnused}/bin/sed" + "${pkgs.gnugrep}/bin/grep" + "${pkgs.gawk}/bin/gawk" + "${pkgs.coreutils}/bin/cat" + "${pkgs.luksmeta}/bin/luksmeta" + "${pkgs.tpm2-tools}/bin/tpm2_createprimary" + "${pkgs.tpm2-tools}/bin/tpm2_flushcontext" + "${pkgs.tpm2-tools}/bin/tpm2_load" + "${pkgs.tpm2-tools}/bin/tpm2_unseal" + ]; + + # This is in the [Install] section of clevis-luks-askpass.path but that's not processed in nixos so we add it here + paths.clevis-luks-askpass = { + wantedBy = [ "cryptsetup.target" ]; + }; + + services.clevis-luks-askpass = { + wants = lib.optional cfg.useTang "network-online.target"; + after = lib.optional cfg.useTang "network-online.target"; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a533680a6539..18116432d358 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -1114,7 +1114,6 @@ in -> all (dev: dev.preOpenCommands == "" && dev.postOpenCommands == "") (attrValues luks.devices); message = "boot.initrd.luks.devices..preOpenCommands and postOpenCommands is not supported by systemd stage 1. Please bind a service to cryptsetup.target or cryptsetup-pre.target instead."; } - # TODO { assertion = config.boot.initrd.systemd.enable -> !luks.gpgSupport; message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.gpgSupport"; @@ -1123,7 +1122,6 @@ in assertion = config.boot.initrd.systemd.enable -> !luks.fido2Support; message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.fido2Support"; } - # TODO { assertion = config.boot.initrd.systemd.enable -> !luks.yubikeySupport; message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.yubikeySupport"; diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix index dcdd08b24783..2703d60428f1 100644 --- a/nixos/modules/system/boot/systemd/tpm2.nix +++ b/nixos/modules/system/boot/systemd/tpm2.nix @@ -9,19 +9,8 @@ imports = [ (lib.mkRenamedOptionModule - [ - "boot" - "initrd" - "systemd" - "enableTpm2" - ] - [ - "boot" - "initrd" - "systemd" - "tpm2" - "enable" - ] + [ "boot" "initrd" "systemd" "enableTpm2" ] + [ "boot" "initrd" "systemd" "tpm2" "enable" ] ) ]; @@ -31,13 +20,18 @@ defaultText = "systemd.package.withTpm2Units"; }; + systemd.tpm2.pcrphases.enable = lib.mkEnableOption "systemd boot phase measurements"; + boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // { default = config.boot.initrd.systemd.package.withTpm2Units; defaultText = "boot.initrd.systemd.package.withTpm2Units"; }; + + boot.initrd.systemd.tpm2.pcrphases.enable = + lib.mkEnableOption "systemd initrd boot phase measurements"; }; - # TODO: pcrphase, pcrextend, pcrfs, pcrmachine + # TODO: pcrextend, pcrfs, pcrmachine config = lib.mkMerge [ # Stage 2 ( @@ -52,6 +46,19 @@ ]; } ) + ( + let + cfg = config.systemd; + in + lib.mkIf (cfg.tpm2.enable && cfg.tpm2.pcrphases.enable) { + systemd.additionalUpstreamSystemUnits = [ + "systemd-pcrphase.service" + "systemd-pcrphase-sysinit.service" + ]; + systemd.services.systemd-pcrphase.wantedBy = [ "sysinit.target" ]; + systemd.services.systemd-pcrphase-sysinit.wantedBy = [ "sysinit.target" ]; + } + ) # Stage 1 ( @@ -77,5 +84,15 @@ ]; } ) + ( + let + cfg = config.boot.initrd.systemd; + in + lib.mkIf (cfg.enable && cfg.tpm2.enable && cfg.tpm2.pcrphases.enable) { + boot.initrd.systemd.additionalUpstreamUnits = [ "systemd-pcrphase-initrd.service" ]; + boot.initrd.systemd.services.systemd-pcrphase-initrd.wantedBy = [ "initrd.target" ]; + boot.initrd.systemd.storePaths = [ "${cfg.package}/lib/systemd/systemd-pcrextend" ]; + } + ) ]; } diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 60f69a7d3a07..9ab019171b4c 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -337,11 +337,7 @@ in done # Move the new temporary /etc mount underneath the current /etc mount. - # - # This should eventually use util-linux to perform this move beneath, - # however, this functionality is not yet in util-linux. See this - # tracking issue: https://github.com/util-linux/util-linux/issues/2604 - ${pkgs.move-mount-beneath}/bin/move-mount --move --beneath "$tmpEtcMount" /etc + mount --move --beneath "$tmpEtcMount" /etc # Unmount the top /etc mount to atomically reveal the new mount. umount --lazy --recursive /etc diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index a21d97a52be3..953f0a88904c 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -119,7 +119,6 @@ in ); forceLuksSupportInInitrd = true; }; - # TODO: systemd stage 1 postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ( concatMapStrings ( dev: diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 481773991206..bb338bc992c9 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -273,6 +273,10 @@ in "bcachefs" = "${cfg.package}/bin/bcachefs"; "mount.bcachefs" = "${cfg.package}/bin/mount.bcachefs"; }; + boot.initrd.systemd.storePaths = [ + # Used by the ExecStart= in bcachefs-wait-devices@.service. + "${cfg.package}/sbin/bcachefs" + ]; boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${cfg.package}/bin/bcachefs copy_bin_and_libs ${cfg.package}/bin/mount.bcachefs @@ -285,6 +289,7 @@ in commonFunctions + lib.concatStrings (lib.mapAttrsToList openCommand bootFs) ); + boot.initrd.systemd.packages = [ cfg.package ]; boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 1f734199c103..9dfe951e4e5d 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -3,7 +3,7 @@ { name = "buildbot"; - nodes = { + containers = { bbmaster = { pkgs, ... }: { diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 89a139e254f7..1dd40801dfaa 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -124,47 +124,55 @@ in environment.systemPackages = let - replyToEmail = pkgs.writeScriptBin "reply-to-email" '' - #!${pkgs.python3.interpreter} - import imaplib - import smtplib - import ssl - import email.header - from email import message_from_bytes - from email.message import EmailMessage + replyToEmail = + pkgs.writeScriptBin "reply-to-email" + # python + '' + #!${pkgs.python3.interpreter} + import imaplib + import smtplib + import ssl + import email.header + import sys + from email import message_from_bytes + from email.message import EmailMessage - with imaplib.IMAP4('localhost') as imap: - imap.login('alice', 'foobar') - imap.select() - status, data = imap.search(None, 'ALL') - assert status == 'OK' + with imaplib.IMAP4('localhost') as imap: + imap.login('alice', 'foobar') + imap.select() + status, data = imap.search(None, 'ALL') + assert status == 'OK' - nums = data[0].split() - assert len(nums) == 1 + nums = data[0].split() + try: + assert len(nums) == 1 + except AssertionError: + print("No mail in IMAP mailbox yet...", file=sys.stderr) + sys.exit(1) - status, msg_data = imap.fetch(nums[0], '(RFC822)') - assert status == 'OK' + status, msg_data = imap.fetch(nums[0], '(RFC822)') + assert status == 'OK' - msg = email.message_from_bytes(msg_data[0][1]) - subject = str(email.header.make_header(email.header.decode_header(msg['Subject']))) - reply_to = email.header.decode_header(msg['Reply-To'])[0][0] - message_id = email.header.decode_header(msg['Message-ID'])[0][0] - date = email.header.decode_header(msg['Date'])[0][0] + msg = email.message_from_bytes(msg_data[0][1]) + subject = str(email.header.make_header(email.header.decode_header(msg['Subject']))) + reply_to = email.header.decode_header(msg['Reply-To'])[0][0] + message_id = email.header.decode_header(msg['Message-ID'])[0][0] + date = email.header.decode_header(msg['Date'])[0][0] - ctx = ssl.create_default_context() - with smtplib.SMTP_SSL(host='${discourseDomain}', context=ctx) as smtp: - reply = EmailMessage() - reply['Subject'] = 'Re: ' + subject - reply['To'] = reply_to - reply['From'] = 'alice@${clientDomain}' - reply['In-Reply-To'] = message_id - reply['References'] = message_id - reply['Date'] = date - reply.set_content("Test reply.") + ctx = ssl.create_default_context() + with smtplib.SMTP_SSL(host='${discourseDomain}', context=ctx) as smtp: + reply = EmailMessage() + reply['Subject'] = 'Re: ' + subject + reply['To'] = reply_to + reply['From'] = 'alice@${clientDomain}' + reply['In-Reply-To'] = message_id + reply['References'] = message_id + reply['Date'] = date + reply.set_content("Test reply.") - smtp.send_message(reply) - smtp.quit() - ''; + smtp.send_message(reply) + smtp.quit() + ''; in [ replyToEmail ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index b97f45739f7e..f1e1788127cb 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -21,6 +21,7 @@ let forceGrubReinstallCount ? 0, withTestInstrumentation ? true, clevisTest, + clevisAskpassTest ? false, }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -73,7 +74,12 @@ let boot.kernelParams = [ "console=tty0" "ip=192.168.1.1:::255.255.255.0::eth1:none" ]; boot.initrd = { availableKernelModules = [ "tpm_tis" ]; - clevis = { enable = true; useTang = true; }; + ${ + if clevisAskpassTest then + "clevisLuksAskpass = { enable = true; useTang = true; };" + else + "clevis = { enable = true; useTang = true; };" + } network.enable = true; }; ''} @@ -108,6 +114,7 @@ let testFlakeSwitch, testByAttrSwitch, clevisTest, + clevisAskpassTest ? false, clevisFallbackTest, disableFileSystems, }: @@ -190,6 +197,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; } }", @@ -197,11 +205,20 @@ let ) installer.copy_from_host("${pkgs.writeText "secret" "secret"}", "/mnt/etc/nixos/secret") - ${optionalString clevisTest '' - with subtest("Create the Clevis secret with Tang"): + ${optionalString (clevisTest && !clevisAskpassTest) + '' + with subtest("Create the Clevis secret with Tang"): + installer.systemctl("start network-online.target") + installer.wait_for_unit("network-online.target") + installer.succeed('echo -n password | clevis encrypt sss \'{"t": 2, "pins": {"tpm2": {}, "tang": {"url": "http://192.168.1.2"}}}\' -y > /mnt/etc/nixos/clevis-secret.jwe')'' + } + + ${optionalString clevisAskpassTest '' + with subtest("Bind Clevis to LUKS header"): installer.systemctl("start network-online.target") installer.wait_for_unit("network-online.target") - installer.succeed('echo -n password | clevis encrypt sss \'{"t": 2, "pins": {"tpm2": {}, "tang": {"url": "http://192.168.1.2"}}}\' -y > /mnt/etc/nixos/clevis-secret.jwe')''} + installer.succeed("echo -n password | clevis luks bind -y -k - -d /dev/vda3 sss '{\"t\": 2, \"pins\": {\"tpm2\": {}, \"tang\": {\"url\": \"http://192.168.1.2\"}}}'") + ''} ${optionalString clevisFallbackTest '' with subtest("Shutdown Tang to check fallback to interactive prompt"): @@ -283,6 +300,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; forceGrubReinstallCount = 1; } @@ -316,6 +334,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; forceGrubReinstallCount = 2; } @@ -384,6 +403,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; forceGrubReinstallCount = 1; withTestInstrumentation = false; @@ -482,6 +502,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; forceGrubReinstallCount = 1; } @@ -518,6 +539,7 @@ let grubUseEfi extraConfig clevisTest + clevisAskpassTest ; forceGrubReinstallCount = 1; withTestInstrumentation = false; @@ -637,6 +659,7 @@ let testFlakeSwitch ? false, testByAttrSwitch ? false, clevisTest ? false, + clevisAskpassTest ? false, clevisFallbackTest ? false, disableFileSystems ? false, selectNixPackage ? pkgs: pkgs.nixVersions.stable, @@ -820,6 +843,7 @@ let testFlakeSwitch testByAttrSwitch clevisTest + clevisAskpassTest clevisFallbackTest disableFileSystems ; @@ -1044,6 +1068,43 @@ let ''; }; + mkClevisLuksAskpassTest = + { + fallback ? false, + }: + makeInstallerTest "clevis-luks-askpass${optionalString fallback "-fallback"}" { + clevisTest = true; + clevisAskpassTest = true; + clevisFallbackTest = fallback; + enableOCR = fallback; + extraInstallerConfig = { + environment.systemPackages = with pkgs; [ clevis ]; + }; + createPartitions = '' + installer.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" + + " mkpart primary linux-swap 100M 1024M" + + " mkpart primary 1024M -1s", + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "modprobe dm_mod dm_crypt", + "echo -n password | cryptsetup luksFormat -q /dev/vda3 -", + "echo -n password | cryptsetup luksOpen --key-file - /dev/vda3 crypt-root", + "mkfs.ext3 -L nixos /dev/mapper/crypt-root", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + "udevadm settle") + ''; + postBootCommands = optionalString fallback '' + target.wait_for_text("Please enter") + target.send_chars("password\n") + ''; + }; + mkClevisZfsTest = { fallback ? false, @@ -1741,6 +1802,9 @@ in }; } // optionalAttrs systemdStage1 { + clevisLuksAskpass = mkClevisLuksAskpassTest { }; + clevisLuksAskpassFallback = mkClevisLuksAskpassTest { fallback = true; }; + stratisRoot = makeInstallerTest "stratisRoot" { createPartitions = '' installer.succeed( diff --git a/nixos/tests/music-assistant.nix b/nixos/tests/music-assistant.nix index ac667ee95303..b307e97d6db2 100644 --- a/nixos/tests/music-assistant.nix +++ b/nixos/tests/music-assistant.nix @@ -7,7 +7,7 @@ name = "music-assistant"; meta.maintainers = with lib.maintainers; [ hexa ]; - nodes.machine = { + containers.machine = { services.music-assistant = { enable = true; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 952bc1da58e4..7b088dc85abd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -815,6 +815,7 @@ let }; # initialize wallet, creates macaroon needed by exporter systemd.services.lnd.postStart = '' + until [ -f /var/lib/lnd/tls.cert ]; do sleep 1; done ${pkgs.curl}/bin/curl \ --retry 20 \ --retry-delay 1 \ @@ -2051,7 +2052,7 @@ let { exporterConfig = { enable = true; - instance = "/run/varnish/varnish"; + instance = "/var/run/varnishd"; group = "varnish"; }; metricProvider = { diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index e09b1848882f..68abd2f5f158 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -5,7 +5,7 @@ maintainers = [ mic92 ]; }; - nodes.machine = + containers.machine = { ... }: { services.telegraf.enable = true; diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index eee205e69607..747dd4f70b82 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -64,9 +64,9 @@ 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|Customize|theme)') - machine.screenshot('start_screen') + # Wait until vscodium is visible. + machine.wait_for_text('Search') + machine.screenshot('screen') test_string = 'testfile' diff --git a/nixos/tests/web-apps/goupile/basic_interaction_test.py b/nixos/tests/web-apps/goupile/basic_interaction_test.py index 46b0f78903fc..efb9cd7c1e87 100644 --- a/nixos/tests/web-apps/goupile/basic_interaction_test.py +++ b/nixos/tests/web-apps/goupile/basic_interaction_test.py @@ -1,7 +1,7 @@ import os import openpyxl import tempfile -from playwright.sync_api import sync_playwright +from playwright.sync_api import sync_playwright, Page BASE_URL = "http://localhost:8889" @@ -10,6 +10,15 @@ ADMIN_PASSWD = "car-shop-in-the-mall" ALICE_PASSWD = "user-goes-to-the-car-shop" +def click_save_and_wait(page: Page): + save_btn = page.get_by_role("button", name="Save") + with page.expect_response( + lambda r: r.request.method in ["POST", "PUT", "PATCH"] and r.status < 400 + ): + save_btn.click() + page.wait_for_selector(".ui_busy", state="hidden", timeout=30000) + + def run_test(): is_headful = os.getenv("HEADFUL") == "1" @@ -20,6 +29,8 @@ def run_test(): ) # more default timeout for slow nixos test vms context.set_default_timeout(90 * 1000) + context.tracing.start(screenshots=True, snapshots=True, sources=True) + page = context.new_page() page.goto(f"{BASE_URL}/admin") @@ -48,10 +59,17 @@ def run_test(): page.get_by_role("button", name="No", exact=True).click() page.get_by_role("textbox", name="Password *").fill(ALICE_PASSWD) page.get_by_role("textbox", name="Confirmation").fill(ALICE_PASSWD) - page.get_by_role("button", name="Create").click() + + with page.expect_response( + lambda r: r.request.method == "POST" and r.status < 400 + ): + page.get_by_role("button", name="Create").click() # give alice, permissions to access the project - page.get_by_role("button", name="Assign").nth(1).click() + assign_button = page.get_by_role("button", name="Assign").nth(1) + assign_button.wait_for(state="visible") + assign_button.click() + page.get_by_text("Read", exact=True).click() page.get_by_text("Save", exact=True).click() page.get_by_text("Export", exact=True).click() @@ -71,25 +89,23 @@ def run_test(): page1.get_by_role("textbox", name="Inclusion date *").fill("2000-01-01") page1.get_by_role("spinbutton", name="Age *").click() page1.get_by_role("spinbutton", name="Age *").fill("1") - page1.get_by_role("button", name="Save").click() - page1.wait_for_timeout(1000) + click_save_and_wait(page1) page1.get_by_role("button", name="Advanced").click() page1.get_by_role("spinbutton", name="Age *").click() page1.get_by_role("spinbutton", name="Age *").fill("1") - page1.get_by_role("button", name="Save").click() - page1.wait_for_timeout(1000) + click_save_and_wait(page1) page1.get_by_role("button", name="Page layout").click() page1.get_by_role("spinbutton", name="Variable A1").fill("1") - page1.get_by_role("button", name="Save").click() - page1.wait_for_timeout(1000) + click_save_and_wait(page1) # create export #1 page1.get_by_role("button", name="Data").click() - page1.wait_for_timeout(1000) + page1.get_by_role("button", name="Data exports").wait_for(state="visible") page1.get_by_role("button", name="Data exports").click() + with page1.expect_download() as download_info: page1.get_by_role("button", name="Create export").click() @@ -115,26 +131,24 @@ def run_test(): page2.get_by_role("textbox", name="Inclusion date *").fill("2000-01-01") page2.get_by_role("spinbutton", name="Age *").click() page2.get_by_role("spinbutton", name="Age *").fill("2") - page2.get_by_role("button", name="Save").click() - page2.wait_for_timeout(1000) + click_save_and_wait(page2) page2.get_by_role("button", name="Advanced").click() page2.get_by_role("spinbutton", name="Age *").click() page2.get_by_role("spinbutton", name="Age *").fill("2") - page2.get_by_role("button", name="Save").click() - page2.wait_for_timeout(1000) + click_save_and_wait(page2) page2.get_by_role("button", name="Page layout").click() page2.get_by_role("spinbutton", name="Variable A1").click() page2.get_by_role("spinbutton", name="Variable A1").fill("2") - page2.get_by_role("button", name="Save").click() - page2.wait_for_timeout(1000) + click_save_and_wait(page2) # create export #2 page2.get_by_role("button", name="Data").click() - page2.wait_for_timeout(1000) + page2.get_by_role("button", name="Data exports").wait_for(state="visible") page2.get_by_role("button", name="Data exports").click() + page2.get_by_role("button", name="Previous exports").click() with page2.expect_download() as download1_info: @@ -156,18 +170,19 @@ def run_test(): print(f"exported all records to {save_path2}") + context.tracing.stop(path="/tmp/videos/trace.zip") + context.close() browser.close() # check that exported files have correct entries - wb1 = openpyxl.load_workbook(save_path1) - for sheet, cell in zip(["intro", "advanced", "layout"], ["D2", "D2", "C2"]): + for sheet, cell in zip(["intro", "advanced", "layout"], ["E2", "E2", "D2"]): val = wb1[sheet][cell].value assert val == 1, f"Sheet {sheet}, Cell {cell}: Expected 1 (admin), got {val}" wb2 = openpyxl.load_workbook(save_path2) - for sheet, cell in zip(["intro", "advanced", "layout"], ["D3", "D3", "C3"]): + for sheet, cell in zip(["intro", "advanced", "layout"], ["E3", "E3", "D3"]): val = wb2[sheet][cell].value assert val == 2, f"Sheet {sheet}, Cell {cell}: Expected 2 (alice), got {val}" diff --git a/nixos/tests/web-apps/goupile/default.nix b/nixos/tests/web-apps/goupile/default.nix index 6826e46b7f7a..54246b01e6a7 100644 --- a/nixos/tests/web-apps/goupile/default.nix +++ b/nixos/tests/web-apps/goupile/default.nix @@ -73,7 +73,6 @@ in #systemd.services.goupile.environment.DEFAULT_SECCOMP_ACTION = "Log"; # Block|Log|Kill networking = { firewall.allowedTCPPorts = [ config.services.nginx.defaultHTTPListenPort ]; - hostName = "goupile"; domain = "local"; }; @@ -108,12 +107,14 @@ in machine.wait_for_open_port(${port}) machine.succeed("curl -q http://localhost:${port}") - machine.succeed("curl -q http://goupile.local") + machine.succeed("curl -q http://machine.local") machine.succeed("curl -q http://localhost") - machine.succeed("run-goupile-test") - out_dir = os.environ.get("out", os.getcwd()) - machine.copy_from_machine("/tmp/videos", out_dir) + try: + machine.succeed("run-goupile-test") + finally: + out_dir = os.environ.get("out", os.getcwd()) + machine.copy_from_vm("/tmp/videos", out_dir) ''; # Debug interactively with: diff --git a/nixos/tests/web-apps/lasuite-docs.nix b/nixos/tests/web-apps/lasuite-docs.nix index d57a9158779d..9e3eb4e234f3 100644 --- a/nixos/tests/web-apps/lasuite-docs.nix +++ b/nixos/tests/web-apps/lasuite-docs.nix @@ -14,12 +14,9 @@ in soyouzpanda ]; - nodes.machine = + containers.machine = { pkgs, ... }: { - virtualisation.diskSize = 4 * 1024; - virtualisation.memorySize = 4 * 1024; - networking.hosts."127.0.0.1" = [ domain ]; environment.systemPackages = with pkgs; [ diff --git a/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix b/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix new file mode 100644 index 000000000000..a1f12f970a93 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + deadbeef, + vgmstream, + mpg123, + libvorbis, + ffmpeg, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "deadbeef-vgmstream-plugin"; + version = "2026-05-09.1"; + + src = fetchFromGitHub { + owner = "jchv"; + repo = "deadbeef-vgmstream"; + rev = finalAttrs.version; + hash = "sha256-dR1TEx61jnprEQokHRX/mi3WvbS+CVp4VIMlutX6uS8="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + deadbeef + mpg123 + libvorbis + ffmpeg.dev + ]; + + enableParallelBuilding = true; + + makeFlags = [ "DEADBEEF_ROOT=${deadbeef}" ]; + installFlags = [ "DEADBEEF_ROOT=$(out)" ]; + + postUnpack = '' + rm -rf $sourceRoot/vgmstream + cp --no-preserve=mode,ownership -LR ${vgmstream.src} $sourceRoot/vgmstream + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Streaming video game music decoder plugin for the DeaDBeeF music player"; + homepage = "https://github.com/jchv/deadbeef-vgmstream"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.jchw ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 535475b3d655..be77793c7964 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -23,6 +23,7 @@ common-updater-scripts, curl, openssl_1_1, + openssl_3_5, bzip2, sqlite, }: @@ -33,7 +34,7 @@ let binaries = [ "sublime_text" "plugin_host-3.3" - "plugin_host-3.8" + "plugin_host-3.${if lib.versionAtLeast buildVersion "4205" then "14" else "8"}" crashHandlerBinary ]; primaryBinary = "sublime_text"; @@ -90,12 +91,20 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}:$out \ $binary done + # Unable to get plugin_host-3.14 not crash with Python from Nixpkgs + ${lib.optionalString (lib.versionAtLeast buildVersion "4205") "patchelf --set-rpath ${ + lib.makeLibraryPath [ + sqlite + openssl_3_5 + ] + } libpython3.14.so.1.0"} + # Rewrite pkexec argument. Note that we cannot delete bytes in binary. - sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary} + ${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i -e 's,/bin/cp\\x00,cp\\x00\\x00\\x00\\x00\\x00\\x00,g' ${primaryBinary}"} runHook postBuild ''; @@ -106,6 +115,7 @@ let # No need to patch these libraries, it works well with our own rm libcrypto.so.1.1 libssl.so.1.1 ${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"} + ${lib.optionalString (lib.versionAtLeast buildVersion "4205") "rm libcrypto.so.3 libssl.so.3"} mkdir -p $out cp -r * $out/ @@ -116,7 +126,7 @@ let dontWrapGApps = true; # non-standard location, need to wrap the executables manually postFixup = '' - sed -i 's#/usr/bin/pkexec#pkexec\x00\x00\x00\x00\x00\x00\x00\x00\x00#g' "$out/${primaryBinary}" + ${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i 's#/usr/bin/pkexec#pkexec\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00#g' \"$out/${primaryBinary}\""} wrapProgram $out/${primaryBinary} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 6e2a275f9e36..2b734a8f0c44 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } { }; sublime4-dev = common { - buildVersion = "4199"; + buildVersion = "4205"; dev = true; - x64sha256 = "Nrhwv+ox/SW21c8wZtuX9mzHQ+o9ghsI50dU2kDvCX0="; - aarch64sha256 = "3vCXj53f2Qlt/Ab3hNNng+Y4Ch85Dp0G8srTVBtd6zU="; + x64sha256 = "1Tg8m4FNrVOeHK6VSmlua30pW4Bu7Gz+sT0t/w01UyM="; + aarch64sha256 = "K94UipUVZRh8xJKYW35be0u9L/VHpZ+FYhC26v41b3U="; } { }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 94cccf17bf86..ebf0bf032c49 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -446,12 +446,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "1c28767e3a7f3c9b7c5cc66e7f16b268c964e2c9"; - hash = "sha256-vPqMyuCNI3iTgPCkLH+TtjPO217DDFG0HIIJmUkryww="; + rev = "05a0a69ca52c31aa687e8251ae11dd913df10061"; + hash = "sha256-eM8plzS2vjOsNCzicPXfJbCs86Hc+plJeQOl+6diSJ8="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -868,12 +868,12 @@ final: prev: { ale = buildVimPlugin { pname = "ale"; - version = "4.0.0-unstable-2026-05-14"; + version = "4.0.0-unstable-2026-05-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "916c8764ce9d395f788eae9adf207a4bfe8a038e"; - hash = "sha256-xuNo4VOHrSnQBv6DZEMR6U3QfoBa46js+RVsE2z7Yv4="; + rev = "2a3af30fb6a725ec7215435369b310b1d2dc4c09"; + hash = "sha256-ch5JeEz16tsH6+bxDaGY4mbK26PZ4ev7JhWOm5YTD9k="; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.license = getLicenseFromSpdxId "BSD-2-Clause"; @@ -1932,12 +1932,12 @@ final: prev: { blink-cmp-yanky = buildVimPlugin { pname = "blink-cmp-yanky"; - version = "0-unstable-2025-06-24"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "marcoSven"; repo = "blink-cmp-yanky"; - rev = "473b987c2a7d80cca116f6faf087dba4dbfbb3c5"; - hash = "sha256-DciQaX2lYQptpEd8wke3x67SK6zMm2UI34qxBe6eC9Q="; + rev = "71abf987e6ae179279c28980d1f75b4ed6227ef0"; + hash = "sha256-Mf1zaUMaokjW79Lzp/GgcATkq9xwtbYdv3cUMdx5Rk4="; }; meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/"; meta.license = unfree; @@ -2910,12 +2910,12 @@ final: prev: { cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "0-unstable-2025-04-30"; + version = "0-unstable-2026-05-17"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "b24309c386c9666c549a1abaedd4956541676d06"; - hash = "sha256-ufbqLLgcRDoSG2XTqmMRcaHG120wtUqtovIrhLwXZ3k="; + rev = "e645f69b93eede43fb644bb1a0b1db3eef1108a3"; + hash = "sha256-6gxJkiJqUMB2xKx3z7v4OVUCFHDml8F7Ffs2JwiXo00="; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4227,12 +4227,12 @@ final: prev: { csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2026-05-16"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "ab776a6266593e9e0d8643cdb7e577f81c0eab7d"; - hash = "sha256-t3a9Qa5eMZuK+kg27hbeiW4GrQqxMMIMqd+xh/Spvws="; + rev = "8977f6890d235a6ba9948b63ff700d414c84c344"; + hash = "sha256-GQ9qq8xtf3I+d1eYW+FrpffYOl+q4rbBP4CGjPUDKiw="; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; meta.license = getLicenseFromSpdxId "Vim"; @@ -5349,12 +5349,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-05-15"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "381f691d504ff33a578d833c159bf86c3bec95de"; - hash = "sha256-jWaEuCeLZ3E0M91NOSdDs2uTfhnk4O1ZRi/S8Cxw23Q="; + rev = "5bdd2b8f6891c64607393698be7fd0f441443c1d"; + hash = "sha256-dp4N8fn9c7/uGM1G8HT2tM/zjCN089eik6I6M8w3ncQ="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5631,11 +5631,11 @@ final: prev: { evergarden-nvim = buildVimPlugin { pname = "evergarden-nvim"; - version = "0-unstable-2026-05-11"; + version = "0-unstable-2026-05-16"; src = fetchgit { url = "https://codeberg.org/evergarden/nvim"; - rev = "71be008947c25115d96b8effdd62e87fcb059fcc"; - hash = "sha256-eLFB4fTLpsO08kyiPG1B3uOchEIlVzIxpmdWw151KkQ="; + rev = "347c62833eb1f1e80c3ae275b1122c2173c47614"; + hash = "sha256-g79UaNy1UzgubLpriuNOH4UFhbhw5d+0sX90KWln2/E="; }; meta.homepage = "https://codeberg.org/evergarden/nvim"; meta.license = unfree; @@ -6975,12 +6975,12 @@ final: prev: { guihua-lua = buildVimPlugin { pname = "guihua.lua"; - version = "0.1-unstable-2026-05-15"; + version = "0.1-unstable-2026-05-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "guihua.lua"; - rev = "ae1a09035709a5952ae6f2fab742c2097c31a8f2"; - hash = "sha256-LSds5HBIex4mGL6zDSEEZT16Jd69kpEuAwQIWy7aDaA="; + rev = "26e2e557f5b1a0c5cb25cab41d71ddba61523cba"; + hash = "sha256-9VeU2HS1IRyixmbt1/jblHU5SNoqc+FJI52fAOq85aI="; }; meta.homepage = "https://github.com/ray-x/guihua.lua/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -7003,12 +7003,12 @@ final: prev: { gv-vim = buildVimPlugin { pname = "gv.vim"; - version = "0-unstable-2023-12-10"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "b6bb6664e2c95aa584059f195eb3a9f3cb133994"; - hash = "sha256-Tb2IQR/l7TvokgpMWZBumyHULOvXQ2aGTL4P8fIEmRs="; + rev = "ed7e9c6a118d92462c7d709c34a92682b60fa9f7"; + hash = "sha256-gfbL/pY3WhwsUsMoI7UAJydUH+TkEEpFbyXj9lp2SRc="; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; meta.license = unfree; @@ -9117,12 +9117,12 @@ final: prev: { lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "0.3.1-unstable-2026-05-05"; + version = "0.3.1-unstable-2026-05-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "f40bcf203812beaf26766ec0bc169a7f429fd730"; - hash = "sha256-Mq3UFwEJhdJ71xO6A8Yv3YAjIxilNJgV/d9voiRkIHE="; + rev = "b7ace9ddb1640ce266012a45a672dfdaedfa5ec6"; + hash = "sha256-ov4K/u5S8kf4Bm4KGKJJxhwPYcGEjzymxp8CGtMy2C4="; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -9327,15 +9327,15 @@ final: prev: { mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "winston0410"; repo = "mark-radar.nvim"; - rev = "946ec6f8a8c914c9ae9fa682214479509fe1e155"; - hash = "sha256-0/ac8kz0qQVJLQdXhl6r6gHze4o9XAFuM1v7ksxzlLA="; + rev = "a270244b3c64d1ba2e69399ccff1d9dc490bf0ef"; + hash = "sha256-hMOex+PLA9EEZ8CNHeFhULmNFlbXgSU+FRROGJOnhwk="; }; meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; - meta.license = unfree; + meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; @@ -9411,12 +9411,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "28.2.0"; + version = "28.3.0"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - tag = "v28.2.0"; - hash = "sha256-/sO6gNKNwkQDSMjCesrHynCNSXGhDCoN8youVdJm6t4="; + tag = "v28.3.0"; + hash = "sha256-rqzC3RiRoglRtJ/UbWDVvvr1wNhqYJxlOj2dIoE6WfU="; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -9454,12 +9454,12 @@ final: prev: { mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2.2.1-unstable-2026-05-14"; + version = "2.2.1-unstable-2026-05-18"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason.nvim"; - rev = "8e921c2b68571e978db5d4d3fef9c9a7f8755473"; - hash = "sha256-I+Epz266R+ZIT95gyxlKl1kCPNNSdF9FduHH87ueiyg="; + rev = "cbf8d285e1462dd24acf3507817be2bbcb035919"; + hash = "sha256-DLhPbrp591zwn9STDiyOXcKmLFy/AtGscsWn3vU2U+E="; }; meta.homepage = "https://github.com/mason-org/mason.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -9692,12 +9692,12 @@ final: prev: { mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.animate"; - rev = "eee9056eecd12933dfb09b710b7f32c10200e9ea"; - hash = "sha256-bYAIaRB2KpSwTyWVVvK7Yu+1sLPqQ7wMdfI860bGano="; + rev = "a133965b027a6377fddca43f11659af357c12758"; + hash = "sha256-mSeJEg5WUQrObE/eX7mmazBQFF9i+f/WLlxWXmLCaSI="; }; meta.homepage = "https://github.com/nvim-mini/mini.animate/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9706,12 +9706,12 @@ final: prev: { mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.base16"; - rev = "f2b4697eb678c396052f7fd3599c142292ad94c3"; - hash = "sha256-7wcobm8MLCuj+wmhZiIxAXSfZd5rgHMyFuyzrwAYVdA="; + rev = "772f224c5e9527d7c9a843081600c401617c545f"; + hash = "sha256-/NwhOYvQMlYZsrq6Ih/ZcS+NIc5mioA9fvaT5jdXh2g="; }; meta.homepage = "https://github.com/nvim-mini/mini.base16/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9720,12 +9720,12 @@ final: prev: { mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.basics"; - rev = "9ad4ffe62474f5f82c88d3b745f47581c51ba592"; - hash = "sha256-kU3qtxfx0aFc0PwGXOZAc//xT7iVFfWSVCF/rxTrNtw="; + rev = "69d3f97431788b27df5edf90e9922ba4af38f990"; + hash = "sha256-r3UxzMl8Z171XzkBlPfxw7dyrnt0TKCXPWAtTIneUDs="; }; meta.homepage = "https://github.com/nvim-mini/mini.basics/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9762,12 +9762,12 @@ final: prev: { mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.clue"; - rev = "f6978fb031023ee0b0aeb2abdb44abb87577bf38"; - hash = "sha256-xayesclebU/xcaFSrsfsnQabs54hUWFwrrqZeNq0OiQ="; + rev = "0e37cddd6307eb40248e4226be65304e85df1d18"; + hash = "sha256-96h7E3O3Akakd1BxlACWn0O5ALQzyP8nJXSqZ4c5f0Y="; }; meta.homepage = "https://github.com/nvim-mini/mini.clue/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9776,12 +9776,12 @@ final: prev: { mini-cmdline = buildVimPlugin { pname = "mini.cmdline"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.cmdline"; - rev = "26f5ad15fc28058c111be450ae5aadf800257306"; - hash = "sha256-P+mYcqUUZD6BwZGQbYI9kV/FAS4+H4ysCdDOvu65UQQ="; + rev = "0afaf26d4d12030b0f75c7c4584dae883a195ef3"; + hash = "sha256-qm6L6iesNL1wF/voj1P6x1eFTUkzXEIUdIr+wd181/I="; }; meta.homepage = "https://github.com/nvim-mini/mini.cmdline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9818,12 +9818,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.completion"; - rev = "6937ff1d7bf47ab58046c6685cc9057aa481ecb2"; - hash = "sha256-BGt2olKT81WxH4Rikidfq5MsuNBzoAKDROedPLWb+mw="; + rev = "04abe6fc7860858785ba63c435d76bf5b8b64b5f"; + hash = "sha256-DYJkOr64I1CLo5N+vgRa4xIbi3SUSZVPyy0e0Qo39C0="; }; meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9832,12 +9832,12 @@ final: prev: { mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.cursorword"; - rev = "52eacb10266b8ce07c052e3c80a706d29eb74006"; - hash = "sha256-pOur/hyoaHR8d+4p1zLiLFSoGfOHkd4l4SVJg7LrDAw="; + rev = "a01471856e462144ea53972f22a67e790be68ee6"; + hash = "sha256-udcgvHbdBgQnxNix5cRK+FgEraZGdvma+HnVX+b7FPo="; }; meta.homepage = "https://github.com/nvim-mini/mini.cursorword/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9846,12 +9846,12 @@ final: prev: { mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.deps"; - rev = "88f8bfa418dedc0c91cc21959cd460813b510327"; - hash = "sha256-WMEjJtGz3kxQ0EAzyNXe/ecEDaO/TZypRPgnqM0Tc6s="; + rev = "9da6c44316de10f4227ff366d574a2baa4004b1b"; + hash = "sha256-QGDLIXIMynE6c5iC56z9bXB2d2iPSOYeq5IOFEIsRYA="; }; meta.homepage = "https://github.com/nvim-mini/mini.deps/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9860,12 +9860,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.diff"; - rev = "117c301374ab8546891e2b34f63885ea83527432"; - hash = "sha256-GKZFkFhHNWAirFFKaHm4JuEao7iZeiJm33lFjjNdK6Q="; + rev = "5af2b6be4a4beb673f3196a414f6fd932bbedd48"; + hash = "sha256-DVvZOwUQCT/TGfkdy65BjH7gPPDIQ9ib2VCqOPzG5fs="; }; meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9902,12 +9902,12 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "0.17.0-unstable-2026-05-15"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.files"; - rev = "5e0f0d264166e71d37ca35d84c54b1887ea76b40"; - hash = "sha256-PXRVOf2tGwukhqRkre5Dd2ULMAplH5utK00a2+iUz/o="; + rev = "423d6b5afb7a94e658950d470957f830d43dd41e"; + hash = "sha256-I8M9oFp85jPT8qgEd2Nmel+cVK5LLGekORINwlNUN9Y="; }; meta.homepage = "https://github.com/nvim-mini/mini.files/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9944,12 +9944,12 @@ final: prev: { mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hipatterns"; - rev = "35b632f6c138d720f29de87476361af44bed2198"; - hash = "sha256-dFvp0lOon65ti+hlq/B2P8LGjyNmYUYuueTA2e7ccZY="; + rev = "e25cf080aae092a651a92fa5e477f64a61adbebf"; + hash = "sha256-0oheCwV4qpU45f7S2jFkqMwpRiatjXjtDFAerNU2fLQ="; }; meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9958,12 +9958,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hues"; - rev = "9a5e1c16cf9c09211d3cb2c5294e492ccc5dfef5"; - hash = "sha256-iLuACIkXyLwhfmw87BxPcbFnEKkdwoBCEVUcn5MeSvU="; + rev = "ac106d6d4aca40ea54ae36b0f2ad2d41e575d497"; + hash = "sha256-aiveI+blSZ40y5UDBW2nmC5BdcseuQUpYdO4sFlfnXg="; }; meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9972,12 +9972,12 @@ final: prev: { mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.icons"; - rev = "9c7b1b90b15bdd69c52f6e31889dbc9987c30ec4"; - hash = "sha256-DW6CZJXkQJgzH0RpYXHDQ+fGYJKAlodpofVXLTTzoEs="; + rev = "520995f1d75da0e4cc901ee95080b1ff2bc46b94"; + hash = "sha256-Q61iFTDA2groQu3qMNJu0yuVnB6NtsGNihpGD5ppeuI="; }; meta.homepage = "https://github.com/nvim-mini/mini.icons/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9986,12 +9986,12 @@ final: prev: { mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.indentscope"; - rev = "ace9b4e503cb095b9a3f6442c909d117c4aa8d0e"; - hash = "sha256-VS0/P9xstXtG35BQ3B0AfCFD5yTaJixe9igCZNLZfZU="; + rev = "ad19b1f02223391f3d40440f7ff10607f0043585"; + hash = "sha256-rUmoWT/Sc9yAXXyKXI/Ho4VwZkwlsHx+/k2QE8uKlYA="; }; meta.homepage = "https://github.com/nvim-mini/mini.indentscope/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10000,12 +10000,12 @@ final: prev: { mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump"; - rev = "d6ea5afbda111f63d2214536037afd698b95b832"; - hash = "sha256-D7CGGx5bdRPr71ufh1JtpGgnPmbLZyxN+6oJOmg88KY="; + rev = "a0bb5dedc981a47826fc95498583b192c69353df"; + hash = "sha256-DwzMkDl6TqahZ1niM06OxIFRdE553i5KJBMP8PdEuqg="; }; meta.homepage = "https://github.com/nvim-mini/mini.jump/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10014,12 +10014,12 @@ final: prev: { mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump2d"; - rev = "67686a3329f599eb2f2fa369e89f0ccba5435929"; - hash = "sha256-Q9HMloYGrExf53j42dS5aOFtHh209WmnY+I0kJRtr3c="; + rev = "1661829512c9cfa9cc641f49836de16b49adb497"; + hash = "sha256-RrQCMRow2jVm1n5UvEtjV12Kceg+gxAl/xl8q5iXTK4="; }; meta.homepage = "https://github.com/nvim-mini/mini.jump2d/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10042,12 +10042,12 @@ final: prev: { mini-map = buildVimPlugin { pname = "mini.map"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.map"; - rev = "fcb6162297028b2d11802b0850fbbb9c5a036aa6"; - hash = "sha256-quzuuS67n8J2hGFkpxDU6ZZxjEz3KegP1b2FjQ7xL7g="; + rev = "b5c13c5740afdd0f5b0f0af9aa2928e4481212af"; + hash = "sha256-WwTnkEVHubvI55ipKy1aA81H4LR7VuBi6KvIXUS0/p4="; }; meta.homepage = "https://github.com/nvim-mini/mini.map/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10084,12 +10084,12 @@ final: prev: { mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.notify"; - rev = "ef35a3ec68399398f097d0c1736c343a45cb7406"; - hash = "sha256-rqi7dDE9GWCZEz2/jf9PDMNbkspnjdZAks+6KH58azM="; + rev = "7e75de73c60590e3f35d5cecd5677a68a437fc54"; + hash = "sha256-VXhsQM5WQwOTpsus0WOTwmdz4TtGVyM8ZZOpXBqqqv4="; }; meta.homepage = "https://github.com/nvim-mini/mini.notify/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10098,12 +10098,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "0.17.0-unstable-2026-05-15"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "18797ed18f347d0d0da27fec28a67979b1207f70"; - hash = "sha256-YkE1XwxpWukp19juZB2eIUpomybE0L9sz/+jCc/fx0k="; + rev = "264b5c8fc6e82212af0dc5c345145cfa916efeb6"; + hash = "sha256-2E8EYYWQcN3rpsKqV8AYzPPAF7PalLpDTe3t3Lo9SmE="; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10112,12 +10112,12 @@ final: prev: { mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.operators"; - rev = "76e7c5b672147956fa188bf8649ce0b1c8ea4a48"; - hash = "sha256-kfSxabV61gF4KumxMxdocUwaaktlThiGbABx7mQb8WM="; + rev = "d9b2f3892ad177cc141987ccfa8944cf21474f77"; + hash = "sha256-FrkWVfNzHaVqqvmprj8kn7MubSXjgXn/z0qRT5+hMwM="; }; meta.homepage = "https://github.com/nvim-mini/mini.operators/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10140,12 +10140,12 @@ final: prev: { mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pick"; - rev = "975e398570dd15696575c5374f94e78fd29a7a69"; - hash = "sha256-3aCzRoPdvo+IFx0PQxCVQv2j3oU/JoiBVCei70bXtUk="; + rev = "0e25916ec4b0f3ad81329e529db55ef350ac9901"; + hash = "sha256-OmGZQ3MK++mgtSNgLQhdWsQkbHr81iTfsQnLl8gBxoM="; }; meta.homepage = "https://github.com/nvim-mini/mini.pick/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10168,12 +10168,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.snippets"; - rev = "5330cc759cc7f67ad6cc885ad509e3d989a5904e"; - hash = "sha256-q3YL/uUSzgDHQQHMMHWhLj8kcz6DsMfWYPal+RrAYa4="; + rev = "9a08aa14e02abb790c823a622d7d6c736cbbe65a"; + hash = "sha256-1w8t2ANiBue7mNk5QYhi8aBHGGNvIbrKPQgGqGO0RqI="; }; meta.homepage = "https://github.com/nvim-mini/mini.snippets/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10196,12 +10196,12 @@ final: prev: { mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.starter"; - rev = "35b018a035794e341ac01cb2091bbd71b3f823d0"; - hash = "sha256-ZvWrNiYUTBp2KWkMns1Jpr44RanTO9jd857xfI3KOpQ="; + rev = "a7d8b353cf120fee32bb5d88e7a9de5eaec746e7"; + hash = "sha256-fzp3maSVIQYh4Gr5FfDiAdrXdK7Z+V9hpqjgftAkG5U="; }; meta.homepage = "https://github.com/nvim-mini/mini.starter/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10210,12 +10210,12 @@ final: prev: { mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.statusline"; - rev = "e9e5c147385e5e0310ab79162dd08d0465e96d83"; - hash = "sha256-k9qyBfaI9Dc2dcjOuWAvh7w9RUxxg9zXnYUJp5llZkI="; + rev = "7091f554d7d26b5d55f4c937634da53ba277a44a"; + hash = "sha256-EUSzEt4JJI+bT6ll511tT+7ZTkpNqBYxQYw/e+CwHtM="; }; meta.homepage = "https://github.com/nvim-mini/mini.statusline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10224,12 +10224,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.surround"; - rev = "990ce30f724d08e79670107de6b915a3f1bb9a9b"; - hash = "sha256-gF4ZMo5cW7VYBa2XFFVxhrRzV097ix0evsC1+3jkP7k="; + rev = "c375ea503646fe8393593b5fb8a40406eaa437b2"; + hash = "sha256-uwip1qJ6qGbVmOrttjCCoOybQ1/3vYsIO+fJ5Xnrs2g="; }; meta.homepage = "https://github.com/nvim-mini/mini.surround/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10238,12 +10238,12 @@ final: prev: { mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.tabline"; - rev = "5c32522e128ba02e78d091ab2d5c6972f673c440"; - hash = "sha256-bosGFg0zMTXjBQvUzrjw5INQnD/Mz4X4FJKwU9VzRj8="; + rev = "7d4a8a79f37361ad287d27bda0f37fc53f924a50"; + hash = "sha256-KlrjsgsSnuW0Fpr2Jq2YYRCiw0+KET+YHEKiOnXfYk8="; }; meta.homepage = "https://github.com/nvim-mini/mini.tabline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10252,12 +10252,12 @@ final: prev: { mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.17.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.trailspace"; - rev = "ae2fd422564c6e781caf6545355ca6051e20fa26"; - hash = "sha256-Bmq8hrAFTPLPZnlhPTwYq1osYmE0wcRuSw35qWrINe0="; + rev = "22653218f1aedc9bf306c8b4e8ec2c8a575f6fae"; + hash = "sha256-7qPgRedHWA3IQhshOGjENDBztJA+Q/j+ASpLdf9BQwM="; }; meta.homepage = "https://github.com/nvim-mini/mini.trailspace/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10854,12 +10854,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-05-15"; + version = "1.4.0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "eaed67d3f44a707ef6fe596e64ec8979f0c24a6e"; - hash = "sha256-83QOT8lHwdlFyHHz7pEpNk+H+Ri2WV/os3tKgBdy9Pw="; + rev = "39609069a03ac7fc7604a2b45944df15b67f3ed8"; + hash = "sha256-KbQ97HC/66cVH+McpIzACYtWsffVgcImNJ9P33zctT0="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11248,12 +11248,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - tag = "v2.8.0"; - hash = "sha256-dsiBQi1zKMEwxAX+rcmNszHdKOVVvCeoSW/uMKQVhjE="; + tag = "v2.9.0"; + hash = "sha256-3nIXy/Lrwph1skT5wn2jKrN10PArBOsOa6V4Nir/f4Y="; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11641,12 +11641,12 @@ final: prev: { nerdy-nvim = buildVimPlugin { pname = "nerdy.nvim"; - version = "1.6-unstable-2026-05-13"; + version = "1.6-unstable-2026-05-19"; src = fetchFromGitHub { owner = "2KAbhishek"; repo = "nerdy.nvim"; - rev = "0fe9cc24c08a14ceb002362b07a34e481f870fae"; - hash = "sha256-ErtJlYp8uCNYREn7+rIx5b2Pm9lCnZ7dss/+CdP+b2U="; + rev = "f06c60542cb04a549588eed98e55f5a9a3de9ccf"; + hash = "sha256-20uvY8KBR4TY28pTGI5C8XVLa0LIO/0E9GZRohwzmms="; }; meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -12882,11 +12882,11 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "05-unstable-2026-05-13"; + version = "05-unstable-2026-05-18"; src = fetchgit { url = "https://codeberg.org/mfussenegger/nvim-lint/"; - rev = "665525810630701b84181e4d9eefd24b49845b29"; - hash = "sha256-lFMtmAVGU2HKOsImNINH9xeEiFTvrd8G2l2m5mT7cMY="; + rev = "8b06eeec3c674744b993caecd73343df108c052d"; + hash = "sha256-aDMmKNQSwo+evuHJtub85rX1eQGVSIhx2gvmWhlM/vA="; }; meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/"; meta.license = unfree; @@ -13259,11 +13259,11 @@ final: prev: { nvim-rg = buildVimPlugin { pname = "nvim-rg"; - version = "0-unstable-2026-04-15"; + version = "0-unstable-2026-05-17"; src = fetchFromGitHub { owner = "duane9"; repo = "nvim-rg"; - rev = "4289cc873eea1c035a55d4b0c9bbf8e8c60851cc"; + rev = "52651d1bdaa1166e43d09ba44cc2df67d475cf4e"; hash = "sha256-USvXVEWoDH72e0qxkVPmYU80n5NcnIr9Zaf1AuONoYo="; }; meta.homepage = "https://github.com/duane9/nvim-rg/"; @@ -13273,12 +13273,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "9fe08300808a67773325d97ecb36d5777cc8e80d"; - hash = "sha256-ncpV8GBkS5lRg/bOMqOUAS0s6BQAaWeaT2/P12jxT+w="; + rev = "c65592d88f0fa00396e260da99d9e419f4891e3b"; + hash = "sha256-sKfxZxB2b2jUNEc/EvCd81s9FMZqBdiMZXJJKkOUyz4="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13357,15 +13357,15 @@ final: prev: { nvim-sioyek-highlights = buildVimPlugin { pname = "nvim-sioyek-highlights"; - version = "0-unstable-2026-02-06"; + version = "0-unstable-2026-05-17"; src = fetchFromGitHub { owner = "jbuck95"; repo = "nvim-sioyek-highlights"; - rev = "b8ab0a71b24c052cebaed97afe376b01fba19bf0"; - hash = "sha256-x2Q+96/YEky8fdy4CZ/QPwcLjaOLmwmtpWiYMnS657A="; + rev = "1dc885c08e895178f2d5b2474bc366a962077849"; + hash = "sha256-9wEFRB4OSBnRYLW8BbUgGjs5XbiZ6ZpxC5LPXJ/Mi7k="; }; meta.homepage = "https://github.com/jbuck95/nvim-sioyek-highlights/"; - meta.license = unfree; + meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; @@ -13511,12 +13511,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "1.17.0-unstable-2026-04-30"; + version = "1.17.0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f9bfc0059eca24546b69a7006110463da4808f8f"; - hash = "sha256-MgYlvwZXxgjvPJHKcVzpKp8tlaRuhO6TAbTudW0J41g="; + rev = "07f541fcaa4a5ae019598240362449ab7e9812b3"; + hash = "sha256-ao0a2zszbZEXOEIS4fbFRAsoBiQDRpD90k/mTqcUBX4="; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.license = unfree; @@ -13987,12 +13987,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "21637048c22f47809d896dace7b2b72b6c724692"; - hash = "sha256-kjm3jVmJwiC3RyvdtXW+kUO7zy48BrohfC+BzjsjTQE="; + rev = "b495047f0b9d35de3d8c6b84fad9de296d353b41"; + hash = "sha256-hTfySrejMbjhpagpjcutSXf2HmFkM+jqyAlRj08PycI="; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14239,12 +14239,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "0.8.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "nickjvandyke"; repo = "opencode.nvim"; - tag = "v0.8.2"; - hash = "sha256-V67sPj/ybMZ89pt5Trng+4OWYk6aqsWJDxmH/puWB78="; + tag = "v0.10.0"; + hash = "sha256-H++d+0xdqfkYM7XjnDRN5MgHOTIJA3fBNRY1zBgGonk="; }; meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14674,12 +14674,12 @@ final: prev: { pi-nvim = buildVimPlugin { pname = "pi.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "pablopunk"; repo = "pi.nvim"; - rev = "8d13ed4a5c0c5bd8709fd1fef9773899e0bef65b"; - hash = "sha256-9Pdj66T53ZFWRWGPm6FWusugXWOvPkdAh68+/+UJ8eY="; + rev = "4ba6db0dd30406995a2e46e4f1ae39377e66e733"; + hash = "sha256-z1gN1TKQKrM8dMh8rQMaAtGgi4ELV21WgswJBVyXulE="; }; meta.homepage = "https://github.com/pablopunk/pi.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14899,12 +14899,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "4.1.0-1"; + version = "4.1.1-1"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - tag = "v4.1.0-1"; - hash = "sha256-Fb9kZ2MVTFO8fj5eDKQW3cRHz1c/7xw/fJ9LkNrI4Sw="; + tag = "v4.1.1-1"; + hash = "sha256-zZX8RDA17WUztVCtH+x3QopDlGjO3PDq3K9S+UtvKP8="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -15502,12 +15502,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "90d43d35f0ebb5ecf1df734194cb568a162de4cb"; - hash = "sha256-McG9zWKxX+f6IeHK9x/fEQmnWNILuv3WOZmYKf/Ghh8="; + rev = "49526a2958893d0c8000d03b16ed923340ce13cc"; + hash = "sha256-MUosD7oF1hBA9sYl5RAAogxco+jLiyu0YKKpzui6Vs4="; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15669,12 +15669,12 @@ final: prev: { schema-companion-nvim = buildVimPlugin { pname = "schema-companion.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "cenk1cenk2"; repo = "schema-companion.nvim"; - rev = "375f98a3aa8c9c0a0991dd0161089daa3e027742"; - hash = "sha256-o4jOp22xZRSaRfWvp1oSLlCLZPSzD28Hfa0x+Hopb0o="; + rev = "b55ca0d99036950b71344d179af0499d8cfa7719"; + hash = "sha256-PvG+rnKz4tDz4E7CEN4k+sgx+mnKdSlbSLD0lbZb7WE="; }; meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15950,12 +15950,12 @@ final: prev: { slimv = buildVimPlugin { pname = "slimv"; - version = "0.9.13-unstable-2026-05-09"; + version = "0.9.13-unstable-2026-05-17"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "3ae4748296b2a0d852e396add5d88c91e2207f81"; - hash = "sha256-//rcErhVL4tjuU+9X3SeQ2XILvqfc3pX+0t5QOCJlb8="; + rev = "cec820c8796c9274ba69f62a47dae0d33979f1b5"; + hash = "sha256-yONrNGJu1YyqBjKhTtUblhiP9jwjF5qwtvvcQpkRgHk="; }; meta.homepage = "https://github.com/kovisoft/slimv/"; meta.license = unfree; @@ -15978,12 +15978,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-05-08"; + version = "2.1.0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "9053ebd394c38fe55fd2f4710daec27411c34fb9"; - hash = "sha256-u8tmjUEo8XK4DxGAxM9GSACqs+/hJ+ZjIeRTUNcN05o="; + rev = "3151100591670148cb0065388117622212208ee3"; + hash = "sha256-uRMQy89pDA2LwgDKj2mcvrTLCf7LyCIM2EHdq8EBcq4="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16862,12 +16862,12 @@ final: prev: { tagbar = buildVimPlugin { pname = "tagbar"; - version = "3.1.1-unstable-2025-10-02"; + version = "3.1.1-unstable-2026-05-17"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "7bfffca1f121afb7a9e38747500bf5270e006bb1"; - hash = "sha256-2dVhKgPonsgTwxrQU8quA1zhWd4SIwNjdHnL89B+eIo="; + rev = "b37b05ff1925b0b3931f031ebf88690aa0974375"; + hash = "sha256-Vqjq6ClXntfg2579MG37MQJWv6tN/4Y5/uuF4OqFMDQ="; }; meta.homepage = "https://github.com/preservim/tagbar/"; meta.license = unfree; @@ -17733,12 +17733,12 @@ final: prev: { tiny-glimmer-nvim = buildVimPlugin { pname = "tiny-glimmer.nvim"; - version = "0-unstable-2026-04-27"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-glimmer.nvim"; - rev = "cc285167914e947fc130523d02927fdaf24636a6"; - hash = "sha256-oRdeegElffDVtvv87z7z4fJH/ScTFz0wXz9sevTq10s="; + rev = "f26728abf811324d7ed6b035a11d7b76a27c06c3"; + hash = "sha256-CUxWZOoEj2kamwlhcpz0K1IR+7TfFC22RPIVj4x6TeI="; }; meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18563,12 +18563,12 @@ final: prev: { venv-selector-nvim = buildVimPlugin { pname = "venv-selector.nvim"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "linux-cultist"; repo = "venv-selector.nvim"; - rev = "bcb2f58533c59b01565285eba49693f00bc460f5"; - hash = "sha256-oP4TeD2FEwL1M7D3wl1BQi812x+GhPdRQvFmrZ8l4Rc="; + rev = "a46c77978abc1aa1b3e17918d964bd30287abb42"; + hash = "sha256-dyB/2aPr0XNTi6W1ikRcHQtxaYpe2JiVT5NZhSLpsKg="; }; meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -20985,12 +20985,12 @@ final: prev: { vim-habamax = buildVimPlugin { pname = "vim-habamax"; - version = "0-unstable-2026-04-30"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-habamax"; - rev = "c944829d55e41f4572261ed6e758a25c9ca33b90"; - hash = "sha256-734j4UeqUU8PxEn8gI7Q5opC01+NM0lE1ePQqJrRtIA="; + rev = "a27ce6a6b905482309865ce9bb624cbf8cc6056c"; + hash = "sha256-ZThjsCI5LsGlTefIZMFJJyNGeaIzR+DWbFkJ436T0Aw="; }; meta.homepage = "https://github.com/habamax/vim-habamax/"; meta.license = unfree; @@ -22863,12 +22863,12 @@ final: prev: { vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "0.14.0-unstable-2026-02-18"; + version = "0.14.0-unstable-2026-05-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "34467fc07d1bf1b3a6588e9d62711b9f7a8afda3"; - hash = "sha256-8jvqRqkR2libYj7pC6nUpdqla9Cid8qWhA4rumMSkbY="; + rev = "d7db1b637c68f7c9a6b4c2c2bc73d8c18e7b40c0"; + hash = "sha256-MqmNRtjN/tvDJKZjiUqqzVuq/tvD9OO5bgWmN2Fa058="; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23451,12 +23451,12 @@ final: prev: { vim-sexp = buildVimPlugin { pname = "vim-sexp"; - version = "0-unstable-2026-05-13"; + version = "0-unstable-2026-05-16"; src = fetchFromGitHub { owner = "guns"; repo = "vim-sexp"; - rev = "2328c1b7236eec847e0ee9abda0ae83a0a77dea9"; - hash = "sha256-letPTt+fWw51eA/+JkGZ4OuPKyZY2RGJtIF1ekMn+9s="; + rev = "1bf50921308f0188d1c1ecf8a712cc72ab2775e5"; + hash = "sha256-JbqCrNNCu+JiHMg74SwHGs0RimfKnC7J9rQGQpGMUHM="; }; meta.homepage = "https://github.com/guns/vim-sexp/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23772,12 +23772,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "0.5.2-unstable-2026-05-15"; + version = "0.5.2-unstable-2026-05-16"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "bdd077d8720bd87923408d3a38cd90de634d1e54"; - hash = "sha256-af0NSvJVv22BNxzPWxsSfEqoY4VlrDX7Ico+VAoVuxU="; + rev = "46a58ad2e5b173ada034e6bfe23f746c29df94a1"; + hash = "sha256-DDOxzEp0L1M3hJYkOF1BeEscShaTx5oINuJPE0haJBk="; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -24877,12 +24877,12 @@ final: prev: { vimade = buildVimPlugin { pname = "vimade"; - version = "2.5.1-unstable-2026-03-29"; + version = "2.5.1-unstable-2026-05-17"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "9b2eacd9c97c0bb547f6f3a27e8b5b7a70ad4d03"; - hash = "sha256-mnG9yzlLThwsqh+siGfhVV0h1k4EvSCVrcjN1ndhFUg="; + rev = "a5323f4930e3f1f48c0329e50bd218ba61577aaf"; + hash = "sha256-sBCZ/EEuGoqCBSg3Jh1o05sSuAJNOdortEB7b4sR2Z4="; }; meta.homepage = "https://github.com/TaDaa/vimade/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -25144,15 +25144,15 @@ final: prev: { vivify-vim = buildVimPlugin { pname = "vivify.vim"; - version = "0-unstable-2026-04-10"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "jannis-baum"; repo = "vivify.vim"; - rev = "39663f5d201609731a2ac3de58d6cd81f1f64efe"; - hash = "sha256-rNmgrhzewBQXQfJafF/BpfxlhHOrj/1qTJNyQ46EtsA="; + rev = "cd4e0b8ebfd8c824ba98736790e33b0d1f820bbc"; + hash = "sha256-EJC4NcQWNpkCpu2OlxLSI8maQDt7N82lNDeJZ4JEBbg="; }; meta.homepage = "https://github.com/jannis-baum/vivify.vim/"; - meta.license = unfree; + meta.license = getLicenseFromSpdxId "GPL-3.0-only"; meta.hydraPlatforms = [ ]; }; @@ -25284,12 +25284,12 @@ final: prev: { whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - tag = "0.5.0"; - hash = "sha256-d+jbLU5N4qJ4WzPPHWZWPTesZ++h6TiYc5z5sYlbDgE="; + tag = "0.6.0"; + hash = "sha256-mOB8QICPN9XT6N81n1PPMaktI0JdKAOnwi1Aqr+JJIs="; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25524,24 +25524,24 @@ final: prev: { pname = "xeno.nvim"; version = "0-unstable-2025-10-23"; src = fetchFromGitHub { - owner = "kyza0d"; + owner = "kyzadev"; repo = "xeno.nvim"; rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb"; hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8="; }; - meta.homepage = "https://github.com/kyza0d/xeno.nvim/"; + meta.homepage = "https://github.com/kyzadev/xeno.nvim/"; meta.license = unfree; meta.hydraPlatforms = [ ]; }; xmake-nvim = buildVimPlugin { pname = "xmake.nvim"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "Mythos-404"; repo = "xmake.nvim"; - tag = "v3.1.4"; - hash = "sha256-A40dFf85PxFCP8hh8PNLVJflBl1LRFo8J1iZbcXxmo0="; + tag = "v3.1.5"; + hash = "sha256-MkChUCntWqgmAKnaYGT38dSgQaLLyc7liXdZWx4061Q="; }; meta.homepage = "https://github.com/Mythos-404/xmake.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25663,12 +25663,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "13.1.5-unstable-2026-05-15"; + version = "13.1.5-unstable-2026-05-19"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "09d8ce930b48ea6724e94bff6dbb578304e0b478"; - hash = "sha256-rGDM4CNLQI7PxqfiJVHHiU3Y99aeWWvmq96330nEOYQ="; + rev = "cad24771df41423022233f11078087c4c8400e51"; + hash = "sha256-ln4eMzgrrdMCQBWJrJaCb3q5VLYFkmWExgTYcp1dL+g="; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25844,12 +25844,12 @@ final: prev: { zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "0.4.7-unstable-2026-03-13"; + version = "0.4.7-unstable-2026-05-18"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "dea1ee6cd6d07568c92ea8353063d4d85c58a964"; - hash = "sha256-W5cSp/RFbUaGhtvfowaCASfOa0mrqfxxRGR23Bt07FQ="; + rev = "bc3b39374b25fad977cecc936588cb060f15a773"; + hash = "sha256-cq76bVNyoK1Oi0d61Wa3B3iFvLzboozZaZlWBTJik5U="; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -25872,12 +25872,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "0.7-unstable-2026-03-23"; + version = "0.7-unstable-2026-05-18"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "fbd2dcc6b5c9261e91fde361ed43a0d817dc57d4"; - hash = "sha256-wk037qL8htUkH6NJ+/D3y4sJHv/Eo3fkkUlsWW1fCLU="; + rev = "49e5fb6012077d2fe60681da3d8ff71e4c2a1c12"; + hash = "sha256-G/JnH9zF9m06Al8lzda6/P4K3S7iChaIzvZjKGLghAc="; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 500c0d5ced42..39b16aabecc1 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -11,13 +11,13 @@ }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; - version = "2.43.15"; + version = "2.45.0"; src = fetchFromGitHub { owner = "esmuellert"; repo = "codediff.nvim"; tag = "v${version}"; - hash = "sha256-gaPLjH33+nBgpSZJ8b/4aneodt8wg+Jy44yXAjemToA="; + hash = "sha256-Up4vH5yk13don0HrmHHpqrPIKtc1MTtDbZ6QcMHQYAU="; }; dependencies = [ vimPlugins.nui-nvim ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8267f61f94fb..316ee66782e4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3285,12 +3285,6 @@ assertNoAdditions { ]; }; - nvim-sioyek-highlights = super.nvim-sioyek-highlights.overrideAttrs (old: { - meta = old.meta // { - license = lib.licenses.mit; - }; - }); - nvim-snippets = super.nvim-snippets.overrideAttrs { checkInputs = [ # Optional cmp integration diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index bd1a34991b13..c5282996c01b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1820,7 +1820,7 @@ https://github.com/natecraddock/workspaces.nvim/,, https://github.com/andrewferrier/wrapping.nvim/,, https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,, -https://github.com/kyza0d/xeno.nvim/,, +https://github.com/kyzadev/xeno.nvim/,, https://github.com/Mythos-404/xmake.nvim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 389a05555bf8..c288d54edfb7 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-pGJ1coic0kdjXUI6HCEkQsyQC5YU0jnA1hmN6MaPfwg="; + hash = "sha256-VTbeOLAGmaVy9PL5/Y+ebbCNa6ki4cx0VGXhzLuz1ow="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-NppbZ/gCZYGZna8bs/nUASxyqd6Bv0AOYTEbfaqJWyI="; + hash = "sha256-j8cDVoxT38/dmorTlPQjrd2GQS+BkoatIbQQzB1c7GA="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-oM2H7CJBS0G8ieiI6twqpA257QWWytdbpkV2Q2D7R6o="; + hash = "sha256-Kl23fdHFlh9cvfMtXNr6GI+AWknPFMM1lGFCuJY5kXw="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-lRChL8hGIc4zJ/CBwPkLYY1U5YhfM0DrW//C1dNi//A="; + hash = "sha256-M1dfKzjfHeH4xmvnuRmBsnhaQryL6c84nPrl2NGQT5k="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.141"; + version = "2.1.143"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a5a9f9b836f5..354ae1d3f7d5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2068,8 +2068,8 @@ let mktplcRef = { name = "vscode-graphql"; publisher = "GraphQL"; - version = "0.13.2"; - hash = "sha256-9G6iIYjZE6s5EGRTc0Y6gUN1cK9Gm2ohnl3oYqBWGqs="; + version = "0.13.4"; + hash = "sha256-zPc+jNbXfuXMWXxbKhaOpjgDu96jg5C+CCQ3HXEQ7fw="; }; meta = { description = "GraphQL extension for VSCode built with the aim to tightly integrate the GraphQL Ecosystem with VSCode for an awesome developer experience"; @@ -2084,8 +2084,8 @@ let mktplcRef = { name = "vscode-graphql-syntax"; publisher = "GraphQL"; - version = "1.3.8"; - hash = "sha256-10x2kX9Gc7O/tGRDPZfy1cKdCIvGTCXcD2bDokIz7TU="; + version = "1.3.10"; + hash = "sha256-EY6BHl5ICcs3FuuenoadDXLLPSe8+2VAAydqo/YrtaE="; }; meta = { description = "Adds full GraphQL syntax highlighting and language support such as bracket matching"; @@ -5200,8 +5200,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.2.8"; - hash = "sha256-lbTE5UP4JSpqoXHzS6HPBX2pOQjeBSmHhxqy0thawfc="; + version = "3.2.9"; + hash = "sha256-LkoytGAAZwjm3Mm3EixCHjnh1dkxB0lKMv5KJVYSwGY="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d268bd74152c..45a88e87ae6e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -27,12 +27,12 @@ let hash = { - x86_64-linux = "sha256-CP4tIZhDoC56T6N0RUebNRw3CjxG82odHt4WY8rgmS8="; - x86_64-darwin = "sha256-4EWKIXc+CKQLot7eN6Bkd/xigByEGafLMKJ832EOSwA="; - aarch64-linux = "sha256-5EwENP1lpHzqiWWeXNQzQOp/zAAEanSbDhWcMeup2sY="; - aarch64-darwin = "sha256-9n7kVtknqfSfTc2MmFps5bxSqMnL6KNhZgTb+DVUkhY="; - armv7l-linux = "sha256-aXGqp7ljvqDJNb5BMiBIm2CluIr70oiNPmR7BULLsv8="; - loongarch64-linux = "sha256-XPEssw+7NVKljyrWcc+Q2HzRr31seDwbdNn3EtyHlSY="; + x86_64-linux = "sha256-gscXPWqnQV9nd9XWbL5YkCdyxxnDDEY4WpFAgx5G7a0="; + x86_64-darwin = "sha256-H6sKVtQi++U7NvSkKWipjDDJQsTu0Zg3tp9kijL85eU="; + aarch64-linux = "sha256-09C5ER/nZBphWHZRRAf9o/hyB6qc2mqIuxOLNdlVSfU="; + aarch64-darwin = "sha256-utDPI80JCPcXTFvK65UR5CBlyb+EsocpHM0KWeojaUI="; + armv7l-linux = "sha256-voNvX40YWm7oYrgNAIhoRE/9zZlIq/MgaGVlumDUaz4="; + loongarch64-linux = "sha256-T7QGiIilEL2lR01yUZ70ubQ2XGgnL7NQ4xkt0MeDD3s="; } .${system} or throwSystem; @@ -43,7 +43,7 @@ buildVscode rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.112.01907"; + version = "1.116.02821"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/applications/emulators/libretro/cores/atari800.nix index f70bf7cc8411..33e633802a55 100644 --- a/pkgs/applications/emulators/libretro/cores/atari800.nix +++ b/pkgs/applications/emulators/libretro/cores/atari800.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "atari800"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-11"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-atari800"; - rev = "7f3456f16109c34915d0bad7393b6c4df66c3850"; - hash = "sha256-7C/0i7LUGHY8bz5wp9ut+5EtvLrAUasn0xQzslQQ1fM="; + rev = "1851228de23b47cb74fbc8ea589a1c7c5e02ea98"; + hash = "sha256-s7M7yezPWzRokrxpoo8JbgOzi5R18yOQNgmHkTQR7S4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index ff7bf7afadd5..5d05785ecd3a 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-2026-05-09"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "c699953afa01bc3f179edbcb14c4cfbeee6107a2"; - hash = "sha256-s009GuPnsufDT70dBmhwfZmYjdf7pYO13FjycYvUF4c="; + rev = "c194d8c7d9cef77b653f688f1293746aa71a928e"; + hash = "sha256-lIvVk0a+lwBF+BtX2KT2MwOUguTGm/pKi8s9IbZqwsU="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index ea4671ee5f49..2488435118a1 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-2026-04-11"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "0b23b79f6b8c19f300d2d86958e89fbe2f6d30bc"; - hash = "sha256-/rILuViKZBKZFZkCjuFuuuOE3AvDiHQqHtWq4Q8XSMA="; + rev = "175438e5fe68ae0cfb7d04c29f81eed17635e6b4"; + hash = "sha256-crFrG6OsmW3nNnQ+OHFtYz7cRuU9hTjWe3vq4PdYJqA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/applications/emulators/libretro/cores/desmume.nix index e1009508362c..d29d892714c5 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume.nix @@ -10,13 +10,13 @@ }: mkLibretroCore { core = "desmume"; - version = "0-unstable-2026-05-03"; + version = "0-unstable-2026-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "desmume"; - rev = "a55c393de8ecf19df8111f65b8e12d08b9616520"; - hash = "sha256-0+uSOg1asszgnDbdRsfWQY/E2Ky2tK3KxkcNV2mGjBQ="; + rev = "ae0f7f51f96d9b5741b47b425505a4a4224b91fa"; + hash = "sha256-M8Z2Zk9wjEuOOg++Tk68A8hgCmE63nh9+oJhu4fsQsk="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 08984bdd5b9c..4b7600339804 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-2026-05-09"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "776ae715211d3ef2413b2828e9e9d50d869a6822"; - hash = "sha256-NgPs8H8/ysD18J2G9StaLM5e05EzgjLW8c2kTrcOXZI="; + rev = "1a2d079aac28c540c20a9e4cac87bb02021c3eec"; + hash = "sha256-4q1q20Us7HVZr2CWsqujQWiqryc/xS9/bVBt/x7Y5H8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 0daaae4873d5..5cff6401bbe1 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-2026-05-10"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "4be8a484665fb5684ccb780ed2165018a679c622"; - hash = "sha256-kjQcKdxUMdUc+70OPzEtDeSKy/m2e0FyPDa4XR3nHmM="; + rev = "3e60beb69e557287c704dc310f42286258d68a2b"; + hash = "sha256-Ew3YjR92NnbvGoNFhSZSNNeSrMMWEeUAfnJSp6/tnIY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/melondsds.nix b/pkgs/applications/emulators/libretro/cores/melondsds.nix new file mode 100644 index 000000000000..ea5e45cbcfc7 --- /dev/null +++ b/pkgs/applications/emulators/libretro/cores/melondsds.nix @@ -0,0 +1,109 @@ +{ + lib, + fetchFromGitHub, + glm, + libslirp, + fmt_11, + span-lite, + howard-hinnant-date, + libGL, + libGLU, + cmake, + mkLibretroCore, +}: +let + # https://github.com/JesseTG/melonds-ds/blob/33c48260402865ef77667487528efd5ca7ce1233/cmake/FetchDependencies.cmake#L44 + melonDS-src = fetchFromGitHub { + owner = "JesseTG"; + repo = "melonDS"; + rev = "f6692dff8c0c53f77639a08e5e746a286312bb41"; + hash = "sha256-+bMqpjspQzyRci3u0PEpR9oX3S9LBqP223y6VfI2j14="; + }; + libretro-common-src = fetchFromGitHub { + owner = "JesseTG"; + repo = "libretro-common"; + rev = "8e2b884db16711a999a0e46a02a3dc0be294b048"; + hash = "sha256-NYxi1BADUgMAtLfmYcOIhTAnmJ/LYd0OyfPKx6lorw4="; + }; + embed-binaries-src = fetchFromGitHub { + owner = "andoalon"; + repo = "embed-binaries"; + rev = "21f28cabbba02cd657578c70b7aedd0f141467ff"; + hash = "sha256-iW3DBGdp/ykE3EoGcuirq5V5lKV0vemzIjDFrINzQPM="; + }; + pntr-src = fetchFromGitHub { + owner = "robloach"; + repo = "pntr"; + rev = "650237a524ea4fc953de7223a1587c83f2696794"; + hash = "sha256-qGWPlHkcW/wavxRN76SHiEKCl2b1VZR+O9YrZOFZL0I="; + }; + yamc-src = fetchFromGitHub { + owner = "yohhoy"; + repo = "yamc"; + rev = "4e015a7e8eb0d61c34e6928676c8c78881a72d73"; + hash = "sha256-J5wAqF5yQ5KYArJJyKzaqscWsXq+KAPKXybYfVgasXs="; + }; + # using nixpkgs zlib gives a linking error + zlib-src = fetchFromGitHub { + owner = "madler"; + repo = "zlib"; + rev = "570720b0c24f9686c33f35a1b3165c1f568b96be"; + hash = "sha256-5g/Jo8M/jvkgV0NofSAV4JdwJSk5Lyv9iGRb2Kz/CC0="; + }; +in +mkLibretroCore rec { + core = "melondsds"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "JesseTG"; + repo = "melonds-ds"; + rev = "33c48260402865ef77667487528efd5ca7ce1233"; + hash = "sha256-n5MZ6BWUWRi+jz34EbL+SeSkjFZeqQNXE3hS6JzS424="; + }; + + patches = [ ./patches/melondsds-noslirpcopy.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "find_package(Git REQUIRED)" "" + + substituteInPlace src/libretro/CMakeLists.txt \ + --replace-fail "include(embed-binaries)" "include(${embed-binaries-src}/cmake/embed-binaries.cmake)" + + substituteInPlace cmake/FetchDependencies.cmake \ + --replace-fail "set_target_properties(example" "set_target_properties(zlib_example" \ + --replace-fail "set_target_properties(zlib_example64 minigzip64" "set_target_properties(zlib_example64" + ''; + + makefile = ""; + extraBuildInputs = [ + libGL + libGLU + ]; + extraNativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "ENABLE_LTO_RELEASE" false) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121831 + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") # required by yamc + + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MELONDS" "${melonDS-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBRETRO-COMMON" "${libretro-common-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EMBED-BINARIES" "${embed-binaries-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLM" "${glm.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ZLIB" "${zlib-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBSLIRP" "${libslirp.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PNTR" "${pntr-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FMT" "${fmt_11.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAMC" "${yamc-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPAN-LITE" "${span-lite.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DATE" "${howard-hinnant-date.src}") + ]; + + postBuild = "cd src/libretro"; + + meta = { + description = "A remake of the libretro MelonDS core"; + homepage = "https://github.com/JesseTG/melonds-ds"; + changelog = "https://github.com/JesseTG/melonds-ds/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch b/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch new file mode 100644 index 000000000000..fb589848d0cd --- /dev/null +++ b/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/libslirp.cmake b/cmake/libslirp.cmake +index 1cb6758..bef1793 100644 +--- a/cmake/libslirp.cmake ++++ b/cmake/libslirp.cmake +@@ -2,12 +2,6 @@ add_library(slirp STATIC + src/glib-stub/glib.c + ) + +-# Copy libslirp's files to another directory so that we can include it as +-file(MAKE_DIRECTORY "${libslirp_BINARY_DIR}/include") +-file(REMOVE_RECURSE "${libslirp_BINARY_DIR}/include/slirp") +-file(COPY "${libslirp_SOURCE_DIR}/src" DESTINATION "${libslirp_BINARY_DIR}/include") +-file(RENAME "${libslirp_BINARY_DIR}/include/src" "${libslirp_BINARY_DIR}/include/slirp") +- + target_include_directories(slirp PUBLIC + "${libslirp_BINARY_DIR}/include" + "${libslirp_SOURCE_DIR}/src" diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index a896f0aa58fe..88617aa02e56 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-2026-05-01"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "20e019d4405e33472a3c20824c53bcd79f474a1b"; - hash = "sha256-4yQtwE7Ghm2/43u2Xcht4WctTNkQjAhMTZtXj4EoJTA="; + rev = "6fbf272e342387281484ae84f690fa129f0ab86e"; + hash = "sha256-JwFIQfWaorQmDxYgHvpq/CEFMc0LVAsX6TyiGN6FhZA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/quicknes.nix b/pkgs/applications/emulators/libretro/cores/quicknes.nix index beb36cb6b7ff..78151466a51c 100644 --- a/pkgs/applications/emulators/libretro/cores/quicknes.nix +++ b/pkgs/applications/emulators/libretro/cores/quicknes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "quicknes"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-11"; src = fetchFromGitHub { owner = "libretro"; repo = "QuickNES_Core"; - rev = "7848e1ac22b1c69d056ae4cb57710651ff1dd169"; - hash = "sha256-cgoLO1572XoDDBJiEFglWtbo3vk5EXu/U3Pn7zrxqM8="; + rev = "a0ec494c417f365c578f3dacadb04383e4a99ade"; + hash = "sha256-q1AS4mASF2gaiGyuM6a/Z57bp0DPRQADlM+snb3iNSg="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix index 3121978358ac..677f2268981f 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "0-unstable-2026-05-05"; + version = "0-unstable-2026-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2010"; - rev = "d9cba8a41b3407ebb929816a7033e0407fd7b2d0"; - hash = "sha256-OdJStJK823PayWS+bmwG+kDrdx6KeVWYiSAu61C9UFs="; + rev = "bc82e8281ddbbd487875866f5db27cdb9838d319"; + hash = "sha256-laAXE4U5ROKe2QnYbUrvJ4xRPv1hzllDZ8ei01IwqKA="; }; makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; diff --git a/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix b/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix index d33c0938c749..642318609d7b 100644 --- a/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix +++ b/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "virtualjaguar"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "libretro"; repo = "virtualjaguar-libretro"; - rev = "e04f953915731c15f5f9cb9b8ae44630c901f23f"; - hash = "sha256-jjF3vyVuxViyZP1wbxZduBhURYylGdS3BKxzKnPBm7Q="; + rev = "18828045f76a803206ebffc9b8d57842287b7552"; + hash = "sha256-lHQsApSoZNvyTp6D3lOBHyLCQ321cirUVXZRHXvIdP4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/default.nix b/pkgs/applications/emulators/libretro/default.nix index e4925f538cc7..85c0cdfde622 100644 --- a/pkgs/applications/emulators/libretro/default.nix +++ b/pkgs/applications/emulators/libretro/default.nix @@ -106,6 +106,8 @@ lib.makeScope newScope (self: { melonds = self.callPackage ./cores/melonds.nix { }; + melondsds = self.callPackage ./cores/melondsds.nix { }; + mesen = self.callPackage ./cores/mesen.nix { }; mesen-s = self.callPackage ./cores/mesen-s.nix { }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index c1c4d66f3d16..068d7ab27d04 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1859 +1,1859 @@ { - version = "150.0.3"; + version = "151.0"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ach/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ach/firefox-151.0.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b110d79a025db3f1250e0015f126e17326e31c6eba8ba991f7e8f7ec92438d55"; + sha256 = "a5a76be506df358bbae61cdc6784823d394c2b002684eecf338341ab5c446663"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/af/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/af/firefox-151.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "88c2649644c313a6d739fdaabe6e2708f737fcea3a01f9e735e0b5ae901fb95a"; + sha256 = "2678780a72e4f57161eacc44199210e1400d22d3dcea56453507ba01be55530f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/an/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/an/firefox-151.0.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "dc6a77a941b1838a4c123aa010432b93e5f89ad58ba92e18229a6dda9f4a4dad"; + sha256 = "c0b0420bebbf728d49ac4e8722eff64eecc66d4bf859e93d43133c4c17aa11c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ar/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ar/firefox-151.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6b2757524aa7c6fdcef222d88c20b83131da70287d0834d1a0c970deb71580be"; + sha256 = "9de18d9a1d1f01e2545c82efb9364052b15fe7daff002a5057e03c9f3b2c2171"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ast/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ast/firefox-151.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "667a267dd94b629b984c58147e46c56afd179ee0459c9cedd6b8834b8e5fabf9"; + sha256 = "89fc9a1a8996fb329c86afde7e48c905d47594582176f36f8dc00a658b456d83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/az/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/az/firefox-151.0.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7c16a8304cb3847487514a8ce645649973d442ca48642d4791de95cc921b137a"; + sha256 = "83cdd42b96cf2949f7276787889c1bc669d7bae6d948340b977effd0a0c797fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/be/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/be/firefox-151.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1c6a3b08fa09ea90cc26b8b2ba74936b7eec8e8a2ba3c49390bda93736829e2f"; + sha256 = "fea2becc0482203bf95707b85021df967621e7e6a48b5663e117d8ff2267b24f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bg/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/bg/firefox-151.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f3c61e0b87003a323f824d819a545f7dee8a60d3e4804612816b69b87d5345b1"; + sha256 = "2c7ce49a800913424a0a00f3674dca3a25cb30d3a5093348d4916d8b7a439c5d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/bn/firefox-151.0.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "82cdccc9c40bd3e18c416a46219bfb2f6ddc3b5b5be1270b618377dec5e25262"; + sha256 = "1606962c0a5f3b6d9eb75fdd05d1ca221585057748564fd0521d6af1ea55cf37"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/br/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/br/firefox-151.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f42d5b6ef018ebeecace0a91d12c6deb891613e1bc00710e0b7d41de461bd4e8"; + sha256 = "30ffca3e5261fa6b14915e36a057757013a0b78e5a6a27cc78443bcea28563da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/bs/firefox-151.0.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b8b6f26430a0e8fbb38c4ef678247f754f5399b47ccfeaffe4fdb229b4db2d0c"; + sha256 = "638080f855f5ed767666c270c1f0a7af7132f60b02e3d4aec377a806ccdd7476"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ca-valencia/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ca-valencia/firefox-151.0.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "4d6f35ed64701809ea8f988ea0a16e95f189cf7142cba0667232461364ebd0af"; + sha256 = "ca0653846f1b9015be4b001f136d1fccdcdaba39a1d563c3db8c7701b4b2bcfa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ca/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ca/firefox-151.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4dc354f71b7639e65d5056c9e40d920ca96c9c61eb0e8d0564648b7961f4969e"; + sha256 = "4f041b300b31b163e9fde50f33b82351b43295f6f20af14095ac0d46c5beaacf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cak/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/cak/firefox-151.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1c93b4be443a73952956c4f10d76ca26b3b1d01747e75827d7479831b3a92963"; + sha256 = "46d0f9346e0a3c1b1fc94a529db75a9b6a31468481face0b9b6a1489a493c24d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/cs/firefox-151.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c4ddba4015be9f07f6d50c0bd02e70d7f6d4b328efe4645ed5362e5b63c4e23d"; + sha256 = "de972f37854c2958db42f5f017eb4ce1d564365bbb71b310ebd810922b507149"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cy/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/cy/firefox-151.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e68a6ae874cc708ddf7e0fa6220d3a79a94fe9a8953178df34eb014aab6ad14f"; + sha256 = "e02ddd1b459c9d9a8c0ea3e87d6210eb0f48936dce911d38c0a84ade4e801fa8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/da/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/da/firefox-151.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "76ddb9c43712fb52f03b3a6cfdf0842a5e2226734b7e174949484db0b496d804"; + sha256 = "aec2b1b944ffc2a52862eaf125cf236ff56cc03b4e1e8cfdc1e587de8d26fb9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/de/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/de/firefox-151.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1dfdaab8fe8a71f69ac23b9e51e68bc4754db56096c824af62373fd8f3f42720"; + sha256 = "ed2b60c73db03b28d0ee2a135afc23489e911b55adf423ea2b6298d8afafb206"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/dsb/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/dsb/firefox-151.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "62a87ab977bf84178aff68e57fb57d800b9865acc17d217f7aa1f13d3f86f9a5"; + sha256 = "7328eb1d6abd3b579fd882ee6d55c5e6365d7d0f9238fbf5b2695780b6b647a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/el/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/el/firefox-151.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "592faf30bd51a727ccad2b3baf85b4118c7e6c0558ce6eb1302c2299784c374f"; + sha256 = "f64b8b1cdc959187bb48b9cc1b6f59793a0cbcc2906c82091605074870a075f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-CA/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/en-CA/firefox-151.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "01b678402f9f20ef3e0eeab4436aec920a676ba5c1c784009ac22ac905120991"; + sha256 = "68ae97f7a4bffeed62c5810dc8b47939919ea7fc37fd237ccb2f225dd05cd692"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-GB/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/en-GB/firefox-151.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e59e003251ee575389df00ad1f6b2a359a5984cd79309f014698fcb2041310a2"; + sha256 = "33c96a93750ac75ddb55f751d747442413d2b41a0f186c75384aec90b9b7b0a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-US/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/en-US/firefox-151.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb679bcceaef49ac38b671b66e78fa1ccc3e603555fe9d79ce16b4b55a388b91"; + sha256 = "8ff8557a5ca3903ebbc1d18570684075f623465be5e362d63a95b3acc523f824"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/eo/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/eo/firefox-151.0.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "46831e655a7f314f16f7a4be415187059eb97b9f967e68a1557afe45d59dd590"; + sha256 = "f1eacece6c91eaa07e086c4cc5ef5361e83f8832032f515cd5dacffdf8a547bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-AR/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/es-AR/firefox-151.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0b05b0dd72bfce1d2076570605ab02838bcc0649a465ec4147bf9e7d4f139279"; + sha256 = "bde1ba71c68851b60ea720b0f5d629baf21710b67222c7444b76cda306c5afd3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-CL/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/es-CL/firefox-151.0.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "da6a0c053acf0b1e49f066471467547ae0dda617331e979d03854da720bd4ddf"; + sha256 = "18db222688543a1a8b08c8f26c3305ba00649a25b2283647cccfd6a994f3ca59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-ES/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/es-ES/firefox-151.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "658f734bb3b9ad5d3113cb8fb8c5137c7ec582f645071b0e7e312af664bb0b54"; + sha256 = "1653505adfaad6bc1d2dfd72845bb476331683e11c42a3f79f1093c334ec493c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-MX/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/es-MX/firefox-151.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "aef367df499e1994fad49760409bbbce50249b112aa2d760911dd6794f1d828c"; + sha256 = "bddaa285441594afff25907ff70b1ffb04fb459fe3409c86d513f99bed6e6c16"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/et/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/et/firefox-151.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7970b9c1a8df297640a4a75ecf7f987d6c9ad1a81b827b95a25c679ea6f06c4d"; + sha256 = "6aa74d1dec6b0b11ae56f3a416d3b3d0526be9ce2371a770a926a7f8374afd19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/eu/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/eu/firefox-151.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "785515b7aa70db97cdcd1f2b6a8ed96f69d6d86ddd92da822c833e60cb7cb3db"; + sha256 = "ef86f5dd4bb5ec021b3dbb13db89644a8f183948e09f7515e57b2080940ae994"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fa/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/fa/firefox-151.0.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c14f0edec796668457cdcaa39ae991e74c81955d19c2bdee203fb1f4d7d21c2e"; + sha256 = "c2f629d4c8f15057b96f6ae592c3cc16e72c7866137e09401af51b728bc2c5e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ff/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ff/firefox-151.0.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1a0369b2f14c69411f54dd1c46c7f4410ac7d7577a9700557858f75355e42de3"; + sha256 = "94ba483a64b80511ffb566424c60f5f77937a2141fff865c214365b67ba81a3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fi/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/fi/firefox-151.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2f05be2b87cb88ed71532540bb0b760f45dc120e0db9975a89428eed3cf9f49e"; + sha256 = "fdf9bb2d329421e07ac79ebf7cbd860889804963936b9e5149c8bfe9a6895175"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/fr/firefox-151.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1aa3f2a047b5095487fe29bd6359a807c3c481a0302d4fd2b5693690dda553d2"; + sha256 = "de54178a0380a57b38ff6cb944105bf7937d9aa116e193f7d279b58a8f466d01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fur/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/fur/firefox-151.0.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "55e8cc652e576bf553f2404cf726a12f1ae86bfc8e927ec6f6e73323ca7fc784"; + sha256 = "6712064abdf6578299b8a4c0c2e090200d8cf1c23ae8304973d06be13c197506"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fy-NL/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/fy-NL/firefox-151.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c1bff6ec2b0920b61bd395ef00cbc610354edd7d1791774ad8b47e0d8a644342"; + sha256 = "b7f3672bdba80059b4cf22c94acea7dd7cac47c31d2948f16ada9885ea98e65a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ga-IE/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ga-IE/firefox-151.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "745d777b25fc46ff5b58afeec4f3c6a0499833f3294c5690b6a62480efec9085"; + sha256 = "60a8ac9ade98ce8b582406b60bb02219d72b507d59d39759265e6e3617d2a361"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gd/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/gd/firefox-151.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "eb94eaf391a79e6ee45be37bbecd9afd52fc142469e0198d7db0de528cf0ab10"; + sha256 = "0295116c9db870de81de3d9402667801940f1ce86f01abb59841055aca2fd708"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/gl/firefox-151.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "22ea7a5936bf686bbb693852c0adf21e42ef84ed8275beb766f2007f14ef4f27"; + sha256 = "73327accfc87945fb50172ab7e460ff457e2173a81821594f25c529e73a09051"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/gn/firefox-151.0.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "58d46df41de1c854ce334835850992cb21a9640ef3d7e043b6abd3b95acc1335"; + sha256 = "41be6729fab3b4caa59cee438a1ef9569cb5edf863679546163cbb2c4c74550a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gu-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/gu-IN/firefox-151.0.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b48a14634ee0642b21dacc7e6d38d6645659d1607796e305f083bc815711de92"; + sha256 = "4ae5d1be64034316b4ec013dccb3d553cd001a0b1fb157b23c428dcccddec8f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/he/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/he/firefox-151.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "da8b260d4a5af7347760d6b18dee7a7a7b49a4893209aea4e738479122f67e55"; + sha256 = "c20dbb8107bac56fe3a5b8a80b5add649a345b58f8fb7247f41b5559fa65d587"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hi-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/hi-IN/firefox-151.0.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cdad6d1a38aa72de0021179bddea83be1dee79f9727fd2739f6c5228aac3e596"; + sha256 = "5f189fd5aca90cd10bc07e4e6a0f0ef7ebd113be34e064d4e06ce76420160be1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/hr/firefox-151.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b5b6b93f52d043d185cb2d6503f4bb6dd66c04bde58622b0b4adeb885842315a"; + sha256 = "3defb65ec98e3f2a1122c19695238247a70102fbdfede4acbe5cdac2e55e156d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hsb/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/hsb/firefox-151.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8d6fd77cceaf9f2cabb1f65e856ad539fd187c302e6b7903458d759520b93923"; + sha256 = "3378387b0b9921e811124f0bdb778b738a5e5a98747f55e68e92fa32a9f33203"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hu/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/hu/firefox-151.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "874d79e05564fb70ac94ae99fffe5c88ea38b2d40eb433d25bebc5175a5b7149"; + sha256 = "4ee2039fbb3ff5342d4c8c40a04dfbd03b4edfb7b9bc773cbe361813e5123d83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hy-AM/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/hy-AM/firefox-151.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1925cf8a11406ea67412b1111fa1f25d3f328044486be84ec187382f5b72381e"; + sha256 = "acd5e851802bc446013596ef0c1e42f0baeda5bdee194b912eafad0b9f44bf19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ia/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ia/firefox-151.0.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f095c529089f392312867c18f73dee2614b6f24f868a1dafd9c494d172ae8896"; + sha256 = "5682d525831b08638cde736942e09e41cee33fd4f09954d975f20329bc9828bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/id/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/id/firefox-151.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "24d3aaa147ff7e644da345344e61ca8cb37ef2139915b384a15fe6d004a5e535"; + sha256 = "d8819f3ac8b15604ae75d385fec91623e127a27ddcffb1fafdea4d340ab24e0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/is/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/is/firefox-151.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a1ce21f7c83a3ccc3491fe14cb33ed714791892efbc0924cde78af16fad193b4"; + sha256 = "7cf148001db49c7e9ffcc99cebec6f3c33c5b55ec9a39f67098d0157ed7e3aa9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/it/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/it/firefox-151.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f749900f86d6d019d834623fe70881761318094c84e415251f74a4fe55505d81"; + sha256 = "f0d3f5e44975ae57004089d1a6f3852df7d6895eed8a19c99c03b0d68baf8432"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ja/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ja/firefox-151.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3f539fdac0bf494694666510b05426ebff87279a19161725e997b00ca126a950"; + sha256 = "051c8121400cd48eb31de084de36067319eedc2a7f7a741674def831704ef48d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ka/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ka/firefox-151.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "76a12a3a66d14f97c24255e9a00a8364adaa583e3ab85c097434320f10b7aa4a"; + sha256 = "214d50dd8ad9978f36165d4bfeaf4ff29f0b2638b735d722c599067150a7b78f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kab/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/kab/firefox-151.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "db5fddc015628c1db3bc605c4e752d2dbbecc7dbebd3c556646a7abf94cc4d85"; + sha256 = "4eaba0a8dbfe33cea09a6fd8fdbee810a252cfdb459077ef158461001053a163"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/kk/firefox-151.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f8e91d4ba7cdcdf93ce2f6b7832987c28285bd775e093ebef9b0d3235d4a6617"; + sha256 = "01304cce83ee42b05f1ed2874313fae712bcadc27a403aac9aa0189c24dc04d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/km/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/km/firefox-151.0.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "643514091766594647ab583049b386fb391bd2789b78bf760dd4f37888d9a332"; + sha256 = "823a55f2e80fb42091dc06edcb4637f0f118ea6714e6584aa7daaaea6dfb70a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/kn/firefox-151.0.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f0af1711504be1683799f7a00cd44e129b59c3e0b2237a3aa2b04c25ac693f7b"; + sha256 = "7d0657004dd58983151b206bc4344e6ed7865b1b97c6e66f8b33b97484e72a27"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ko/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ko/firefox-151.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7c3c1e484677f678bd6d1c9a4a8ae7145edfc88d406031a61634e7f221689bef"; + sha256 = "b2cc1ae32477a9020aa5f7133678b8ecd39df9dec14ee834aa87929c6f3ffd1f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lij/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/lij/firefox-151.0.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "490c760720d8af5cdc56058b0d7dc17a9695e1f8f2c867f55750ada9de41cc4f"; + sha256 = "7d919594a4282695c54cb023e857e8a00c1502eaaab92d53ad94ed85ec77878d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lt/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/lt/firefox-151.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2cfc6f4310adcd7a848fead558f410d10b26a6bd38826473b9fd5101e469efa6"; + sha256 = "dc64657b46d99ff0e79553c26dd082cbcff18da23e3a1439c7fe8fb16f78e350"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lv/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/lv/firefox-151.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a43c6c335e8da84b91fedd9367814e6c5692ffcf85239f39dc0ec3a7fbe61f26"; + sha256 = "4fb0f0f9a2084eb497df9d5d2743eb1695098b9e1de0ebb1b2ff1d4503185671"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/mk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/mk/firefox-151.0.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "81f85f4c78d7d0b151ace4bf2719409322e08dd2abf19302b3e6a022c02ca32e"; + sha256 = "fc658480be05cb3d9196cf196d6c73535a76248d6c4d71607808efcf9c1f1741"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/mr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/mr/firefox-151.0.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a8d46f0c5cfa6148d2410e93d1bbf9d4b3f263d6eb1b68d71a5adb0e66e86c5b"; + sha256 = "879e9051bc452e19c14b2106f517bf2a6706f5640f4035619f3d1ae665d4f693"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ms/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ms/firefox-151.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "81d651d5b913aee2fd9469c2076c2e247dd381b927d9459c1f1cb029883df749"; + sha256 = "7603b8dd2ade484d72d38e59581975a37bafde52c7abf3adeaa6a0257fc05bd5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/my/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/my/firefox-151.0.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7441547d3f8547214420cbcc930635baa4bb348589d6e3ee413f12881a281653"; + sha256 = "fa40162961669df54755432acec901041f1f0eb5348d96e9833fff53e1ffbfe1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nb-NO/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/nb-NO/firefox-151.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1ef8884724b9eb19dac94bdcd2e9ba8d70e32fb733064d21be175396140750e4"; + sha256 = "ed971ddae3ff471101a0e5e7a349cd2a8ae33caa971af2490359688af5603f20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ne-NP/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ne-NP/firefox-151.0.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1d0c27f7ef131f257e2b72d4fee3e1028ddd5ac1cba7e69d335431c1f2cc6c96"; + sha256 = "dafb39613109054ec59882a2d2a011c4e3e1e8b1e8425214e5efd67edc543d3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/nl/firefox-151.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "47e6716b923a42dc99a746e7a8c2824de77768c52af1d37561d9400669d746fb"; + sha256 = "d13c193297807eab501b3a268d3e2c3378509f6f5c3694e14516a8772e6f87cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nn-NO/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/nn-NO/firefox-151.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3d3f6664d205794fcb2802e26763082efb48602271a89ef3e40d8c9f647dd9cc"; + sha256 = "e3aab38123b129e7274eedb47b12e7fe614bb2d3b5db8916f206057a6f611aa5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/oc/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/oc/firefox-151.0.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "19b98aad2118211bd538bbe17fb2079ffd83735edc5609483871bc621613f5f5"; + sha256 = "24570c0a704b4955b66f50972595e000dae514ec8faadd64fced24c680bf7620"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pa-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/pa-IN/firefox-151.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8ca6dc0c63aae6fada75497d9ad8159ae8a602e840e4427e12024eb1ae869a30"; + sha256 = "c1d0d10ad699ae98bff12df474fa5c88b36afa22a34654efca28b3c1011c325a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/pl/firefox-151.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7a64dbfaa6fce9cf34331008013de0dfcee9dadb6f02f164afbc3604ade5b3d2"; + sha256 = "168b01c00acdd364c323d39b8144b23e4da54471950496c7389c3be43a5ecb0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pt-BR/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/pt-BR/firefox-151.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "830824327328f9267203681fee852af84912eca734fb32a9ff924f2fb47185f9"; + sha256 = "75b9850e8ddcbf144609b6ff737cdd5e05d674e2af899cbed26a44f80868d346"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pt-PT/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/pt-PT/firefox-151.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "08da83ba17317717d28c4f56ebb5505d3002af50fedd38f0640c2dc203e3888a"; + sha256 = "adb608c47a46f4840e280dae4279c146c3d1a36b1204c3ff630480f5023e2c05"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/rm/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/rm/firefox-151.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4c7f41735317d8f00e0af96cf257b0943afa080cb8e1098d1fd4c07ecc9f24e4"; + sha256 = "22bc13a10e7f94db2f91cc22e1562339d0d69c59e668c35c9cbe37bfab488041"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ro/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ro/firefox-151.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9fdf91169d564f70ab89a7bf690c05035444c29afa64715b06bb410b59cacff5"; + sha256 = "7d774462f72d5dcb6137ae42c51484b29da8fc9f5c00b30be41671b9cb7940c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ru/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ru/firefox-151.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "55387683c3ee7b1eb97e36830a1fbbc67b2249cfe90dba8260e8f2c7010fd57f"; + sha256 = "41e9a27b194f047759fb1ce94f7a79e3e5538c40dcaf1b2235dc7088c5d1eecb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sat/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sat/firefox-151.0.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "a97632c8c724cf478ed890bd01a7f6edf5d4052949c287b3bb304a9b58652f55"; + sha256 = "b5cd47ad373c9d1168ab081b3cb948bd566c934d99df377b71bc9e0e70e64c70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sc/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sc/firefox-151.0.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "53570d38e3c74e6f380e2d8d7f54cd31eb6d5d8de186a8727bcf1adef61ea247"; + sha256 = "a08c3ee253655fe5b6505062331a6a4697534090cd2da7f13253dfb743f4148d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sco/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sco/firefox-151.0.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "7fd18819e67a648daf64dba6d80bcb7349cee865b2c1653b1a09fb2ac9d74064"; + sha256 = "f7f5ddf183b9efd2a7f2c527d672ed472e2e66f9de2abdafe4e450c400fb6277"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/si/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/si/firefox-151.0.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "cd5a37080dfff288c9b34cc5a345eca808cfe7c163e05d3eae382f499a19a24e"; + sha256 = "ece465b47735bd672da91e4446380536c703844684dc2083641179f72e935bba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sk/firefox-151.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "758b474a3f175d08ce236b46d821ecb619bd038a6a1ec0b351c873fc8ee3d731"; + sha256 = "8f446f6f88db393cd8bb23d54ea6bc4a048ba22a458649773c5adf132c2726c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/skr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/skr/firefox-151.0.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "76a5af24cae928fa8e75eca1ddeeb341d8b3db7c764ab5fe2983ce76fe5f971f"; + sha256 = "809a46d9f569f214b8f84df27190acd20d4ca81d596cb801dd0b49c20877b318"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sl/firefox-151.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8ea2c59728d235f6ede416dfc4b9c0c68667383ec902235bbda0978cc83efd63"; + sha256 = "978575c6e1f15315575641c5c466f7776edc28b707539bbc8de6baf1a0a76647"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/son/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/son/firefox-151.0.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "10f3ef71708c527e100e15314d02263331f413af014529115bdb9e92511a0029"; + sha256 = "aee5ec60a06e0f15371fe9a753377952b4be38d68dc2d28fe8eec4efe498a6f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sq/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sq/firefox-151.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e1d234ac615a6be12521e9298e7a05009bfeb20d5fe79bf0d5c6c700c7711254"; + sha256 = "cfb2365bd00aaa111c74d72f535534b204e3fdc56ed13ecd3ce9ed5170b31324"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sr/firefox-151.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "580acdf2e8ea44817cbb47027b25848c271e367d1b8d634d919c0be45639d8cf"; + sha256 = "c678b10aecdcc118d64dc4880abd90460d9a8a4c156dad1e7f8614a0b58c46da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sv-SE/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/sv-SE/firefox-151.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b42b665b3333970d5b80e4faa81c7ed8088fde7e25bb11dd7e834f48d1ea5b5e"; + sha256 = "5be1cef027daa6513289e5462dc7faa4e2471c683f11279bd8713e72c5ac8e45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/szl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/szl/firefox-151.0.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ad4ee3459216f4de9a4591aa6bf377f7c242c79b1bcde7edcd039eb2aa62a627"; + sha256 = "ed732c3160e2cdb0a2890e3d6cf5553b8b10913a8bd2bab20f1184acaf045bf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ta/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ta/firefox-151.0.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "414619fa8c15531f898ae1ce59e6b3f02d97054c910148427a501eee05539d7b"; + sha256 = "fc50ee0a5ecff1f88dee5382e8235373e3c9607bc0fe43884cd17e54317a1e5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/te/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/te/firefox-151.0.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "62739c34dbddc93ea442a85095995ce95f0812c7ce86e1b6075fcfa41608d048"; + sha256 = "352ded5957561e7891bd52aaf2339d8aa8d40112b99fae1007513d4556a9bace"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tg/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/tg/firefox-151.0.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "48348263b0e806c68a99c4f451da31f4b0e360d371783ebbc1fb24d97b4eaf0b"; + sha256 = "ef03eabaf3c5631c85026f6bebddc3b745be0b1f4bdb81ef30ffca7566ecba0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/th/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/th/firefox-151.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "07180251e6a4a94506bfcd1546ded10307d825a7847a9bbc861308da647d706a"; + sha256 = "692df7973e0757f5559d644073d63f721c85016d9ec5fca99f7e4319a778c211"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/tl/firefox-151.0.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "75d2ddb6c1293653b96b7e334d4a42d65aceff197b39d8a46f0db2d08f82bb69"; + sha256 = "a24216ca2b1ecd9803b8783394ac200af4444d6607d109c6925486dcd394c2d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/tr/firefox-151.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "392fdbf3dca29ff825ae6ea818e16a5b0518daef775d28eb600d655a3f5aeae3"; + sha256 = "334b0e6b19f88b4e9a339ffd08eb36a68c5b056809e30c44677e9e79704e430b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/trs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/trs/firefox-151.0.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "38d0f308c6f01e87119e72e2c78bc04887051cfe19a1d081c95836522a312ac1"; + sha256 = "83699dda01b1d87ebc038543ab8c942f4709dda3ecf9e008025c5fe324099754"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/uk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/uk/firefox-151.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f6e5ae5a73b2e5df4b9803c6c4cf70e8033b7a900cdce9feca2ce15a84c3fba3"; + sha256 = "b5d36836fdc9fcbd13af2172e139c4c7a619616ab6c363da4772a4dab15c6379"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ur/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/ur/firefox-151.0.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "1114389bfa8b4fa878c8a682955659705c4e5746cf91a7d613dca0133a364a1e"; + sha256 = "c1be7be733aac68adcc6e36c1cee0b4da633c425fb7e52aad06cd9dbb9e8f48a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/uz/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/uz/firefox-151.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ddd541250de960a71494b9533e66fbe17b0b4ee3133e55b4fafc3b3620cc0227"; + sha256 = "208cb307466f94f0a20645c80e1ffdea9b77206da623eb46ae8448eb6f68b5b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/vi/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/vi/firefox-151.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1cc1aa1b8bcd7fccf73d8357a9ff666cf1ba6e94821e8b22e4aa210be202ebe1"; + sha256 = "eba173f003dc1666b9310bca22e2c5603c61dedf33d9f8bf9ddee2ff57541578"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/xh/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/xh/firefox-151.0.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1bbbe449feddf3c3bcfbd5b51b2227c5e656b4b2c3f0458525c5d2f542d2dd7e"; + sha256 = "a5bc75166b5635d9562653b68247e7d5d1c321a9523c5b5050eee0a47aaa002f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/zh-CN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/zh-CN/firefox-151.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "6a9bd9c8c197826c1fccc8a5823ca6f81c04eb685d07fc65d3e494dad773d7bd"; + sha256 = "097c3b40899efc6f925ae517b095d250d27a6144607d033aa39dfb41d2784871"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/zh-TW/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-x86_64/zh-TW/firefox-151.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e9e9b9b715f609afeefed53b9bce5560106470859ea8cd725886ff6a6534ceba"; + sha256 = "51a74af0d6cc092b62c64d9b2a01a8d126a7603ff1956a8191801946f4068356"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ach/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ach/firefox-151.0.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "609142b2e36f495780fc6cbf9b429d00653d9e5b266aba4d0fbbd6235be69659"; + sha256 = "4d4c66823249c61e40cb6b934118d9abe23a3c29310f1456b994dd4c5eb5115f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/af/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/af/firefox-151.0.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "7ae1c6de8c829c840fcc417070b0e24c1dc8f058fff6434aeccb127777396e68"; + sha256 = "453a26ab55010c644c668de23a0f53fd8967a132aeac0686f48d5ac5387c545e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/an/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/an/firefox-151.0.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "7b25462a271226f660e46fe72c3c915794daef4823e1b6bf1c847868033ba145"; + sha256 = "5c954cc7a6b1cb58b24e6d44c3183dede5fd923bd7f6a7ad9e1be74a825fb898"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ar/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ar/firefox-151.0.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "8e290a30cc7df79c249d4799cbb458a5385bf456e2d8eb6691220719f73013c6"; + sha256 = "7cdb9b1a1bd08fdb2058ae8d1561c286e47aa32abcb775cbf6208451e6c47807"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ast/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ast/firefox-151.0.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "f63b32b398fa7838e13a4009584d5b32b71351ac9f4da40d069b5e8f16797b02"; + sha256 = "5e8fcdba1ff9a9a0a85d64e9822faeb1ccc76c116f0928c3e26d886cf4a29ea8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/az/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/az/firefox-151.0.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "d6bb3bcf504899c291197bd6fd1e253cbe30966cf8525d0ca98d151f250275f0"; + sha256 = "8fcc0a17ea899271eb0d57f835621a8cda4a654a5d15f76aa2ddcca59903f4e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/be/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/be/firefox-151.0.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "c1104590bfbcf7893a91d210eabf6c596e0567cd1ca2e3adf09af108f12c8a26"; + sha256 = "c203d795c605785b174db9de567adbcb31476361a6664316848327ba6a4f3995"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bg/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/bg/firefox-151.0.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "8c67f2a9ba38319798b87dd1c5dab1d32e5433a6e153aeb2a42eec6009316fd8"; + sha256 = "dfd0ea5a0ea0a160450c169f631cf95739ddc4d6f5e0744342a492f6d8c766d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/bn/firefox-151.0.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "dd99bb4b20bcfcb6ee207a626f55c2cafa690212554696dc39b8f1ff99ce4c0e"; + sha256 = "c187bc56514729c7a348443e0993838757fd31421a23f8b22bbb7c3d231f4dd5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/br/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/br/firefox-151.0.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "e0a1cbb25bbecb6e6d353bb26635eae3123a916d65cf5aba8d110f8a9cd33740"; + sha256 = "7041ed716353625317361cdf45443c500fb2f85a8a7befbc0cc5d7ed6ed615a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/bs/firefox-151.0.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "6058300cef0b3dcea5d0a6668a781c4d6460d0970120419325cc82e147ae674e"; + sha256 = "2d6fffa260bf99eb84776da218b9faf1ed99c0ad0bf779a58d25a8e4f4620ed4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ca-valencia/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ca-valencia/firefox-151.0.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "fdc4dd4cd9142227929defe2c029c6870ad6653925c8e092c99a46cfd6030f3c"; + sha256 = "7ac0936aaeaf180f2c0c7150d3e73635178d79e928ac5cfd859507d8b26040f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ca/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ca/firefox-151.0.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "4e0b515065940e05744d4ae8b7f2bd8a530a576d285ee9349f0157bacc7666e7"; + sha256 = "c14784c510d47787690b6bcf9f15f27fdaa672b0e3c26bdf06a4e39c0ed0024e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cak/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/cak/firefox-151.0.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "32b7ef7ddc8f85d727b950af7eb120206a4da390cf8871e8cec2f95f480646bf"; + sha256 = "ce40bf71a941255a9f845cb21cba068c7100a3d10b8314570ad149ce1cc7dcf3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/cs/firefox-151.0.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "2a2e86c4adb60d7d695e4c9ca215e688a4cc2abb152565b6fad27e37f7ff805f"; + sha256 = "502fbbcf920da48afe40fc60a99b4537675ce814697dd03e6fc67bde131e03e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cy/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/cy/firefox-151.0.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "504abf3b27c3f832d2a493be02cea13bbbeb96832ed99846eb32d880848f899b"; + sha256 = "66876956205c2b99db209620c6729e3d14a5c7cda4e00fcff3c21510925ca338"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/da/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/da/firefox-151.0.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "1454d2610c666c9e0927e0b143cbf6a2df391da9089beb0d6c445fad8542881d"; + sha256 = "3df00da062bebc7057c049cf34a1cb052462c4718f0396955f730ffd4b80b1a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/de/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/de/firefox-151.0.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "634e3f3a68b84f4121f7b99879c5abe126f14c727ef9d64c76b50cf331d2b7b4"; + sha256 = "fedfb8c6d357e25afff212f85686447cb1a2963e43e5a9efeb6da824e4c0da12"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/dsb/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/dsb/firefox-151.0.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "9caeb08a987b1538005243ed70145c30285297f0cd1c580e87e919cc9c85f51d"; + sha256 = "752b6a1f2e2a34574dd8f7414b878d2b8f76bf5b0ceb36732d7341e53e9a75a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/el/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/el/firefox-151.0.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "e7e809d616c80a7249fdc9cffe0ecf8fc590517ba7e8f25b29af1b991ddc68ce"; + sha256 = "f31ddcbca79f41600184d8c9dbda56618a64442d904f57bb878bc0adf18713ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-CA/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/en-CA/firefox-151.0.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "78c9869393a40d6c72b19d9ee8de6160fc59272751e37f84b9e10800b4763abf"; + sha256 = "55ba52d8e39e61f634f0d066184c4dc1fe3fbf6619afb8d3bdef5f0295f03223"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-GB/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/en-GB/firefox-151.0.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "8f2567a4425d62e619b099bb592109c803e7b16e0250afc0feb1b1544ec76f86"; + sha256 = "1175a01cf65e2994623e1a0a22b151f2d6fe4d9f41d5ab2288ee0bd24fc3c886"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-US/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/en-US/firefox-151.0.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "04dba22d48149121d04b3c934ad4b505b38ea13c652f394ee645a65c8148d56f"; + sha256 = "d4da9e278e933238a2cb873ecacd4cbb00e3b6d4b35fbbe3aa949c4bdd816230"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/eo/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/eo/firefox-151.0.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "5576dc2eb993c9f79c6f0e58e898abb98eb2840eea040dddaf9d15a48baddf92"; + sha256 = "f82c3e6030f5f4148ebd65552a159da6d1eb0c0170c19748ae098b749d92dbfb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-AR/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/es-AR/firefox-151.0.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "523e5dcb8eba0696e2d0fd9235327b34e1b22eb66161bb515983632a078194d6"; + sha256 = "bbcf0d66e2177c47f8e1f8ab02b0939561fefec733931acfbf3f31f66dc4ddf7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-CL/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/es-CL/firefox-151.0.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "4ce1ba60a5a56b5141d9c93484215e0cc83f17a05d022efa2d84ed27294f161b"; + sha256 = "2b46e200f7e6e862ae01183c46fe1c970eedf516c649449c32dfe56cb5a36658"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-ES/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/es-ES/firefox-151.0.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "980ffe716e56d63e220d063ed295870fc448dfbe5977c41e1cff001cc8d8322b"; + sha256 = "7430ac325d6a226f186203979ba0372357ee13f8389f6ca00771639713095ee7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-MX/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/es-MX/firefox-151.0.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "03e4991204f5d8e792c55c0fed319965298d8a4ae938d4edae5b21cad5490aa8"; + sha256 = "261bddd2daab4bd05a641e76c34d4437678f4c8df0c8b569e60cda01ebfe71b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/et/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/et/firefox-151.0.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "1680a1eb650aecd296821e284a23b23c00c8161d14c5a5bf440cfa04217baedf"; + sha256 = "acd971403e78b3ad1a1fe4dc0b204920dded7bd6e87c277b019d3c82561c1dd8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/eu/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/eu/firefox-151.0.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "8589a59a69c7a41b2ada5047bf41f73c498bcb567df64e0cbe3b34ba04dcfb23"; + sha256 = "856051d95bf03e4ef51c381380e6e2c76716d01aa7b9857e2fe40d8b6da0fb23"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fa/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/fa/firefox-151.0.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "0e7463b8bd40d2c80b1fd682779c59c6e2201673cec74d444c8094e83b87d837"; + sha256 = "340947ba7768ee52c8961f6536080d469e6cac8242994da3dec313365394f87d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ff/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ff/firefox-151.0.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "c4871f073a8361302073221f3018bf507ed7c7622f5d76e8aed5640d4bf46bb1"; + sha256 = "07abc0addba4524c2edb1bfb98aacf3845598f0361c94dea184743b5785c3a16"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fi/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/fi/firefox-151.0.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "8a7014b69f9bd97a308451fcff32d49b81d71ef8665fb9adac5472d322e0036b"; + sha256 = "2227beb7fe0a3563a38f02378a4fc81bea5f01567815ae74b02321ed78c5fdcb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/fr/firefox-151.0.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "018b5680940243ea75fbc8bf5c400e0ac56105a4acaca1949bf211e5a0bb6ddc"; + sha256 = "bbdd8e6c1a20f906078b0847d25418c60798f9f016f99109c4244ac97137765a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fur/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/fur/firefox-151.0.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "6da3116767ea86e63471666baf9556cbd2b3414d5e5678b8552239e518832b7e"; + sha256 = "3d7387c47f35b3d9388b9d4cebfcd1b0250b0034215a134352088b8a3cfefcc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fy-NL/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/fy-NL/firefox-151.0.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "a83ee94f813fbde530450fb7474c5103898ea3bc96d2c69d2a49165158330c0e"; + sha256 = "2bead167fc0cc24819a13fddc3cbd19f227dfd692636f6eaee01bd1300229358"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ga-IE/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ga-IE/firefox-151.0.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "55d5b536906007d90667eb45ed5aa2712f01d7efcf2cefd1bb342e9c9caead4a"; + sha256 = "897eab817a35c7438ed35a1eb8c9172fa26871027f8a76a74b804d3aeace3f32"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gd/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/gd/firefox-151.0.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "0eb5db71cb9924e7d514fa9c69d87b637ac4b8a2337a5a9c1cab2703086a89a4"; + sha256 = "47b26129774bedbc8b713555385c5441fc14a22ca8d338e9a903c80cb71e0c70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/gl/firefox-151.0.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "d13e92fe4f4bf1f7bde9fb3c4256eca0ecd4b33469a54e566750c22a7d930760"; + sha256 = "5f94849277f41eaa2721be4f5cb46b885307922d84b9200210ec2c57e36f0e5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/gn/firefox-151.0.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "c950481f0ce79058facb0284b5d701ec4e89f53537c463f18d6db0772f7794ca"; + sha256 = "31caf29f7b061b7b3d4c606751f0c96b86756edfd8bb49c048e1ff929a807e8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gu-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/gu-IN/firefox-151.0.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "4f4b0a720f1d9fd1163c7b32476000cbda79aa645dcd92afd8b5ab0e4422fd63"; + sha256 = "36f94e92406eec7e824b8d1a966b2efb21a5e2da5cc1eaa83d22000280445b92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/he/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/he/firefox-151.0.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "bc4e36dc5a79db5ff3f8cacf334177fbda100f4be1d9762c555c2d9cd42af15b"; + sha256 = "4fd6527bfdbb0e891b356aa794f2a4d44175a5b22a02f769b25b03d7dc3c02e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hi-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/hi-IN/firefox-151.0.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "06cf47c19ae73c097342ade1a936fcda8290b3b57c50655add4342843ab458fa"; + sha256 = "8eb2e5af2d641c13754a814acf81b74c4fad13d83ac39352e9927ca7e4965615"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/hr/firefox-151.0.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "ee82c974d8c16d1498435299af9926c3ad508bca18eb6d41b3eca68182a07f44"; + sha256 = "3a943323402b86a0e0fb28308c2e31325832861043fb3b9fb7d5e99e04470701"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hsb/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/hsb/firefox-151.0.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "b0e6dbb6e9f39d889a5ae6137b0b00b8e7d26ca4ff8bd6d84b8a8581ff2340e6"; + sha256 = "45d8c6b8183c58b6cc6c5c142ee65573328f1f18af4324fd90d6c7499135740b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hu/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/hu/firefox-151.0.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "1762cd4150d8ea4ce442d61e13c645bc7cc000e49bcf2c6eb186cade8c6865ad"; + sha256 = "301003aab101cfc707ff2408bec65c2ace19e503dca65ab870c5a8e445a00a4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hy-AM/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/hy-AM/firefox-151.0.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "dd813c5bbdae53745982f7be3b962f310a2058a97a8cca08e2ac244e457de56c"; + sha256 = "f381477388be8bdf53ce9532511755211585f564a2b3168bf01d86584baf8c4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ia/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ia/firefox-151.0.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "92060ca5ac712853903c4c25d5f1008b8c0edc321ca7d07872b18d61a7528fe7"; + sha256 = "63f12016855425d4e7df1f17ed3b1c379e72ea7418019c83b534635b021bba3b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/id/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/id/firefox-151.0.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "86e494b77a5df88f83cae19fe119a6b4c5fe787c899dba3657450accac2c2372"; + sha256 = "cd3270e929525fa75553cdc86bccc4c811ec3fe7115f3ae8f562df8e6e2ed4a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/is/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/is/firefox-151.0.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "e303c74ec09e5e9c412684b85c6fe674d9a6a8f99eaae5ec4c8fdee7258cce41"; + sha256 = "804e9e3ad94148f42ec2c9a8fb78a85acfe8024638ea1ac60bdfd415e1924eb1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/it/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/it/firefox-151.0.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "75286030038c669c8603019f21015468ef08ca952d48e0febc1cc3734afec7e8"; + sha256 = "a2588cb97bc2faf6855034d7b571b9db4b960798b2bac7998e6f5dd596ec550b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ja/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ja/firefox-151.0.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "99d3c66cbf605b18a417ac7e8503504bdc5d130f7b65943f748cb05a1e419473"; + sha256 = "aaf4dada0d1499109f651d8e9c372f1530ed8ba0989a9860bb49165646b95156"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ka/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ka/firefox-151.0.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "e21892a51e7e89eed7be2232abf3f4e0295803c08f300da780b50bd217ce244f"; + sha256 = "223d84dc1a58cd4bd90bb31571e601c23d6f4642e6045d9ed038741100c9887f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kab/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/kab/firefox-151.0.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "444382155f323ff8bfd5079ab3cd2e153d8ea9d95c4dc3bd6aa4372ccb9d5ef1"; + sha256 = "f41adc567742bed4db9a5432516afbf7974379743418b9bc25aa4860cf7e6886"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/kk/firefox-151.0.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "4b0d60ca1778052e23fcf8302889e3b8ed03cb4b4383410f7a3c48bf4058503b"; + sha256 = "47102d0dd408d7a0be7fd4f2ff258db6ff14bd40c5e57368dfadf93bbd2920fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/km/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/km/firefox-151.0.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "52645c40e961b1cc03b5d9db4a661311e1bd071331756a440d13fead456be462"; + sha256 = "e190fbaa4880a3ecf065d1add6fc171f26005d6bfbf7f7429281a10a41648c13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kn/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/kn/firefox-151.0.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "4cf67abfd7d553b4d67b340f047644e0fa0bdab7db657e2d4562a44d6fb9146a"; + sha256 = "6707476be236bd6ca950e1fcc0ddb173b10ad3b5b6dce23caa4f3929cb740b73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ko/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ko/firefox-151.0.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "9c710febcd8cd5a0c4f292bcfeef26c86fa4d8cf9a3f195afc068751489da97e"; + sha256 = "472c7c2b8dcef4b1674f88e7cb076c368cb9d4d1bb83944f385ca082afacfd3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lij/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/lij/firefox-151.0.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "55cab9d3e0d0a4a8a4c0cbeb98d0bf6a93e48d8a0fd4f2c6bfecd89601f8d99d"; + sha256 = "be6a8a248d747a363ebc5e780476706e557404d5747190c64226426a5bc40cf8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lt/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/lt/firefox-151.0.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "1095dba04b0fdd6e8f62cd101519dc70b58c06514ec8fe29129a4c25f5b7d760"; + sha256 = "5af4b0d97be054271513a59a9b06ac14b647125f62c926cecac8ad27affe3b84"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lv/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/lv/firefox-151.0.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "a62e5dd7258dfc90718dd1e4e7225c966563cb1cbc69c932d0a39bd2700bf0b1"; + sha256 = "9d76aa87ff3076db11ebe18718177333a16de585e93fbf00c53331f01baad2ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/mk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/mk/firefox-151.0.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "6f02418ed0b7d9b9d83c383db8c9af514d73dedd591bf7a23f953512dfdce720"; + sha256 = "af70014688638ef15ca8468211fe85d0ade71a9a9214823b6c3a0e2ed9625fef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/mr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/mr/firefox-151.0.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "95f79acc5f0351e7328602bc10da43e71c839f3a836e5ebad73d6032e19e368e"; + sha256 = "0641fb7c9db0e897f6787f0a35fb592551d481194486368366f537e2816d73c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ms/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ms/firefox-151.0.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "1b5990fb87358ceef5f038a13e12eb1d0a84f54c97daf0c40e4f7d831fd88559"; + sha256 = "e65b4c42da3e6dea72916bf1e1e1b96ddccdccae54a3310794702168b4ccf4b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/my/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/my/firefox-151.0.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "3727df44bf1b33d427b62a93bcfd5e3532fc85294847a88da9fd1c0b4b96be3b"; + sha256 = "f18ac1d33d9caf22a22be663ebdb60036239ae23ed3ffd4812fd54ece35632d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nb-NO/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/nb-NO/firefox-151.0.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "711f96f135b3016b4652992f931308a842d62ef3fd91579756a2696c77a513f8"; + sha256 = "6494946da10f46f8f5b8f73791fe65fd4afdf782d479673d0dcb79b3561f48ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ne-NP/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ne-NP/firefox-151.0.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "ece69ded232925d5b75c07c7cead942426827f7b8935389905c4da7d4cf04596"; + sha256 = "4715032337151369371dc87b354e2aef30becdd883c474e975552a0eb2f3aaee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/nl/firefox-151.0.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "7f25b5d90624642259d2173bdca8efeaef7e41e71fa89fdab50173b503c5f99a"; + sha256 = "03218d3d7f1779faba98c87a60f0400537d221ed032053307564ae88e99408cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nn-NO/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/nn-NO/firefox-151.0.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "04f6d46292fb789ba4139fd2801bde18b9152fd8d5d515959e3107d0deec6763"; + sha256 = "5b963090678584cbbefb4ff1796a0cbd5a0f6b00e62cbc1f5b107a75496e8071"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/oc/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/oc/firefox-151.0.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "795230f7a96e1624bb6a341b8a172c12e89b584b4a5bc3cede089e58e7153600"; + sha256 = "5aff1aa7a6dc0f965c880c251438a43b87eec32eb89f454a9af880ff555be780"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pa-IN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/pa-IN/firefox-151.0.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "bfdc3ba2dde0a62cbad1bd1b0e4fc6334f9ee4b66e75c59b8b40fe744eb8b6cb"; + sha256 = "a6a3db8b68c023cfaa9b3ce0108db6deab426c6980635560dfd55c6d74faf0ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/pl/firefox-151.0.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "89479a1a75575fad97879f0a13fcb9e3583e8f6a2cfff99dfb0f86985cdddaff"; + sha256 = "3ac9a58d9b919c0cf7ee6ed320a4df15eaa9232ea6bb24eed5bec973d6384648"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pt-BR/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/pt-BR/firefox-151.0.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "dc454c03cf7ebcb9e13266e30a12219a11599be49b5c8b8d94b64cf65800607c"; + sha256 = "b31f2ba16bbe34aa2966e8664b97ec98fdae095372fe8c46276e178cbd55b5a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pt-PT/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/pt-PT/firefox-151.0.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "7032f11e50ab917d5f53846a2e09e70bb9a163ecb8dc3eec1e041af943e8b42e"; + sha256 = "fa78b348228d366fe77f8ba9d2dabac76d125b351e43c6d90c4ca4797e99f776"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/rm/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/rm/firefox-151.0.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "c76935fe32c69581dfe49a71d68cd173f830cc6e9a84f652d69360d946b89d95"; + sha256 = "1005ee1c52ac5f4a65dc8188a342cf9cb247761dd0e248333898b49204575d57"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ro/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ro/firefox-151.0.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "ee62d2d12b2acb2d8544478621f3c5e8ac7ae76de14252999640424efce68534"; + sha256 = "d056b0d8f85957b5b0b6437158885ec779d400eab51f09d9430ef6c4c89a35e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ru/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ru/firefox-151.0.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "dc93bcfd05d4a49027aa530216156d34a1f882bbc9e4c6a66cb35eb940bacc3f"; + sha256 = "2ba3f9a81865c0c779901fb77292136ccd37788ce26fc52d8c9656cffc9550c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sat/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sat/firefox-151.0.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "047ce0f2aba3c43238c475fcd9827dbfe77028fd5baa2be92ad149effe47362b"; + sha256 = "3e5064f43181292186a7d6b4ec80f5e788c0114abeeb6901f9408bb1dee035a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sc/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sc/firefox-151.0.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "9e07f64f3c67682451fcb28bc6b40074101f959cb8f7e2a648a209a8368cef47"; + sha256 = "fcf533c590a06c80fdebc594b436501ee2041296783f5342565f138a587fed96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sco/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sco/firefox-151.0.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "ff09ea9b2d5bc328eb6aef2f5e44e79c914087db873390843465ebcfde2084cf"; + sha256 = "8e94cfafbef16aea4e0194517ec08ce42db5fd3323f35ead72fc3df667c0393e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/si/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/si/firefox-151.0.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "01cc154a4fc995101e834b2e50cd4c410314904f6bdda8ac1037f47b31b8bad6"; + sha256 = "3261a60c1cd7408daadebff15297820035270927431d0810dc4ac174bb28257b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sk/firefox-151.0.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "0dbb0c589a5a72e18485c510f8ca5d10a1a8e714a0d61a64e33751340f951b7b"; + sha256 = "0f4f25d0a21d0b7e0fb7b740cc07f9c51dc9652dfb0d6d082902ee2883a85f12"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/skr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/skr/firefox-151.0.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "813eabfefc00872793aa67dd7146125dd8c901cbce6ba20b20778aa417514736"; + sha256 = "4d3d9d93aa6df5af0aa9d97f5e0a8e49b3d95a3c8786905a57dd53411b3ee4d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sl/firefox-151.0.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "89f31ce36efc94fdba2437829c2d3142deb58c52f189863ac1a972c1dc96fa3b"; + sha256 = "8930a0146a6aaf89f8dbb619f25b9a48035835d5509f235b83e4e141ff3d0185"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/son/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/son/firefox-151.0.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "21cdefc0e9ed59b9e38959c2d854db1dd0155a2868a982ea579f995adf565835"; + sha256 = "435cd666d88654aeff6e036c4cb60fc971370168284a16d3748430a8b5860abf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sq/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sq/firefox-151.0.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "b9a6996b964bc3549978d9e4ff27606d48d5ef3d6f613aaa8e639287c62de50d"; + sha256 = "524059ec4d47efd0b766e23025651a9962a25cce63f96aaead3749022024a2d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sr/firefox-151.0.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "72965e30194e03d273150ef3cfaf76d2cec6764a09a2e2c0e439089d53d996e7"; + sha256 = "60d098e365ea1a884f73e763d529cacac64367b50c511664b8479a689d6183d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sv-SE/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/sv-SE/firefox-151.0.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "692be357be645a6bfeefd2e602863495beb193205bcf7c22556c62df91c9d6b8"; + sha256 = "ade0f10936ba4f48f691bbb3ff8133ce1c00aeb1641fa5f79860db893f9eb035"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/szl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/szl/firefox-151.0.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "7ee22dee8d511641992808a49642d6c550070814fe4365bc7775fab12f4bb718"; + sha256 = "0ad2833df04891dc189bd25e2f8886cbea70b2f21196fc4e4abbebfd3cbfae13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ta/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ta/firefox-151.0.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "0f6a8885c331cb628b20432ea71fb7c09f90b9c069a29152d7ba69dcb9d60294"; + sha256 = "f600771a35906f42bfb09ac50a431ccca238f077b3da8780f04df1b6d776efec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/te/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/te/firefox-151.0.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "c2919357686479cb86eb1644ff6817c219ccc7f6e429c215e681c023102f5012"; + sha256 = "6f4209f11c65ff3d64e375ea036bb169a8bf2c940d018f02f06858011ad0e107"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tg/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/tg/firefox-151.0.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "7a58b99b0f9caec85c6b5a6288900ea62f18b037af2dee71477d91e105775c2d"; + sha256 = "971a9c98354226f8b64dc53b365c4de5c42e05873998c4b7d6196225bf70a315"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/th/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/th/firefox-151.0.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "f20ea4b0bff9cdc210bffe06dfc9efb4cec7ab597a1147507b438a3c96b4e97e"; + sha256 = "6b2b5855f3fb5baa289dd08b70ed12c7eb9f711788ad6953cfcd091104da4668"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tl/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/tl/firefox-151.0.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "cc3b683248ecbff2bb9e77cfc2b70b1c4d1d0f0a365cfd81a1e1485185584053"; + sha256 = "d39a71d80a7c5e3d9b50cfe72a592660e9a1274f9f9d037ece91392e4eb02621"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tr/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/tr/firefox-151.0.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "381162cb8eaef72a56adb6ca4b89326a4073c34ddeab88dd45c10c53934f33fe"; + sha256 = "6a1ca8f4adcc89e91fed8262ab27e3b121513ee2e1395c357df5287b88ba8908"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/trs/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/trs/firefox-151.0.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "bdc9aef10bbefd59609d6851b2ebd977bcca4118135797f6dd000f3c103e1b06"; + sha256 = "cfcbe9876f5631870f8e8234e3ba88043d212efb98fe53f92d6881a04e5e9a04"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/uk/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/uk/firefox-151.0.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "7b04226407a07e5b5d6edc8690f6921352863b3a7a1f3ba1967a1e09ae2cf863"; + sha256 = "eaa24d387af026dec90897796ea339bff915d44d00b9d5b2d69f05c0f1019511"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ur/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/ur/firefox-151.0.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "96ccb73f09bbca1ce94ebe429faa32f05101381faffcfe9d6ba626bed81addb5"; + sha256 = "b1451aaadb1361f38e5392473d8bb60180b5277e86704fac2fe6abe4aaa18ec8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/uz/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/uz/firefox-151.0.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "fbaad41c98c45387cd7589d47379a0888af4fb4b01deb7331c5628b603db1341"; + sha256 = "4d1d48ed78db3e2f995a76bf60f49cb5f69502166a826ebd4c3c3e19d5c32b95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/vi/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/vi/firefox-151.0.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "d3c0440cd82b2fab56d82caf07cb30860f8bf5f31aba40d822338db9c7703ad2"; + sha256 = "71ad190c7d6a0ae9f615680be9138dfda59735abd8a8995341fd964f0583f629"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/xh/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/xh/firefox-151.0.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "b986d2a7932256045a05bab515b78ac0fdbdfdda5d0ff1a5a05fb3d9cc4445e6"; + sha256 = "2fd567ecac47f6b92ee2562fa4472958e688d512fbeaba20f1f968560259daff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/zh-CN/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/zh-CN/firefox-151.0.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "9a0d3fdf58281e5bffe133e51493cb751b66269b55565e9bb19b1ad1f73210d0"; + sha256 = "2a5312e573d7c883fa984a28bc7174ebef73dc6814a9690a4d59652cf6c59b7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/zh-TW/firefox-150.0.3.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/linux-aarch64/zh-TW/firefox-151.0.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "9cd8e386f22ff6ef51dd7195c65e46a44451532fb1bb6ae28882705005b35f99"; + sha256 = "8263f9fdad943430a35ad735ed550512f1c05773d49365e61ac9f5ab6ee9a4c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ach/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ach/Firefox%20151.0.dmg"; locale = "ach"; arch = "mac"; - sha256 = "e8ae2695a5a924a1b12e494f0443c00039050e290173f6076c905319b5540ed5"; + sha256 = "2d39a1c9e5973b5608b8b96e688c4fa118dce9dff46a83d023ec21c2ad95e0db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/af/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/af/Firefox%20151.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "0e8a5d5958cc30dd6b8f4f5dd442f2ab5b8a940d040f4bcc97ba1691e40fbe68"; + sha256 = "8be5f0a52046e841f3bcf7e99c66f907f8bbe27ec68d20de7c22eb952b83502f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/an/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/an/Firefox%20151.0.dmg"; locale = "an"; arch = "mac"; - sha256 = "cbfecc85abee0af5c14d66a84a26effd83a683ee8644a5219b65230cf6a8d467"; + sha256 = "0b8dc181726ef44249ece9c7c7ac7b68b6ca861d1c8a934875769cfbbc2eb127"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ar/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ar/Firefox%20151.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "0c21d9fb70eff0ce10797322d084a3676c029796f162cbd3963fa5c13978b77f"; + sha256 = "7028f599f7cb009df4934670c60988a160e69a4db92890560e17c1ffb8f45fa7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ast/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ast/Firefox%20151.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "8806f5b47079fe1c1c6479e9a31492f3c9061e14ecd3e60b39c633f415b874fc"; + sha256 = "8f3b2aab5f194eb6fd925efee31b553e8d2373dfa72388a687935e9d4f857115"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/az/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/az/Firefox%20151.0.dmg"; locale = "az"; arch = "mac"; - sha256 = "a2acf3511ff915ac00b646158ac8d32060bfaac7e81778ea1eab7b85dffcdd01"; + sha256 = "e052f1df0ad6b23e8134a248afe884adcf2f2aa6f7826d4f91dbbede14353f13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/be/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/be/Firefox%20151.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "890a3eaeea505c47f47708774f07251c9131f4db666df07818adcaa794c9fd2b"; + sha256 = "b5fe8f4bbaff0340469fdcff80ea43856edac81083de408ff0a601f7fd5f5ba5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bg/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/bg/Firefox%20151.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "2d48e85de949f8c838c65f6f2fad1a7c1f46946d21b62aaeab1572ebcb821695"; + sha256 = "c61d5c3cc6a283affcdafd9a543be25eace71dc3a0cb5552df99d6020637ef1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bn/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/bn/Firefox%20151.0.dmg"; locale = "bn"; arch = "mac"; - sha256 = "60b170e50f4744bb0c7c07dd106620f1a9cd83410ea4a2d4834bf1936eca8c7c"; + sha256 = "117d920b15830d40cd942c92bb06d65dc68ea8039d9b8713caaf4e7ebc91a70b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/br/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/br/Firefox%20151.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "23ab7073bec0f4891e046ea8e57dc229135763dcf1c5f623128d1cdffc05806b"; + sha256 = "22dfba1d0eef3c8b47c933b5731bcad3b8e468bf57fecf5aba128f916ce0e02b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bs/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/bs/Firefox%20151.0.dmg"; locale = "bs"; arch = "mac"; - sha256 = "99a134fa46e6ee82022baf13314c2d358f9e52fa92afbec21493dce96cd2e0ee"; + sha256 = "17260432f94af0fb8be4e8fcd02af222dbcc1a18813909e3988524277de298b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ca-valencia/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ca-valencia/Firefox%20151.0.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "975f2b2d5476d684bbe8cb93f1277310ab349f9a7bbb0eccf58edd933e09601d"; + sha256 = "4de7f7f242af6f3f69f0a3106e339d512d2e8c2a9e19463efe1f3391dcf25e6d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ca/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ca/Firefox%20151.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "33e99e6eb159a550fdfdf2e44f22976c7b077b11c7241d0833aada3bb72be202"; + sha256 = "6f47a78a307c208ac05d1b2990d827388d228255292984a6ced2edf7541bdae3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cak/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/cak/Firefox%20151.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "2b4ede387d5e9d31295f9245f7f30e688762399e8226af87a5e104402d72376a"; + sha256 = "28ab337e4e849994cc84cb21f810f35cadb208fe0537c094f03a1c23d3db62f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cs/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/cs/Firefox%20151.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "51036fa2a9304c14eb303925eb2ebc20d5505eb3f34c2d8a76e03bc11ef37359"; + sha256 = "120d79c879655e340809439593d5acde0b923fb09436dcad4ab8ead2a54c20e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cy/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/cy/Firefox%20151.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "dac0584eca0c4a994c0b2d9dac5c10f53c2dfd8026bfa84a725bce3933b7c50f"; + sha256 = "21a8a9617c45ef59cd8124d6ac6f767b3608a3964291aed503b0c4e970301f91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/da/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/da/Firefox%20151.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "9bab22669f339811aa0516aa268fab6de11898c72e4efedc618f8f7e8d838b28"; + sha256 = "77e80b452fcbfd0144a0a0fe22c5862e0086b6260e4e2422db36dbfd1ba7580a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/de/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/de/Firefox%20151.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "f1b77c24b0770a91cbeb9b85a2d20751c51f356d4c211f980092870f01b10954"; + sha256 = "3b55f70332a89617ccf0708e17201c2d08d7e63ef60e3a982a3db9b27c184050"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/dsb/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/dsb/Firefox%20151.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "b93444135677cffac412f12f5ac766317cdda3f5e32a24d4884efc0f86ba887f"; + sha256 = "5b3f0ef2edfa4c8121f4c991d8dfcd21429fa2a5b07e4cb50ad93f50edec9d3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/el/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/el/Firefox%20151.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "af83a167a76091f9b11d4ca7fd1c6ee7a1d88927fb2794a2e835eab138f0b914"; + sha256 = "22b40a82ac79d718984d72ef997fcab82e2d1bc196866bab1076097d42c75b25"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-CA/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/en-CA/Firefox%20151.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "ada93df0f999dd630533782672b217746fd078d0f3d11ec4d71258592c132e6f"; + sha256 = "88788f4a518bb4472da7d0b34a5ad8f9e81ec3602dfecce54c7a8e37e97e435f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-GB/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/en-GB/Firefox%20151.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "c458dcec2f782b136fb2f8d62ca2b6a4e22c7b3eced14a750be2aff3ea0a9cb0"; + sha256 = "c16fad26df7572f2bce210e8e9665287529802b102031a7055998e8154e9dfd8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-US/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/en-US/Firefox%20151.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "5f8571d35b883c9c210ad4249f25c6a46e7861291a440f65d5249587dd1b9051"; + sha256 = "5a56ebd8f0f8cec94a86e04c6793e1d1502b40206f5d4c86fff5b7a270e84f6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/eo/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/eo/Firefox%20151.0.dmg"; locale = "eo"; arch = "mac"; - sha256 = "7b4eff49a39756f94df479ff34b3b56d1eff0aa9395ea5f0b40e52308edf2788"; + sha256 = "0c456aa7549ed28c1c0f832dfe7a13706c1806e40c561c74aefc00aa5b8fcbfa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-AR/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/es-AR/Firefox%20151.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "f4e9edf4aea02d38471eb82da9d80c63cf208bad8af9a0bef910615e4e629701"; + sha256 = "8129602f5cfa38743608d6e49f6226654f9342111a6acbe78db23bb959781d4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-CL/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/es-CL/Firefox%20151.0.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "4aa6c514462a56e22c6b426b431de9c32e0349a9670bda4184a84ae621eeb89e"; + sha256 = "daf2793a2592caa18c828f988b5d1619af175548998c9cf2fd4f5043e18b7961"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-ES/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/es-ES/Firefox%20151.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "82773c9fd996c73cd6e05680f2cf3ae7c9f12b5516c30cd21225d06f81e8cf67"; + sha256 = "ba86083477a736ef1f0fa524e246b1585dc67ed47b2fd78b3aba287504f87972"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-MX/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/es-MX/Firefox%20151.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "e7f3fa4b2345686320f1435aa3daa4fdb2caf0f4504f3e22f7b8c3f8b516cc83"; + sha256 = "3f775b73be767c849d6be8d7c73241f94b42feddb1b47cdb8aa1ed505c1de70c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/et/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/et/Firefox%20151.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "6b5b0d5868361bf749566a3ee95f05726b8a9520f3fa8f49f19cb232eac98113"; + sha256 = "c6c693338ef422c671e0efc1196ec9d1c7aae91636f374890fdec06766492f59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/eu/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/eu/Firefox%20151.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "770930621d030d269d6c63c257df8658d2166492bd919b31b3085a422e27bccc"; + sha256 = "e5428751b2dface5a8832d24e4f7b38934eb45841dba78081c3f1ef36138a3fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fa/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/fa/Firefox%20151.0.dmg"; locale = "fa"; arch = "mac"; - sha256 = "4914bc4051c3b6f874a776c753286bfb4e40d0745e81e884c6aaab6d1383c98f"; + sha256 = "f6e6c6bd4c17586a6a4e344549ecf23967fd441eee47d2c3e23d97c5c045dbdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ff/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ff/Firefox%20151.0.dmg"; locale = "ff"; arch = "mac"; - sha256 = "af896a691d5b553af37ab0f93fe35ec8d6b39ddee02a03f021d103ca8243835c"; + sha256 = "74dc9142a8a5265e0641c5d5ae089c8235494c832c4b3a15ff09936983e1e1df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fi/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/fi/Firefox%20151.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "d8a835962ec3e686a352fbfb1233a16df5cdbdc92b609d4fb3e096186c6c1d39"; + sha256 = "54d1871001103db13cbef39663d0ac4ac41331f38eef2610a8d06eeeb40d06b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/fr/Firefox%20151.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "72e51bf0646850992ca8c32f6c3e8ce39dcc84c8a22ab4cd7b03d4ac69a58095"; + sha256 = "2945ac1a35e68af52bd2bdb74fb59ddee58cce3abb160bdc694e7064ebcff603"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fur/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/fur/Firefox%20151.0.dmg"; locale = "fur"; arch = "mac"; - sha256 = "27d41d26843037ef5502720800b8c6da817034b95b5f45c875c4bf550834333d"; + sha256 = "ee76ab05b432cb78775bd9cca54a5fe905a08cbdb42e1f06764f7f296a4c0b0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fy-NL/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/fy-NL/Firefox%20151.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "926ee5ce083e36b8a4281a5f7c8701a5a59df81ae5528e1d78d3959f99faa935"; + sha256 = "cd2d505f1741ce5f7d2200f5c2517e6f7f63d1f340ea376cdf5a8c8e9f5039a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ga-IE/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ga-IE/Firefox%20151.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "7eb2bce5237ca16ef9b5efe779db8ba971b359585dda4aed5c545dd4e9ba6d33"; + sha256 = "cc8c74663db69d805c23da0856346e597b4bbcd251b3b52a728d9d8c129fe613"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gd/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/gd/Firefox%20151.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "a9a930725ab54c733c69fa06c225fe5c3777c7bc7d93da7f6a105e942584702b"; + sha256 = "dcb0b2764b3fa3e93e528a05aaa03cabc39253840e18be466405a025b1c0575e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/gl/Firefox%20151.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "37ae24543295bc361bfa0f795362ddc0758f9b55cd82c61654215af1b5d64861"; + sha256 = "c1e820cedc7afd360c557b8224c53f4159192fd832fd2b038beeb6ba93c2c031"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gn/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/gn/Firefox%20151.0.dmg"; locale = "gn"; arch = "mac"; - sha256 = "b40090fc93099d9d52c23a65b3e9fc5566c29b06cea88029ee6e889622a7933b"; + sha256 = "df38dafe76adf333ed0e81a9d9e7bc97bd910cebd79ad6da32f5eaeb425fd98a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gu-IN/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/gu-IN/Firefox%20151.0.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "83da49cd4b1476f4e3ee2219359aa074f9af3dec5a25108aff43db2c333ad6d6"; + sha256 = "26d84919cdd099354972323eea2b64208192caa27f8fa0f69b0db2335fa18815"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/he/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/he/Firefox%20151.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "cfe9ab63e4804a6812d337dde73a9262794d908810b9ea369f33dadfe9b4a7f5"; + sha256 = "494c384d75c51522cdc5217ecc29a35f098f198a28da6a23eff63227cacb153b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hi-IN/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/hi-IN/Firefox%20151.0.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "ad1b35ed3168b36f5f0f4760f74330e63c6e49efd8a74861f8190d9ce5f6e950"; + sha256 = "9064ab85dc7a42948451b9e150b4585c47d4089e7f146de8f16b1792bc443d67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/hr/Firefox%20151.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "e02958f7a01985c60594aef5695380ffcda616002cc5b7b018de5ed6ae06a636"; + sha256 = "22ab7c8e498aaa52f2fa7663c6192909eb6cb405bd798c8ef35c03c8ee2e2069"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hsb/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/hsb/Firefox%20151.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "724e2539c3745281b1f192561fec68cf0914dfdc39ababee6822a7515e65146b"; + sha256 = "72d2c2f7039cb69a42d2d01c82fedc2ca554e52efc99c0b3b7268f4c4c4642f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hu/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/hu/Firefox%20151.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "d9df70f955e3cf5b4b03103b55bb37643f16f45f97f85cf4899504ecc959556d"; + sha256 = "1327fab2b176372242def645c46959f8febde709d6a299ddd919c6cc38000aab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hy-AM/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/hy-AM/Firefox%20151.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "185f9577a3586b41da331e8644f6ee9c6e994351eddf1120bfc252fbb5b00734"; + sha256 = "bf05209da18f1d4663060f3c42f52c0314e9984fe00a2b2f138ce25697f08180"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ia/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ia/Firefox%20151.0.dmg"; locale = "ia"; arch = "mac"; - sha256 = "3110216636adbfc604cf0f5a090f2eb01865950cc28ed8a415c79dc76777e7d5"; + sha256 = "5610bc3dd092016a20bfd5c7940ef91290849e62483307741b5beb743240e9b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/id/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/id/Firefox%20151.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "0b7ee8aba93743ef892544438c4ad576d41215b80e555c72803d9ad8510123b6"; + sha256 = "de75e525827afa8c03fa62ded7780ba5f4e3ce180c0de1242b77be2740969f67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/is/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/is/Firefox%20151.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "fe63d0e97bf99d2d6c0a2af0e48b16a80b8c862089f77fbc38604ed03300641a"; + sha256 = "3591c354f0975e79913a69ff048485b1249ff414455c0c5ba13410a21c1e3b74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/it/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/it/Firefox%20151.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "c32bb7add419622fa307550d18ad0aeeac7a8847df6985d92497b43ed5f15507"; + sha256 = "9cf1462c22df347a242c92dae5d153ee1ddfd42ebee1dca034a0ef34d997280b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ja-JP-mac/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ja-JP-mac/Firefox%20151.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "901a19dbe4ee46adbba5449945a3a62e6417f2570a95206dbb07f271445cf729"; + sha256 = "a67be8388093814c626245ce0ea734e8b5a53f4ccbba48b89de311ba71d43ec8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ka/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ka/Firefox%20151.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "9a1dffc9ce781bc55f438ea43821af4c00a9ed92ba0996008aa6f2b180e684a6"; + sha256 = "adf1a3db37bb1f7a744b0a7cb135a819eb94c0a6caf8496d69bac538be4fe268"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kab/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/kab/Firefox%20151.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "ea417a9de5abf8bbc1837918b9daedde5bcb979f0c70d2254fecaa88e703ed5c"; + sha256 = "3d8ead23bb995c813cb304ea50a38e4afc0fca0d6b831471e9271951813df3f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kk/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/kk/Firefox%20151.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "71bdb3b9018c91d7e95b07e31dc7aabbef10e4cd0ca1942ef744f00cd46d08e6"; + sha256 = "b45cf0fd8f0be04696760fb611741f73699cf082475a978aff67d11c8b3a5972"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/km/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/km/Firefox%20151.0.dmg"; locale = "km"; arch = "mac"; - sha256 = "37ca745cf17225e93e762335941b1d8f4dcf8a451aa35fada56d83536cc6e47c"; + sha256 = "0c2f3d9fe97fae3e821c31f8a8c3a090002d846f8d02137ed86f1fac582bb7fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kn/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/kn/Firefox%20151.0.dmg"; locale = "kn"; arch = "mac"; - sha256 = "d12f4a7e78443401d49b05126eb7ca68c03a1c4ed0c00a0e4b0c8f8c04fd9391"; + sha256 = "a8047cb9522f2409c602615395dad280a4a32f196d8dca06c42ecf20d213e47b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ko/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ko/Firefox%20151.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "7cda3e9460d47bb4c157b6b4ef53f6b5cea232c2792afffd8d0e36b59c1e57c3"; + sha256 = "621da9205b74cd355981a24e11b543ba722f27d29d74156ce5cd5e0a9a90ca7f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lij/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/lij/Firefox%20151.0.dmg"; locale = "lij"; arch = "mac"; - sha256 = "5422f51a5601f7c8fe83297718c37047c445ad17e285fb6dde6a90b72f3ea9be"; + sha256 = "c165dba6a98a0f0bd2d48f818629b44399e8d291214d6ba839a6f6958dab40f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lt/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/lt/Firefox%20151.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "b3e3d297c92344c887bf5afe44b2bf22329952c9185fd2023245d330741cf985"; + sha256 = "70fdfc57cfa3b0ad1d57bc5ce579d2954165926e63313e04b771b22036242f3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lv/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/lv/Firefox%20151.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "b01354ae7740de84b79ee856177a13a18fc3ee3d3327e9a618d75ed360dcd14b"; + sha256 = "e90b1aa53118af4d3046792837b58fe65fce664da1767727946e441a91ddf1fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/mk/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/mk/Firefox%20151.0.dmg"; locale = "mk"; arch = "mac"; - sha256 = "6baf5e0ebb48e3d5132a8dcdc98c3f69825a7bc43761c487fdcc5cb3db0eacf7"; + sha256 = "f9e174c7311bd790b02f1e021c844f8c3e2ac7ac265daf058fd28bbf7ff62595"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/mr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/mr/Firefox%20151.0.dmg"; locale = "mr"; arch = "mac"; - sha256 = "7b6b3622edf010b37a063046668bdafd756a6a63243beb3c8923aec2f54cfd0a"; + sha256 = "86535dc3590026331e65d0a3f8694516ce1b63fe7f14a4ccbf58409092aa5e9d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ms/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ms/Firefox%20151.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "22a92621ae75cc55d6e279536fe2c2563f09b27c6656012b075ffdd124be3d2c"; + sha256 = "770d89f8cc096bfae6a4180cbb4e19bd825969d15df507d94d47d02ec9138548"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/my/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/my/Firefox%20151.0.dmg"; locale = "my"; arch = "mac"; - sha256 = "85d3b1800e689e59e39613c9bb63114cc8b2df179e60361d6190deb3d65be2ad"; + sha256 = "5045dd5fe643b89c53a9b9a3613e5ea3151b156c2d72746194a1157289812b37"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nb-NO/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/nb-NO/Firefox%20151.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "e663a126591a1f9b47de2f71ec86e94b9e1d0b621db467dec5a8d2152fb9ecb5"; + sha256 = "504c14ac25a53f2bd2bf05313deee0041451298b17feb2c1edc4d48ac9272f24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ne-NP/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ne-NP/Firefox%20151.0.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "402d1401776ccb5db7ec837186cc37424f7f222d84f7ba91bed481ca38a72e0f"; + sha256 = "c7654eaaa3d5b688a15e362d9b6e9585a8fa694fcae5792554a9fe76ea02d89d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/nl/Firefox%20151.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "891bb5f1c7d1ea14bc9f51156749b03eaa94e2875a64c31d61e62007a0ce3609"; + sha256 = "86e00a8576dfc96a24dd8665429fba11fa5ae5dc27dd167f933c18aabe556b70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nn-NO/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/nn-NO/Firefox%20151.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "770e0fabedd7439bb1b826b97e118a9ed64e2f269945661d84e5dbf84f0892af"; + sha256 = "b8464fa7815ddf1bb973d17886508963933155babcda7de34ef9ff0c6d9ea916"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/oc/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/oc/Firefox%20151.0.dmg"; locale = "oc"; arch = "mac"; - sha256 = "2a23add47b0d2e7350e4a6d04984bdb0b00fafc338121a0e61003f5e319a5faa"; + sha256 = "0c8c12574a6d828192a4de214b8f3e6a756ab639973269513f7923ff3e5fa434"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pa-IN/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/pa-IN/Firefox%20151.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "85a207f03caa2d95bcf830453e8fa5d0f73629843926677c1e8d6186251df52d"; + sha256 = "876e6d2171eb62635c4367e3128820e95f0cb3aec515cf012e7107d08b45ce3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/pl/Firefox%20151.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "961442a2fd5b94fdbfc51b933d61771c4214db204d0e55ef21393bdc62fa22f1"; + sha256 = "7e86dc6d6694d904f8171733a28aed0765a87a647bb4e5a10ace3bcaa08448e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pt-BR/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/pt-BR/Firefox%20151.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "ac6be7f9ee80d5875450b4420ed84609359830d400b3011fb24b04d841129709"; + sha256 = "f88ab74590262ab6e1bcc2535e3b868314ee796f9609c44eacadba3eb99f91ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pt-PT/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/pt-PT/Firefox%20151.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "97f1b97c11c233a0a3bf2500abf6166c540e1b076642c5a136c057677c01455a"; + sha256 = "c342cb4d4d3df34ef828da83a2546f33c759dc7c6d1c04d0394686a78bee690b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/rm/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/rm/Firefox%20151.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "0ce80f7ade8ed4118f84be6091376efb64c37182f1c4804c04bbe0fdd1f62886"; + sha256 = "122b5a994623c84e693c35498f4b36773cb76d32b3cd235b2ad04789ce252796"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ro/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ro/Firefox%20151.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "7f743a18dd74829b30bea2dd3628bc0399828eb05bde59b96eef4f7bd57ff5d2"; + sha256 = "ae0a2867d250c02f7776afd9a8887d4654289eb36c0ad23945f30e7948ecfbf6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ru/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ru/Firefox%20151.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "ac473a9f9a5c20c047adf8d2f3d5a1763e4c50b2741a7b71fa2612b1eec4efbd"; + sha256 = "244c044943ff9591226a2c92515a15e09253e7068525a5f7cb24936e2a2f847f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sat/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sat/Firefox%20151.0.dmg"; locale = "sat"; arch = "mac"; - sha256 = "cc2980f8672f373cd6696abeaedc7097eff260e854a0e8bce369d6c045120644"; + sha256 = "a5e29a336d1f81b3d3a75bd59513beb9e3c5850c4f491b04e93e36b46012a43e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sc/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sc/Firefox%20151.0.dmg"; locale = "sc"; arch = "mac"; - sha256 = "039a17f7bb6c873a6a0de6dace38e3df347142197565377f4643ff22661e3ce0"; + sha256 = "335b9b760f23d8d0c4e9933f3e8746cf4e247e75774e01eda6bc88e4384c0072"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sco/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sco/Firefox%20151.0.dmg"; locale = "sco"; arch = "mac"; - sha256 = "68730269b06ca731c9d1f9cbc6ab82a91372bc494e0b1023a37d9fa82e11c8e0"; + sha256 = "fccbaf475e1ba4b5644c64bc8e5f4a7a88dfb1141fb0f6327f20c50983c84157"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/si/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/si/Firefox%20151.0.dmg"; locale = "si"; arch = "mac"; - sha256 = "822777516a694b414a35712bf61f39b101db561ff2f0e448466ff4c0345f0d2a"; + sha256 = "0d03aa6b67c7962090bbed14e62dd9d1a63e44a0338fb9381375620f41040258"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sk/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sk/Firefox%20151.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "6863372b22c2d76b01671a6242dafe9647c6d2fbd2c9dcfe54bbe93a6121cff4"; + sha256 = "3b7e1c53d442480f5a50afc87cef5953d94699644b98f8746e781a281714f548"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/skr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/skr/Firefox%20151.0.dmg"; locale = "skr"; arch = "mac"; - sha256 = "029aa8558c6f560ce4637c43d7fc086eaaeab986a3e2c92dbc7378a483c36d5b"; + sha256 = "421feade271b0aca61414fd055f51325a13bf54d437a2621a46a324c6a41adb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sl/Firefox%20151.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "bab7a494619596c4cda635cea3732380ed2ce34e8fc15f53921f8baa87e4c9cc"; + sha256 = "e174fb1265627a40caea4108cca38bac85e46a1823632535c921c957f8361e45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/son/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/son/Firefox%20151.0.dmg"; locale = "son"; arch = "mac"; - sha256 = "ac913600795043b745984fde40e4d950fd2aeceeb7d4e1d866bd2d7066602de6"; + sha256 = "a29eb1bc927328a78584fc8f117c58e604fcba36905d4abba74100e52d4a57e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sq/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sq/Firefox%20151.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "c5c9dec59bdc67f0cbe058087e1eae42676ee9957f9719815e061b4daefc2c90"; + sha256 = "c9073770bc330544949f0f901112739bfe888a41af3749375a2ea7038b8f3e6e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sr/Firefox%20151.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "1c3080670f7818f2eb608672ed54e65ad779fceffefe752aaa145c370b5cae80"; + sha256 = "74607510bb2575113c821e56607e62827717e06870b8666bf6ef663bb4daec5c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sv-SE/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/sv-SE/Firefox%20151.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "ea551e72ffb100d4752670749e91140a41ad6dd51a2fb525ae7b77ee147f1cc3"; + sha256 = "4e76f9aa8133041935eff88ee21b5adc8ffe15f02252ad8673e3ecb99377ed70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/szl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/szl/Firefox%20151.0.dmg"; locale = "szl"; arch = "mac"; - sha256 = "21f77eb96ae1919fb6962710d1d29a2fb0ffb98c98a9aca1afb2113caee6f099"; + sha256 = "3e7d86c71324b143d5762f10bde04f4d0b895fbde28e4b21dedcfcea0a180f4e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ta/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ta/Firefox%20151.0.dmg"; locale = "ta"; arch = "mac"; - sha256 = "3501bd6cb767caca3c1f6a757798a4bc3455581c9dac914f2fa7cc046d6d1585"; + sha256 = "0aaca54a0ee8102bc0299e4cab82ee8a670dc51f0e73bdcd4c2de08324a201ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/te/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/te/Firefox%20151.0.dmg"; locale = "te"; arch = "mac"; - sha256 = "bd8218021ffdce5e463fc3ebebf74847b5af2d5e147697342ed8b4a363796fa4"; + sha256 = "b49fda7de1e4c0c95fb5d698a28047f04b0f15690a55871f5f36621d857281c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tg/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/tg/Firefox%20151.0.dmg"; locale = "tg"; arch = "mac"; - sha256 = "dae25caf5ee31d427ebad3770a1bb8d08e0c1006d22c91714913063fa71c52bd"; + sha256 = "8f12714be8dc4c81b5f6c1eeb33ffe7725e007d8edee0ab53b9326aa2c5071d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/th/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/th/Firefox%20151.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "489ff8653146a3402e1c6fb0b8744fc2fa81b3b623b74a60398b7cf6e4e5bd9e"; + sha256 = "80a4d667c786351e4d04a780d6a6831e22ec8b80037581812c68198885311977"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tl/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/tl/Firefox%20151.0.dmg"; locale = "tl"; arch = "mac"; - sha256 = "5ba52d4da7ec57dddbc018ea804dda9c3fc8d8fa6a4a2e3a865323eb1b1cb27d"; + sha256 = "294263d9357a91402efd918b79d2e92bc2636466f854cab9d410805204a3dcba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tr/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/tr/Firefox%20151.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "f42fbfc00a13bdb29e8b0559adf301982b8f2b83ea9f9614b133a199fc17657c"; + sha256 = "1a22023cc6a4cecc08b04bc22839cc8bc01bb4d9fb28d4239073184dd9ae6964"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/trs/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/trs/Firefox%20151.0.dmg"; locale = "trs"; arch = "mac"; - sha256 = "e8c9d7e3b9388626d49a0db946ced95976df466767255a3bfadda2e73ef4d254"; + sha256 = "b18b06eae54c6652c208396458396c8ead950834915a88a6488862348c9dd3d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/uk/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/uk/Firefox%20151.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "58c5c1bab11a3d7fc71bfd378e550b73af0603de46bfa2321c87f2f7949ed57f"; + sha256 = "ee44556242a0cac4a0dcb1d5b007671efca606332ff0b1243fca47aaba2a3546"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ur/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/ur/Firefox%20151.0.dmg"; locale = "ur"; arch = "mac"; - sha256 = "f2eff77673038ca84605b9d97c9e26f47af4f496beec66f78111f937da91db3a"; + sha256 = "1be4f462041efe4c60436b4ad09b6527b88d067e22a174211a327f8da5a731c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/uz/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/uz/Firefox%20151.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "bc5dc6aac0072857184a523836625eb719942171f8a66c9e639d116f5b09eab3"; + sha256 = "207de25a1f96078edb35740833460b353e2420c7d298563a6253c24622fddc71"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/vi/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/vi/Firefox%20151.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "e65af322e7d097b3cd1b82fd5859cc6600a181e1334a3d36f8e7b2ab978b3525"; + sha256 = "e85b424cd12810f18763820917015fe3cbb2c676601a0acf75fb174512eede81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/xh/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/xh/Firefox%20151.0.dmg"; locale = "xh"; arch = "mac"; - sha256 = "ae8861a01f24f03ec3cd45c300f7a2cd180a2d397b6f84e504ec64a732839d48"; + sha256 = "67a8917b40174c3ec119d4a6409460074436dd304a4d146fcf32f6e1f4e77348"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/zh-CN/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/zh-CN/Firefox%20151.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "9d87f092b3763947aa2a3ac5921742c8f4fd1e20eda9a297b15593142a7c815c"; + sha256 = "0b5dbff8b10723780f6fd8cf269b249821c1bfd8b405180aefadf42276e2dbb7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/zh-TW/Firefox%20150.0.3.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/151.0/mac/zh-TW/Firefox%20151.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "9b920ba0ce9fa04f2be5b4469a69443f1700df3edd13b03447dfa778c07a5d92"; + sha256 = "8723fddad3820f5b2ff3d4e5f25d75b52de0434e1243324902f09f101d7d862f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix index deeecde37523..ca7547cf6f1b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "140.10.2esr"; + version = "140.11.0esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "bda7d5e6d59a2ad310e3f3e6e8ec05c78222edce266671d5d454dfa3e8f0086add3b9c0099db907cb62b2587ed47026ba7b3aa4f0406693d142d8d91b818d551"; + sha512 = "d06adb3ef4de1324e3d61872d70de31ab08ac013f33903549bed28c6ebcc5b4dee94bb36388282c1935d77d1a564079f3adbf08d6bb80284a899cbb3d861300c"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 13ba53e3272a..4f87992fd8e0 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 = "150.0.3"; + version = "151.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8452da61200f8ee66790d3fff230ca84b2ac9291af2b57e018486c50f938c53c6fb4943fe6cfe1e99b9783466fb00bf707fa006293753ac698618fc1e3b70a4a"; + sha512 = "5e6b01236c6aad17889c1d33614637a13e41d659c3306b2dadf13ab50d91a36d1269fae6d405d31351e4defe589f47f31c0798b66ad87438720f5779bcb90401"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 493d75cc760a..0d2cd7bdf46e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -80,6 +80,7 @@ let # https://mozilla.github.io/policy-templates/ extraPolicies ? { }, extraPoliciesFiles ? [ ], + extraAutoConfig ? "", libName ? browser.libName or applicationName, # Important for tor package or the like nixExtensions ? null, hasMozSystemDirPatch ? (lib.hasPrefix "firefox" pname && !lib.hasSuffix "-bin" pname), @@ -553,8 +554,11 @@ let prefsDir="$out/${prefsDir}" mkdir -p "$prefsDir" - echo 'pref("general.config.filename", "mozilla.cfg");' > "$prefsDir/autoconfig.js" - echo 'pref("general.config.obscure_value", 0);' >> "$prefsDir/autoconfig.js" + cat > "$prefsDir/autoconfig.js" << EOF + pref("general.config.filename", "mozilla.cfg"); + pref("general.config.obscure_value", 0); + ${extraAutoConfig} + EOF cat > "$libDir/mozilla.cfg" << EOF ${mozillaCfg} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f566310a4c4..401e0b02040c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -499,13 +499,13 @@ "vendorHash": null }, "hashicorp_archive": { - "hash": "sha256-nR8bgFvhENwC3L3w580FBtDK5l8WDfJqxDQZeUvWyl0=", + "hash": "sha256-6Fw2D9PMCcYzu7i3WdloRWbtJlE1tvbiC+/UBSMg9wA=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.7.1", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" + "vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc=" }, "hashicorp_aws": { "hash": "sha256-+MvxcQn0pnsNDR6ERXFW85fLwQ+AG+UcBo5F25WN4mQ=", @@ -544,13 +544,13 @@ "vendorHash": null }, "hashicorp_cloudinit": { - "hash": "sha256-xDHp2bG0/T4pE3j8L4zTVnaQ9te5MuAbiGmopFedOpk=", + "hash": "sha256-qSPGHjxaeYYhWDerzOf4bh7JKzuX6Cb1TBrERzMlfaI=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.7", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw=" + "vendorHash": "sha256-z/47aZ1u0t6n8FMvdSxzE7tUJe1KHNXhd+UjRTjtaBM=" }, "hashicorp_consul": { "hash": "sha256-iYt4TxyVQIYjrOgVS+olDcDgTddaVmYVy8M/Y9IkTpQ=", @@ -562,31 +562,31 @@ "vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU=" }, "hashicorp_dns": { - "hash": "sha256-ErvlkaFiIHEXUZYDJZmqEgGpZ75mnLRhhsULRvTm7Rc=", + "hash": "sha256-sdJpv5Am1tlKyaUkmByrZauzRGZUeAirf7k9a/Fv0S0=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.5.0", + "rev": "v3.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-P4018IUQ4MfdPHP20rHvuzeFSxLHBcoJuLHS/TNAHLk=" + "vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc=" }, "hashicorp_external": { - "hash": "sha256-rHMmGzYvsE5GT0E71UUIXjDG9+v52LI69/gdP2xuI7w=", + "hash": "sha256-/uBQaDqZBNmIOkwYD+zOPo7ZHiHKDZO2MmD0q52KM4k=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.5", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" + "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU=" }, "hashicorp_google": { - "hash": "sha256-6cvRvVQmKRi4kyNAo/UAGN00bO+uCJYvf661xYW/QCQ=", + "hash": "sha256-EXE9etM8gPdrWriF2HJmD5QZY9tDU8dgsusqnvupnKI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.31.0", + "rev": "v7.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68=" + "vendorHash": "sha256-xCWhCYD+YKyEB55uMm2p+eCtSlg65nSfGFMlX0qIiMQ=" }, "hashicorp_google-beta": { "hash": "sha256-/HxUOhDATteiUDIeA8zvGI9xQ5rOWJAhLN9PLHiBFfI=", @@ -968,13 +968,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-m8KZQUmDyMTR3S1BC5nmo15j5TUDV3ZZsy4hg16VZlc=", + "hash": "sha256-UByjO3/TE/b3kncFVMuTpWvTfC5Oof+Z5+9KdOEs7JU=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.87.1", + "rev": "v3.87.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-W/a04lDiPVh/tkcWz9eJp/pupI46cXxqukdv1h17xYY=" + "vendorHash": "sha256-2nDiNYX8iwu4u5gaaIYJC8a/Jw/MBdTgNxmyw+RLB+c=" }, "ns1-terraform_ns1": { "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=", @@ -1058,11 +1058,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-Yt46N9wVwgz8VbPSHQF1UQ4XT1ENIcE+yeKmO0JqnlM=", + "hash": "sha256-+/7ie5SBYMQ+fEvnrFvVRHnEJ6DGtcjKNzBpsYKItP0=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.13.0", + "rev": "v8.14.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1130,11 +1130,11 @@ "vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc=" }, "rancher_rancher2": { - "hash": "sha256-T7nX+sD3FOqXgoNzzGJfIKvMvJ5hkYoHCyzR5Sm08IE=", + "hash": "sha256-OFLEDwDDD02FKMldpkRxbj2gRQzhmVb2+3dG3Hq2AG4=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v14.1.0", + "rev": "v14.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, @@ -1292,13 +1292,13 @@ "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978=" }, "tailscale_tailscale": { - "hash": "sha256-yR65w/o/VpwKINcvz4SBybAwsphGC7A/B+baKRcIT3I=", + "hash": "sha256-c1Hz8srHNaZJq1kJrSwm8ruoHcebM11yX2wQhWavoWE=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.28.0", + "rev": "v0.29.0", "spdx": "MIT", - "vendorHash": "sha256-+q2KR3ctotT30fBE0lcpQlUXQS7nfi5VACWYxwluuMc=" + "vendorHash": "sha256-hl9govsnEXMd4VbOPqoSGLgSnImDA55enYTaDz2wKH0=" }, "telmate_proxmox": { "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 6026917dedbe..881228e04072 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -43,14 +43,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; tag = version; - hash = "sha256-5daPMlC2Ejfi5UXsRLaLWwEZHHEC0szbfkqavIisoUQ="; + hash = "sha256-QHfJ52uMDlE/rqqy7y2JIQLMOPaTp7eh4DEsPLBx6p8="; }; pyproject = true; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index b7d68cb99b38..50308e1d7080 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { "--without-libfam" ]; + # gcc 15 C23 default breaks K&R () prototypes and errors on -Wincompatible-pointer-types + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + nativeBuildInputs = [ autoreconfHook groff diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 13b5b6fc7b59..f5e6e26b088a 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "cri-o"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; tag = "v${finalAttrs.version}"; - hash = "sha256-aP3qhD2d1x+VPDifkg9lXgVD38UcongyN6vHkn8oYos="; + hash = "sha256-I+oqb8TeI7dBX4ecmEEWNKM7EAdCfGWYv6dpz8emvuA="; }; vendorHash = null; diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index efaff0805e95..7ed18a7bcb1b 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -332,14 +332,31 @@ buildStdenv.mkDerivation { # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch ] - # Revert apple sdk bump to 26.1 and 26.2 + # Revert apple sdk bump to 26.1, 26.2 and 26.4 + ++ + lib.optionals (lib.versionAtLeast version "151" && lib.versionOlder apple-sdk_26.version "26.4") + [ + (fetchpatch { + url = "https://github.com/mozilla-firefox/firefox/commit/d06b47c9e398ceb04193f904e090f23a5a1f4906.patch"; + hash = "sha256-N458KSOOiotmji5VjgdbhueZ3yTVx47UtsWnmOe8XFQ="; + revert = true; + includes = [ + "build/moz.configure/toolchain.configure" + "python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist" + ]; + }) + ] ++ lib.optionals (lib.versionAtLeast version "148" && lib.versionOlder apple-sdk_26.version "26.2") [ (fetchpatch { url = "https://github.com/mozilla-firefox/firefox/commit/73cbb9ff0fdbf8b13f38d078ce01ef6ec0794f9c.patch"; - hash = "sha256-ghdddJxsaxXzLZpOOfwss+2S/UUcbLqKGzWWqKy9h/k="; + hash = "sha256-3eBhCuiT61pbeCrvK13vg0OFV4gn/JTvsGXmLN4MBTQ="; revert = true; + includes = [ + "build/moz.configure/toolchain.configure" + "python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist" + ]; }) ] ++ @@ -347,8 +364,12 @@ buildStdenv.mkDerivation { [ (fetchpatch { url = "https://github.com/mozilla-firefox/firefox/commit/c1cd0d56e047a40afb2a59a56e1fd8043e448e05.patch"; - hash = "sha256-bFHLy3b0jOcROqltIwHwSAqWYve8OZHbiPMOdhLUCLc="; + hash = "sha256-NPaA5tYz3BUxB2ads5HZyYWJ+aS9pTzQp+AKFkfmdXA="; revert = true; + includes = [ + "build/moz.configure/toolchain.configure" + "python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist" + ]; }) ] ++ extraPatches; diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index b5635b283dfd..46b0c67c868b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -128,9 +128,9 @@ in export pnpm_config_pm_on_fail=ignore # Some packages produce platform dependent outputs. We do not want to cache those in the global store - export pnpm_config_side_effects_cache false + export pnpm_config_side_effects_cache=false - export pnpm_config_update_notifier false + export pnpm_config_update_notifier=false else pnpm config set manage-package-manager-versions false pnpm config set side-effects-cache false diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index af1ec421da9b..0903096ed281 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -255,6 +255,12 @@ lib.makeOverridable # Example: [ "-Z debuginfo=2" ] # Default: [] extraRustcOptsForBuildRs, + # Extra rustc options for proc-macro crates, replacing + # `extraRustcOpts`. Lets callers keep instrumentation flags + # (sanitizers, coverage) off host dylibs, mirroring Cargo's + # behaviour of not applying RUSTFLAGS to host artifacts. + # Default: null (inherit `extraRustcOpts`) + extraRustcOptsForProcMacro, # The lint level cap passed to rustc via `--cap-lints`. # See . # @@ -353,7 +359,21 @@ lib.makeOverridable buildInputs_ = buildInputs; extraRustcOpts_ = extraRustcOpts; extraRustcOptsForBuildRs_ = extraRustcOptsForBuildRs; + extraRustcOptsForProcMacro_ = extraRustcOptsForProcMacro; buildTests_ = buildTests; + procMacro = lib.attrByPath [ "procMacro" ] false crate; + # For proc-macros, prefer the *ForProcMacro variant at each level + # (crate attr, override arg) and fall back to extraRustcOpts. + crateExtraRustcOpts = + if procMacro && crate ? extraRustcOptsForProcMacro then + crate.extraRustcOptsForProcMacro + else + crate.extraRustcOpts or [ ]; + overrideExtraRustcOpts = + if procMacro && extraRustcOptsForProcMacro_ != null then + extraRustcOptsForProcMacro_ + else + extraRustcOpts_; resolvedLints = crate.lints or lints; lintFlags = lintsToRustcFlags resolvedLints; resolvedCapLints = @@ -486,7 +506,7 @@ lib.makeOverridable crateRustVersion = crate.rust-version or ""; crateVersion = crate.version; crateType = - if lib.attrByPath [ "procMacro" ] false crate then + if procMacro then [ "proc-macro" ] else if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] @@ -497,8 +517,8 @@ lib.makeOverridable edition = crate.edition or null; codegenUnits = if crate ? codegenUnits then crate.codegenUnits else defaultCodegenUnits; extraRustcOpts = - lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts - ++ extraRustcOpts_ + crateExtraRustcOpts + ++ overrideExtraRustcOpts ++ lintFlags ++ (lib.optional (edition != null) "--edition ${edition}"); extraRustcOptsForBuildRs = @@ -598,6 +618,7 @@ lib.makeOverridable verbose = crate_.verbose or true; extraRustcOpts = [ ]; extraRustcOptsForBuildRs = [ ]; + extraRustcOptsForProcMacro = null; capLints = null; lints = { }; features = [ ]; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 75a483a0096f..7e05e49072ab 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -836,6 +836,32 @@ rec { ]; }; }; + # Default (null) inherits extraRustcOpts for proc-macros. + procMacroExtraOptsInherit = { + procMacro = true; + edition = "2018"; + extraRustcOpts = [ "--cfg=target_only" ]; + src = mkFile "src/lib.rs" '' + #[cfg(not(target_only))] + compile_error!("extraRustcOpts not inherited by proc-macro"); + use proc_macro as _; + ''; + }; + # When set, extraRustcOptsForProcMacro replaces extraRustcOpts + # for proc-macro crates. + procMacroExtraOptsOverride = { + procMacro = true; + edition = "2018"; + extraRustcOpts = [ "--cfg=target_only" ]; + extraRustcOptsForProcMacro = [ "--cfg=host_only" ]; + src = mkFile "src/lib.rs" '' + #[cfg(target_only)] + compile_error!("extraRustcOpts leaked into proc-macro"); + #[cfg(not(host_only))] + compile_error!("extraRustcOptsForProcMacro not applied"); + use proc_macro as _; + ''; + }; # The `lints` attr mirrors Cargo.toml's `[lints]` table and is # translated to rustc `-A`/`-W`/`-D`/`-F` flags. Lower-priority # entries are emitted first so that higher-priority specific lints diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix index 0d7f385d5cf4..466f99598717 100644 --- a/pkgs/by-name/ai/air/package.nix +++ b/pkgs/by-name/ai/air/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "air"; - version = "1.65.1"; + version = "1.65.2"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; tag = "v${finalAttrs.version}"; - hash = "sha256-omyWDW5bE+HfXQ2EQZKthB9t+jBEFcPSVtPss5qeoMI="; + hash = "sha256-kQqWIqGJx8396rALn87ykdA3g+1IH+XGOpaICD02j2U="; }; vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw="; diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix index b0f1b02f0247..f8fbc33a5459 100644 --- a/pkgs/by-name/ak/aks-mcp-server/package.nix +++ b/pkgs/by-name/ak/aks-mcp-server/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "aks-mcp-server"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "Azure"; repo = "aks-mcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-3G7IDHDY3HfjGYM8aKK4Egey1/urDVeWv99PJcCaiSo="; + hash = "sha256-h/zLbnc2ffcQkx+KE6vglaSG6QAySZSg8EB4zyqH4sg="; }; - vendorHash = "sha256-aMs7vABZwRPPIaP6BdTau1oFfGqnzYt8wxUk2mQSVlE="; + vendorHash = "sha256-HYIEGnQOVNNVJxzoOiLTXwRFOBvCwikAwqky18VqFSQ="; subPackages = [ "cmd/aks-mcp" ]; diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index dbfb3c658df4..9784fa820839 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { # Uses archive.org because the original site removes older versions. - url = "https://web.archive.org/web/20260503173638/https://algol68genie.nl/algol68g-3.12.0.tar.gz"; - hash = "sha256-fYjuivr6AKRK4Nn45Q+oglpTMnp+PhO6KOkGZjwVKn0="; + url = "https://web.archive.org/web/20260515052918/https://algol68genie.nl/algol68g-3.12.1.tar.gz"; + hash = "sha256-Mdoca6W1Wyyv7WrmzaAW/fn0uLkXy6MwSDImVwB+mBk"; }; outputs = [ diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index aa9d9c885fab..58503bc8e6c4 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.3.12"; + version = "3.3.15"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-U6vEQwlj0jNYnkZyZmmelEf/WJIHmaffJ+Y1NRU0IiI="; + hash = "sha256-7DkVhFGUvAAFWUiFTOaYARIGCyAW3UqMCLUs5F55vfM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json deleted file mode 100644 index 6195cb95700c..000000000000 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "name": "amp-cli", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "dependencies": { - "@sourcegraph/amp": "^0.0.1778343260-gb9a37d" - } - }, - "node_modules/@napi-rs/keyring": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.1.10.tgz", - "integrity": "sha512-PTMyX7FVZGP4s0LcjgrFonek7Sr9ZTdi0TgpR4/4RQmC2TiDcjpdZOXxRMe2aP+5N89Ix9RG9QWclgqRHLk/Xw==", - "license": "MIT", - "engines": { - "node": ">= 10" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - }, - "optionalDependencies": { - "@napi-rs/keyring-darwin-arm64": "1.1.10", - "@napi-rs/keyring-darwin-x64": "1.1.10", - "@napi-rs/keyring-freebsd-x64": "1.1.10", - "@napi-rs/keyring-linux-arm-gnueabihf": "1.1.10", - "@napi-rs/keyring-linux-arm64-gnu": "1.1.10", - "@napi-rs/keyring-linux-arm64-musl": "1.1.10", - "@napi-rs/keyring-linux-riscv64-gnu": "1.1.10", - "@napi-rs/keyring-linux-x64-gnu": "1.1.10", - "@napi-rs/keyring-linux-x64-musl": "1.1.10", - "@napi-rs/keyring-win32-arm64-msvc": "1.1.10", - "@napi-rs/keyring-win32-ia32-msvc": "1.1.10", - "@napi-rs/keyring-win32-x64-msvc": "1.1.10" - } - }, - "node_modules/@napi-rs/keyring-darwin-arm64": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-arm64/-/keyring-darwin-arm64-1.1.10.tgz", - "integrity": "sha512-qdXBVypPNgTzso5F/YXWy5dOfFEb9eo43uROMlvwlhj7Aw137iwqwHiqlxR0teFKA33cWnem+ZKeVSIPoobtNA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-darwin-x64": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-x64/-/keyring-darwin-x64-1.1.10.tgz", - "integrity": "sha512-53DgSzhTAJwxR3KCyggHWcLwp+cw2v1zAhBiqNn1P8XwSJSba7HzFwsei6zZMn7bn3UY1ngIHEtaA74UUJVJyw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-freebsd-x64": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-freebsd-x64/-/keyring-freebsd-x64-1.1.10.tgz", - "integrity": "sha512-pI6lect/Dp8NnV+g3w1hmYLt69FbSwKFAHn77vjeUaIT5H9C0ikAgwLk89Sd8/Ei/AHHldGkrLeWkNjnIiHfoQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-arm-gnueabihf": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm-gnueabihf/-/keyring-linux-arm-gnueabihf-1.1.10.tgz", - "integrity": "sha512-w4psOx5m1ltvNLABT/BpIzP5roVcglR1kDhzZgSEOIIrf2i4FKPQqUIo5UQtjsu+AqhhYwnlnketKDf4h+D06g==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-arm64-gnu": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-gnu/-/keyring-linux-arm64-gnu-1.1.10.tgz", - "integrity": "sha512-YMC+ZLj3RldGD2Q5wzlZbc8vTh5Fteln+FpB2lw7EbDib3mmIribNH1NG21E4SwculFRDkVJqYGzwIhafloT8Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-arm64-musl": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-musl/-/keyring-linux-arm64-musl-1.1.10.tgz", - "integrity": "sha512-X/Gr5q2vJW7HMpcWRKj7eXer00a1PYb3zt3xsEG/VbcEo5A973pJANTBhYuoW098O/b7ORkunFt9WSbCgenw2A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-riscv64-gnu": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-riscv64-gnu/-/keyring-linux-riscv64-gnu-1.1.10.tgz", - "integrity": "sha512-vA3R4NVBlU0TVDHavwr5hSqePSs9OwTzzzFlTbZzqgh9s7OqcSwNT096nbr5dRjuQfG9o4/xvjfvVJ4v5z0Egg==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-x64-gnu": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-gnu/-/keyring-linux-x64-gnu-1.1.10.tgz", - "integrity": "sha512-qbKE72UeVOrIoiYYHh7joTpDIgQCZpW5OJHG4Ir19GHLdQwNZGKLfFxrTT2DvZ5EXwFJWbOp4Dew4OvvQ0E63g==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-linux-x64-musl": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-musl/-/keyring-linux-x64-musl-1.1.10.tgz", - "integrity": "sha512-niLWyjD/JxQwlOTPeldIx8Xnf03Mp4ooorpWJMWbMuVz/6hSyLVghY/BDYu2Oaxhc+XlTEjmqwhoTWYhmti5eA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-win32-arm64-msvc": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-arm64-msvc/-/keyring-win32-arm64-msvc-1.1.10.tgz", - "integrity": "sha512-VBlqZ0MF5ksc/Z+yxoL2+p6TDu2rqBOcgZ+HwXzSfgFnfnuPds7xOVdFwwaiJbj9CsCrgnByr1jtHRvfEQ6Iiw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-win32-ia32-msvc": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-ia32-msvc/-/keyring-win32-ia32-msvc-1.1.10.tgz", - "integrity": "sha512-0AvwivxgtjdpTCZCFAQUCxFA45DNKXOsdZYXBCIDfPIpUPgLxhIAsg6q7NJK00r1M24StwwfD+AzZDu14J1PKQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@napi-rs/keyring-win32-x64-msvc": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-x64-msvc/-/keyring-win32-x64-msvc-1.1.10.tgz", - "integrity": "sha512-T02DfUUvp3epOJ5lC7hcM5ff6xaLhIfymBf0LEa0oQMi+yCVoDrgjeKeGCUGwtVJWfphu58Tf9twX+hRiAD0dg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@sourcegraph/amp": { - "version": "0.0.1778343260-gb9a37d", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1778343260-gb9a37d.tgz", - "integrity": "sha512-TY4lL2lqwt+NtBa3ngKZSYfY5Z1qBAOd4UQMCT0nsUKatQGtSOIMec+zQSv6tr0L+z2jrDUzD0cpRkBDkLQjsQ==", - "license": "Amp Commercial License", - "dependencies": { - "@napi-rs/keyring": "1.1.10" - }, - "bin": { - "amp": "dist/main.js" - }, - "engines": { - "node": ">=20" - } - } - } -} diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 3116d00e392a..1132acdd5c01 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -1,90 +1,106 @@ { + stdenvNoCC, lib, - buildNpmPackage, - fetchzip, - ripgrep, + fetchurl, + autoPatchelfHook, + gzip, makeWrapper, - testers, + ripgrep, + versionCheckHook, + writableTmpDirAsHomeHook, + cctools, + darwin, + rcodesign, }: -buildNpmPackage (finalAttrs: { - pname = "amp-cli"; - version = "0.0.1778343260-gb9a37d"; - - src = fetchzip { - url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-48FyPDniLNQoeZ+SaheTvzLCYL3r95e9VDCW4Y5gMq8="; +let + platforms = { + # Upstream also publishes linux-x64, which is optimized for AVX2. Use the + # baseline build for nixpkgs so the x86_64-linux package works on all + # supported x86_64 CPUs instead of depending on the build user's CPU flags. + x86_64-linux = "linux-x64-baseline"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; }; - postPatch = '' - cp ${./package-lock.json} package-lock.json +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "amp-cli"; + version = "0.0.1779094967-g3f6594"; - # 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 - import('@sourcegraph/amp/dist/main.js') - EOF - chmod +x bin/amp-wrapper.js - ''; - - npmDepsHash = "sha256-Ce7TaJuSrha+NcFmppMm/byAFosBR2I/zMY4KA5JXuE="; - - propagatedBuildInputs = [ - ripgrep - ]; + src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}; nativeBuildInputs = [ + gzip makeWrapper - ]; + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; + strictDeps = true; - npmFlags = [ - "--no-audit" - "--no-fund" - "--ignore-scripts" - ]; + dontUnpack = true; + dontStrip = true; + dontFixup = !stdenvNoCC.hostPlatform.isLinux; - # Disable build and prune steps - dontNpmBuild = true; + installPhase = '' + runHook preInstall - postInstall = '' - wrapProgram $out/bin/amp \ - --prefix PATH : ${lib.makeBinPath [ ripgrep ]} \ - --set AMP_SKIP_UPDATE_CHECK 1 + mkdir -p $out/bin $out/libexec/amp-cli + gunzip -c $src > $out/libexec/amp-cli/amp + chmod +x $out/libexec/amp-cli/amp + + makeWrapper $out/libexec/amp-cli/amp $out/bin/amp \ + --set AMP_SKIP_UPDATE_CHECK 1 \ + --prefix PATH : ${lib.makeBinPath [ ripgrep ]} + + runHook postInstall ''; - passthru.updateScript = ./update.sh; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "HOME=$(mktemp -d) amp --version"; + postPhases = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "postPatchelf" ]; + postPatchelf = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + '${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/libexec/amp-cli/amp \ + -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' + '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/libexec/amp-cli/amp + ''; + + doInstallCheck = stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/amp"; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; + + passthru = { + sources = lib.mapAttrs ( + system': platform: + fetchurl { + url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz"; + hash = + { + x86_64-linux = "sha256-ZBqt8UWDY0SlYOOrJZib+UXdZ1cQxyRNp3T7fr+gcNs="; + aarch64-linux = "sha256-qztHMb4EJBOuEQh0OZ33dqx/MUy5LEPgLry6h+rmwVo="; + x86_64-darwin = "sha256-meedgFtc+DA4NoR0XJuLSX/gmiMKCZLACfPBbk6wfLk="; + aarch64-darwin = "sha256-0v3yM9zQ6ToWBHyPvrmPTP0lfPb1tCoAd6eNgHs3ZkM="; + } + .${system'}; + } + ) platforms; + updateScript = ./update.sh; }; meta = { description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph"; homepage = "https://ampcode.com/"; - downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp"; + downloadPage = "https://ampcode.com/install"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ keegancsmith burmudar ]; mainProgram = "amp"; + platforms = builtins.attrNames platforms; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh index 6bc4baf55545..86b348d857a2 100755 --- a/pkgs/by-name/am/amp-cli/update.sh +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -1,15 +1,20 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nodejs nix-update +#!nix-shell -i bash -p curl common-updater-scripts set -euo pipefail -version=$(npm view @sourcegraph/amp version) +version=$(curl -fsSL https://static.ampcode.com/cli/cli-version.txt) -# 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 +cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." -# Update version and hashes -cd - -nix-update amp-cli --version "$version" +for system in \ + x86_64-linux \ + aarch64-linux \ + x86_64-darwin \ + aarch64-darwin +do + update-source-version amp-cli "$version" \ + --source-key="sources.$system" \ + --ignore-same-version \ + --ignore-same-hash +done diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index 838ab0e1b9a2..c303178cd1d4 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -27,11 +27,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-6akFImNU5EQLW6f2dQRUXUC8srM32xyVI14pjVxV6Sw="; + hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-sJ4mXSYsJICXMpDZemqRF3uYgB9SWNdbzcT1s2gHpZA="; + hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0="; }; aarch64-darwin = x86_64-darwin; } @@ -40,7 +40,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.11.8"; + version = "0.11.9"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 8d237030f25c..f2940fd21ae9 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "argon"; - version = "2.0.28"; + version = "2.0.29"; src = fetchFromGitHub { owner = "argon-rbx"; repo = "argon"; tag = finalAttrs.version; - hash = "sha256-QXGiDcn5BM1psCZf88gEyKqoK9EDFquLgyzJeZOhwMU="; + hash = "sha256-i2YWAXgrcS759+iNtSzjIHU1FmY22Xx6sy2q9ErGsnw="; }; - cargoHash = "sha256-okfQn/dgBN6s1aO1cnU/bY7BIqwM9iq1iPZ321ez4C4="; + cargoHash = "sha256-wj+T1XBLVQsDNMT9d/0ybR+L7fDZj4Ijhqv0fH+f7HA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/as/asccli/package.nix b/pkgs/by-name/as/asccli/package.nix index 6678cf9dec8c..bce218a75e4e 100644 --- a/pkgs/by-name/as/asccli/package.nix +++ b/pkgs/by-name/as/asccli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "asccli"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rorkai"; repo = "App-Store-Connect-CLI"; tag = "${finalAttrs.version}"; - hash = "sha256-VMLLziuLV7F95mTdEmaUxwMC9vKSTejJZgw3KFHr7sg="; + hash = "sha256-junTdPz0gtfmDPycuitYo06a0D25yi3E2uVPaaQtWBQ="; }; vendorHash = "sha256-XBEDMUGwSh8P+dVKMebN3zD83e1odAN+Wy15yys0+2M="; diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index 863a84436d2c..c2fca0f13240 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, versionCheckHook, @@ -7,24 +8,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "agg"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "asciinema"; repo = "agg"; tag = "v${finalAttrs.version}"; - hash = "sha256-6UenPE6mmmvliaIuGdQj/FrlmoJvmBJgfo0hW+uRaxM="; + hash = "sha256-64VyCTGjzey6AHEAfk5V/Qoffe5+sDaDNve54M7tmf4="; }; strictDeps = true; - cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w="; + cargoHash = "sha256-/WS5nAFKnP/CsU5+Pf5rtNN4LWaXVjlidLzH7DWYds0="; + + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + "/System/Library/Fonts" + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; meta = { - description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; + description = "Command-line tool for generating animated GIF files from asciicast files produced by asciinema terminal recorder"; homepage = "https://github.com/asciinema/agg"; changelog = "https://github.com/asciinema/agg/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/as/asymptote/package.nix b/pkgs/by-name/as/asymptote/package.nix index 58936ed64bb1..9ad6f838736d 100644 --- a/pkgs/by-name/as/asymptote/package.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -33,7 +33,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.10"; + version = "3.11"; pname = "asymptote"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-0nvo/vJQ1dwzhgK/cj4dCejNHoXBmatMgHQwif2M0sc="; + hash = "sha256-U36fImIb+E8J7g1E3EVcTqkboZODDx12JKB9RxDX59E="; }; # override with TeX Live containers to avoid building sty, docs from source diff --git a/pkgs/by-name/at/atril/package.nix b/pkgs/by-name/at/atril/package.nix index a49be99b9381..fbb6fcf4f974 100644 --- a/pkgs/by-name/at/atril/package.nix +++ b/pkgs/by-name/at/atril/package.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "atril"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "atril"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-y+J/goOl5ol3j0ySLkyQSndS8zc+dOKhyrPv0FmVkZg="; + hash = "sha256-0BrD897SRf26A4Z1wdizfwoVEEQ7c7EEhAV4vmkBc8E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index 131e32a76126..9b272f160a0e 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -15,10 +15,10 @@ let source = { - version = "2.34.0"; - hash = "sha256-ZHPrNQ36+bS5wwoiKUQKkGLnKhHKpftI3kQ08ItReWI="; - npmDepsHash = "sha256-8y0+3zj3UH5wi9Nbl7X5rne0/tzz6Bf7HrxZpYVYZ3Y="; - clientNpmDepsHash = "sha256-xna4tZK40dOew380exp/XR32ekyiFVCTWgWNE9BpTl8="; + version = "2.35.0"; + hash = "sha256-KJ+/p6Szblof7fPeHkikOVK10xvcyVgpeFMx6cOOEgc="; + npmDepsHash = "sha256-iqH32SWpoILLb9JQjgF+lrkZXHlbXTi3XFsvNKup934="; + clientNpmDepsHash = "sha256-jSjw/Y+1VYlG8pKqOzNzrZRTUeIyBPdOAhZqEbC2qiA="; }; src = fetchFromGitHub { diff --git a/pkgs/by-name/au/ausaxs/package.nix b/pkgs/by-name/au/ausaxs/package.nix index 15e43eae4a9f..17d73244cb61 100644 --- a/pkgs/by-name/au/ausaxs/package.nix +++ b/pkgs/by-name/au/ausaxs/package.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ausaxs"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "AUSAXS"; repo = "AUSAXS"; tag = "v${finalAttrs.version}"; - hash = "sha256-vTuQsg76p0WHPadwqBdDGBSNgNmr5TxuwlNj47P+sa8="; + hash = "sha256-USu0/hfccEnwMccsyQDe1l2hQq9ISQe8WjdduaLJAqs="; }; patches = [ ./cmake-no-fetchcontent.patch ]; @@ -88,10 +88,6 @@ stdenv.mkDerivation (finalAttrs: { cp --recursive --no-preserve=mode ${asio} asio cp --recursive --no-preserve=mode ${cycfi_infra} cycfi_infra patch -p1 -d elements < ${./elements-cmake-no-fetchcontent.patch} - substituteInPlace CMakeLists.txt \ - --replace-fail "-mavx" "${ - lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) "-msse3" - }" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 8de06ffd3288..da89ced962e0 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -7,7 +7,7 @@ nix-update-script, nixosTests, nodejs, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, typescript, @@ -16,12 +16,12 @@ let pname = "autobrr"; - version = "1.78.0"; + version = "1.79.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-iLMeKFDBzSYrCjwvafemSDq8cN3DTzT6KpJzmzgVbYY="; + hash = "sha256-grwXIDN+dYuWaArB76N3xJEVwYlrzopYZJQ+eXRwOY4="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -31,7 +31,7 @@ let nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_11 typescript ]; @@ -44,9 +44,9 @@ let src sourceRoot ; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-StLGK3Oezv+M5tuFd1rZyLpG0g1xFxWPJ5lm39Sy0FQ="; + hash = "sha256-zyY54pqlQnYdOyrNZA/WiALzdf4ZGwMLnwm6Mpb0S5k="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-POqFXcLtc18EzEQ2SRb2+D+3E8KexaAOelgOSvCwoWI="; + vendorHash = "sha256-9lvzU0tCuiYr0GsLtgG58pxNxoiyj0sT2R8UmYuRD8Y="; preBuild = '' cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index b9a85f34bfae..8a544e792380 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -5,7 +5,7 @@ pnpm_10, fetchPnpmDeps, pnpmConfigHook, - nodejs, + nodejs-slim, makeBinaryWrapper, shellcheck, versionCheckHook, @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs + nodejs-slim pnpmConfigHook pnpm_10 makeBinaryWrapper @@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r {node_modules,server} $out/lib/bash-language-server/ # Create the executable, based upon what happens in npmHooks.npmInstallHook - makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ + makeWrapper ${lib.getExe nodejs-slim} $out/bin/bash-language-server \ --suffix PATH : ${lib.makeBinPath [ shellcheck ]} \ --inherit-argv0 \ --add-flags $out/lib/bash-language-server/server/out/cli.js diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index 460866fd78e4..05d5868f7520 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bearer"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; tag = "v${finalAttrs.version}"; - hash = "sha256-VlKer94UNES/xbp+BI5lapQP2Ze1wgHKDQMj1g0VcDA="; + hash = "sha256-oYlW9sVyoJXOqcGLcF65c+QsTNquz0Ij1HnMjAbnZZI="; }; - vendorHash = "sha256-p+Xe788WbvUl1u+3nEgGyHLZKEVoKCUR855TDpA6o58="; + vendorHash = "sha256-Y32HdEk+9fftDP4cttn6r3GMq3YqeyXpsRaU5ApkGa4="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/by-name/be/bella/package.nix b/pkgs/by-name/be/bella/package.nix index 97d73641eb3c..99e8b4e43b1a 100644 --- a/pkgs/by-name/be/bella/package.nix +++ b/pkgs/by-name/be/bella/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bella"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "josephmawa"; repo = "Bella"; tag = "v${finalAttrs.version}"; - hash = "sha256-gIz6Vjs4L7dSVyXTE//vmjIqisu5vBTUoE6cET52G4c="; + hash = "sha256-DlhDaeZxNi9uXfST18eap0CWenSj+PzbKflJmITQ//M="; }; strictDeps = true; diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index 8ff85d0e2577..ad8674fac8f0 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule (finalAttrs: { pname = "berglas"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "berglas"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4Y53psmHpe1JmTKfvOS5f0VHCp/GuC4kDWiHWl5ty3Q="; + sha256 = "sha256-p+HWZCyFouy+FycCPesKLV7UIeMogz9oKX+mynzBTKw"; }; - vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o="; + vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o"; ldflags = [ "-s" @@ -52,7 +52,12 @@ buildGoModule (finalAttrs: { "-X github.com/GoogleCloudPlatform/berglas/v2/internal/version.version=${finalAttrs.version}" ]; - postPatch = skipTestsCommand; + postPatch = skipTestsCommand + '' + substituteInPlace go.mod \ + --replace-fail \ + "go 1.26.3" \ + "go 1.26" + ''; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index d8b09698aee7..c0b20a3222f8 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "bitrise"; - version = "2.39.5"; + version = "2.40.0"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${finalAttrs.version}"; - hash = "sha256-2AT6coAJFXt0eZicXABojGOHay2oU7pe70IKJX/dyk8="; + hash = "sha256-jY1aJAk3O7jAfQAYPpQIgUD+CMxcBAggE0bvWeAEgDk="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 1409c8e06c67..625f84e55eff 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -33,13 +33,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2026.2.1"; + version = "2026.3.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-BiL9ugimdDKIzIoehGqdBfJkTOjbOMl8XV+0g/aGS/k="; + hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U="; }; patches = [ @@ -55,6 +55,10 @@ buildNpmPackage' rec { ]; postPatch = '' + # https://github.com/bitwarden/clients/pull/20480 + substituteInPlace package-lock.json apps/desktop/desktop_native/napi/package.json \ + --replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"' + # remove code under unfree license rm -r bitwarden_license @@ -79,12 +83,9 @@ buildNpmPackage' rec { "--legacy-peer-deps" ]; - npmRebuildFlags = [ - # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 - "--ignore-scripts" - ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-S34Lxr9dH9wjBmpDYA530z2/HiY4D4b/3rswWDqsrFU="; + npmDepsFetcherVersion = 2; + npmDepsHash = "sha256-1t4CSd1NDC1medTTFHSzX9ZkgHqPG2L//yjaloH47z0="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -94,7 +95,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-qK7cwrTzGKgHdaxaGcpR6bKJP/Tai2F+KFLu/PI6qqA="; + hash = "sha256-d9Iv7OekHOteH1lyAuyj/EzfU/KSCW6ATx83foOW3IE="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -165,7 +166,11 @@ buildNpmPackage' rec { ]; checkFlags = [ + # fails in zbus "--skip=password::password::tests::test" + # requires some debug feature to be enabled + "--skip=storage::serialization::tests::test_keydata_from_corrupted_bytes" + "--skip=storage::serialization::tests::test_keydata_from_empty_bytes" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=clipboard::tests::test_write_read" diff --git a/pkgs/by-name/bl/blazesym-c/package.nix b/pkgs/by-name/bl/blazesym-c/package.nix new file mode 100644 index 000000000000..6fe542c592df --- /dev/null +++ b/pkgs/by-name/bl/blazesym-c/package.nix @@ -0,0 +1,58 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + elfutils, + zlib, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "blazesym-c"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "libbpf"; + repo = "blazesym"; + tag = "capi-v${finalAttrs.version}"; + hash = "sha256-+wpKDxZgFkezvKzL0xA7FFS/sIx++kwSf32Kl4u0rAg="; + }; + + cargoHash = "sha256-J14dckx/t0BG+l6NOiBY/Kkq42C98dXIzP9e6LtpgVg="; + + cargoBuildFlags = [ + "--package" + "blazesym-c" + ]; + + nativeCheckInputs = [ + pkg-config + elfutils + zlib + ]; + + cargoTestFlags = [ + "--no-run" + "--package" + "blazesym-c" + ]; + + postInstall = '' + install -Dm644 capi/include/blazesym.h "$out/include/blazesym.h" + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^capi-v([0-9.]+)$" + ]; + }; + + meta = { + description = "C language bindings for the blazesym library"; + homepage = "https://github.com/libbpf/blazesym"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aaronjheng ]; + }; +}) diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix index 4b46277fb7ae..c40a2e9ce116 100644 --- a/pkgs/by-name/bl/blightmud/package.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -11,16 +11,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blightmud"; - version = "5.3.1"; + version = "5.6.1"; src = fetchFromGitHub { owner = "blightmud"; repo = "blightmud"; - rev = "v${finalAttrs.version}"; - hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fwWyQq6rb8qSR7aiQagOodkQRqanUJA2uH5I/Z1XfAA="; }; - cargoHash = "sha256-7cMd7pNWGV5DOSCLRW5fP3L1VnDTEsZZjhVz1AQLEXM="; + cargoHash = "sha256-4JArgwNFjnGwyEnWdjZkUlahloQu+C8qF9QyYo8s1jQ="; + + postPatch = '' + substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' + ''; buildFeatures = lib.optional withTTS "tts"; @@ -39,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_CFLAGS_COMPILE = "-std=gnu17"; }; + __darwinAllowLocalNetworking = true; + checkFlags = let # Most of Blightmud's unit tests pass without trouble in the isolated @@ -58,6 +64,13 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_tls_init_verify_err" "test_tls_init_no_verify" "test_tls_init_verify" + "test_exec" + "test_line_tags" + "test_lua_api" + "test_suggest" + "test_mccp2_decompression" + "test_mccp2_incremental" + "test_mccp2_negotiation" ]; in builtins.map (x: "--skip=" + x) skipList; diff --git a/pkgs/by-name/bl/blowfish-tools/package.nix b/pkgs/by-name/bl/blowfish-tools/package.nix index d8ab233e56cb..2d2a556c9cac 100644 --- a/pkgs/by-name/bl/blowfish-tools/package.nix +++ b/pkgs/by-name/bl/blowfish-tools/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "blowfish-tools"; - version = "1.10.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "nunocoracao"; repo = "blowfish-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-90EKsRKOO2Hb64Wy3TlwzlPU2K8AAlSxc17ek5ZLoG0="; + hash = "sha256-QCc/T4SWifVGeN7YpH0YJTZZw+OMC9QapSEmGX5acSQ="; }; dontNpmBuild = true; @@ -30,7 +30,10 @@ buildNpmPackage (finalAttrs: { homepage = "https://blowfish.page"; changelog = "https://github.com/nunocoracao/blowfish-tools/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eripa ]; + maintainers = with lib.maintainers; [ + eripa + thattemperature + ]; mainProgram = "blowfish-tools"; }; }) diff --git a/pkgs/by-name/bo/boring/package.nix b/pkgs/by-name/bo/boring/package.nix index 0fd622c9c5d0..88287523f087 100644 --- a/pkgs/by-name/bo/boring/package.nix +++ b/pkgs/by-name/bo/boring/package.nix @@ -5,30 +5,36 @@ installShellFiles, lib, stdenv, + nix-update-script, testers, }: buildGoModule (finalAttrs: { pname = "boring"; - version = "0.11.7"; + version = "0.13.0"; src = fetchFromGitHub { owner = "alebeck"; repo = "boring"; - tag = finalAttrs.version; - hash = "sha256-RXLFIOGJEvE6kV14+rnN4zPV8bloikxjksdlSHQFwUU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9ei2Kl2590DY0S9jrc+MxsL5srxmwx8wD6uFlVQ6o4o="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-/MAkVesn8ub2MrguWTueMI9+/lgCRdaXUEioHE/bg8w="; + subPackages = [ "cmd/boring" ]; + + vendorHash = "sha256-4YU0l2YhlMQzcKSMhXt3oEeCk87Yu90esiPelRs5/OQ="; ldflags = [ "-s" "-w" - "-X main.version=${finalAttrs.version}" + "-X github.com/alebeck/boring/internal/buildinfo.Version=${finalAttrs.version}" + "-X github.com/alebeck/boring/internal/buildinfo.Commit=${ + builtins.substring 0 5 finalAttrs.src.rev + }" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -38,10 +44,14 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/boring --shell zsh) ''; - passthru.tests.version = testers.testVersion { - package = boring; - command = "boring version"; - version = "boring ${finalAttrs.version}"; + passthru = { + tests.version = testers.testVersion { + package = boring; + command = "boring version"; + version = "boring ${finalAttrs.version}"; + }; + + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix index 512bc3de9d12..665977d0123d 100644 --- a/pkgs/by-name/bo/botan3/package.nix +++ b/pkgs/by-name/bo/botan3/package.nix @@ -60,7 +60,7 @@ let ''; in stdenv.mkDerivation (finalAttrs: { - version = "3.11.1"; + version = "3.12.0"; pname = "botan"; __structuredAttrs = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "randombit"; repo = "botan"; tag = finalAttrs.version; - hash = "sha256-AzQ/IblJF2atUXBTwI+84gmcceVQ6aMMElS3wOsfUDM="; + hash = "sha256-2ODTjqsWSmlornOKh5m6pOX7cNOBHS3+ALblRyC8lPw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 4a7a69a5dfac..4aecf07162dc 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.22.0"; + version = "5.22.1"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-DizB9SCw3SMOsBz/bioUqLvDME9lfNaBzOY/pFGzv8g="; + hash = "sha256-z2EoWjQfDY8eSP+YMZtY9Um7iwoGTi+9ZGJOEZozPoo="; }; patches = [ ]; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index fcda9c69017d..384f677be005 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.56.2"; + version = "1.56.4"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qp2Scugl5ZYxax/+RYDY+k9ScxC5p5IahvJpMXUJiR4="; + hash = "sha256-JqD4CSTVbrqg7nAkSRp4SaGpFKt1U3CYLxM31AJfcPA="; }; - cargoHash = "sha256-ltwp4rM/bEj/FVwpOr7nZ+xW0dwXdvuWVWD4/D7obtE="; + cargoHash = "sha256-5VGgbrd+iDD+L6JFy4H6HFuRW6xtQDawSGGSQARjRU0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index 7a2362794841..d5eaa20bfdf4 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "buildkit"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLWxkvr6Ead75MjMAQJIEMWN97NQfWA2v71rZnAYbo8="; + hash = "sha256-7QyfQew0RuL/EpJlKuY5CXdCiFwIS2Z4i1Fd4yUTx7g="; }; vendorHash = null; diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index 7811875b3f81..2e329eeffb43 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -11,18 +11,18 @@ perl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bws"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "sdk"; - rev = "bws-v${version}"; - hash = "sha256-acS4yKppvIBiwBMoa5Ero4G9mUf8OLG/TbrZOolAwuc="; + tag = "bws-v${finalAttrs.version}"; + hash = "sha256-NjnLoa4UjPzTejjEwc5LIrHqeqncXoMICJM2eUesoIM="; }; - cargoHash = "sha256-SJn00C7vkNoghdVPUszep40RSL8fD+/ELUeuf9GBD7c="; + cargoHash = "sha256-lfnCUWf9MM1Yynxza7Fz1qxNyDbPNMOcbVHkvZx32bk="; nativeBuildInputs = [ installShellFiles @@ -55,18 +55,17 @@ rustPlatform.buildRustPackage rec { ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd bws \ - --bash <($out/bin/bws completions bash) \ - --fish <($out/bin/bws completions fish) \ - --zsh <($out/bin/bws completions zsh) + for shell in bash fish zsh; do + installShellCompletion --cmd bws --"$shell" <($out/bin/bws completions "$shell") + done ''; meta = { - changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/crates/bws/CHANGELOG.md"; description = "Bitwarden Secrets Manager CLI"; homepage = "https://bitwarden.com/help/secrets-manager-cli/"; + changelog = "https://github.com/bitwarden/sdk-sm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.unfree; # BITWARDEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "bws"; - maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index bea891cc6fc1..de649f7157d2 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -7,11 +7,11 @@ }: let pname = "capacities"; - version = "1.57.24"; + version = "1.64.6"; src = fetchurl { - url = "https://web.archive.org/web/20260110164323/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/Capacities-1.57.24.AppImage"; - hash = "sha256-BWan10ItF/hKEMGG/m32QgjySLReqJnrtq5z0k9oYcA="; + url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.64.6.AppImage"; + hash = "sha256-RCWzvoOhX14FRoPpoAJXMgMjmIevISDzzieiwGnX7uc="; }; appimageContents = appimageTools.extractType2 { @@ -63,5 +63,6 @@ appimageTools.wrapType2 { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; mainProgram = "capacities"; + maintainers = [ lib.maintainers.keysmashes ]; }; } diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 7b7cf4e5946a..175b562e0e50 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-deny"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; tag = finalAttrs.version; - hash = "sha256-/rhdG/N2xQYCRPAddS2GELRuc/LsQVt8puvgn/cdbj4="; + hash = "sha256-ttD3UgfFUuon80/O1RaGO+mOAyr1zHaUKqCqzjmTQSY="; }; - cargoHash = "sha256-Xx8t3DpJ9n1v3Cky1r+WiP3/Q4rJ7wDntSiV8VS8qTQ="; + cargoHash = "sha256-Ijd0Mk2p9fsN++U+9IvUu/nqJwI5N/vFigYFFbcEdXs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix index fc912ad2ce8e..8191a49b659f 100644 --- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-llvm-lines"; - version = "0.4.45"; + version = "0.4.46"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-llvm-lines"; tag = finalAttrs.version; - hash = "sha256-5Tf3vkDTCQCmYvfKW3OHCese6HEs9CNbcUeLyS7MsOE="; + hash = "sha256-Pyl3IGPMjw48mjOh/P4FffP7r+Yd0bJodyKSSGK/kCQ="; }; - cargoHash = "sha256-JrH7W2zRDoPa1ENQCfE++2y2VEC3INg/cst5ob2hmy0="; + cargoHash = "sha256-/8Ch74qXamQIgi1uR5huK+EnqpvGfIpYaVygu7NgihI="; meta = { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/by-name/ca/cassette/package.nix b/pkgs/by-name/ca/cassette/package.nix index 275f07febeb7..83621f7ab49e 100644 --- a/pkgs/by-name/ca/cassette/package.nix +++ b/pkgs/by-name/ca/cassette/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cassette"; - version = "0.2.1.g49"; + version = "0.2.2"; src = fetchFromGitHub { owner = "Rirusha"; repo = "Cassette"; rev = "v${finalAttrs.version}"; - hash = "sha256-1wIYEDaVlqNDS50MiYGqCtf5xGWou/g/YfZChTdQIns="; + hash = "sha256-CVUgiYppL0iSgbIjBSUmN1IdTuTvEL7U/tJyEQBy2T0="; }; nativeBuildInputs = [ @@ -61,7 +61,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9].*)$" ]; + }; meta = { description = "GTK4/Adwaita application that allows you to use Yandex Music service on Linux operating systems"; diff --git a/pkgs/by-name/cd/cdktn-cli/package.nix b/pkgs/by-name/cd/cdktn-cli/package.nix index 73c4b7e11b3f..404b0f16b517 100644 --- a/pkgs/by-name/cd/cdktn-cli/package.nix +++ b/pkgs/by-name/cd/cdktn-cli/package.nix @@ -8,7 +8,7 @@ fixup-yarn-lock, go, makeWrapper, - nodejs_22, + nodejs, nix-update-script, patchelf, removeReferencesTo, @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdktn-cli"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "open-constructs"; repo = "cdk-terrain"; tag = "v${finalAttrs.version}"; - hash = "sha256-yBCLxp7w/M2y7vDEI1ceAAJbyYpPT4mN4hZ3FKpaiJ0="; + hash = "sha256-qBpdeIa4V5hfVbkwa+5gHszSwqXJej0k0BdVImTdwt8="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-c5WQXZLbOuvy6Jj6TchV00HThFIePMdsGW1rWAUKnvo="; + hash = "sha256-H8UnrCZx9yjKn7YxRqv+uJ73fw/ngPFI6zdayUizo1k="; }; hcl2json-go-modules = @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { fixup-yarn-lock go makeWrapper - nodejs_22 + nodejs patchelf removeReferencesTo yarn @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out/lib/node_modules/cdktn-cli" cp -rL node_modules packages/cdktn-cli/bundle packages/cdktn-cli/package.json "$out/lib/node_modules/cdktn-cli/" - makeWrapper "${lib.getExe nodejs_22}" "$out/bin/cdktn" \ + makeWrapper "${lib.getExe nodejs}" "$out/bin/cdktn" \ --add-flags "--no-warnings=DEP0040" \ --add-flags "$out/lib/node_modules/cdktn-cli/bundle/bin/cdktn.js" @@ -151,7 +151,13 @@ stdenv.mkDerivation (finalAttrs: { # even with writableTmpDirAsHomeHook and CHECKPOINT_DISABLE=1 doInstallCheck = stdenv.hostPlatform.isLinux; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + # Skip pre-releases + extraArgs = [ + "--version-regex" + "^v([\\d.]+)$" + ]; + }; meta = { description = "CDK for Terraform CLI"; @@ -161,7 +167,5 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cdktn"; maintainers = with lib.maintainers; [ deejayem ]; platforms = lib.platforms.unix; - # Uses @cdktf/node-pty-prebuilt-multiarch which is not yet available for node 22 on aarch64-linux - broken = stdenv.hostPlatform.system == "aarch64-linux"; }; }) diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix index c74d5151f09e..2b0c3085dd31 100644 --- a/pkgs/by-name/ce/cel-go/package.nix +++ b/pkgs/by-name/ce/cel-go/package.nix @@ -6,13 +6,13 @@ let cel-spec = buildGoModule (finalAttrs: { pname = "cel-spec"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "google"; repo = "cel-spec"; tag = "v${finalAttrs.version}"; - hash = "sha256-D9NHnQerquU2nDhDIheHmzV2FUwKi+MfTO+sehMXudg="; + hash = "sha256-aNyBGUlpTqILCiQHo7BxaZShI6q9xgtRegywd+jQSlo="; }; vendorHash = "sha256-7Ngemih4jRO6VHSH2QxU/p1Q/E/ukUZ5wuUbZzRj6kA="; @@ -26,18 +26,18 @@ let in buildGoModule (finalAttrs: { pname = "cel-go"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-A+SiKpagf73u+dFclntoPTCNCG+7m4kutS6fpeZ+jDU="; + hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw="; }; modRoot = "repl"; - vendorHash = "sha256-obxFjr++fSKJx7TxTZ28YFhts2e/pW32BFVhOGnY7XY="; + vendorHash = "sha256-tMaDwKoE5tzbQD5b7EnpKqiT/CT9WDCKgoxQeyhIlXE="; subPackages = [ "main" @@ -62,6 +62,11 @@ buildGoModule (finalAttrs: { mv $out/bin/{main,cel-go} ''; + passthru = { + inherit cel-spec; + updateScript = ./update.sh; + }; + meta = { changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}"; description = "Fast, portable, non-Turing complete expression evaluation with gradual typing"; diff --git a/pkgs/by-name/ce/cel-go/update.sh b/pkgs/by-name/ce/cel-go/update.sh new file mode 100755 index 000000000000..b0e22783692c --- /dev/null +++ b/pkgs/by-name/ce/cel-go/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix bash nix-update + +set -eou pipefail + +PACKAGE_DIR=$(realpath $(dirname $0)) + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/google/cel-go/releases/latest | jq --raw-output .tag_name) +latestVersion=$(echo "$latestTag" | sed 's/^v//') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cel-go.version or (lib.getVersion cel-go)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update cel-go +nix-update cel-go.cel-spec diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index fea31a4e330d..8fa03db0bf78 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; + homepage = "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { FITS files. ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; - license = lib.licenses.mit; + license = lib.licenses.cfitsio; maintainers = with lib.maintainers; [ returntoreality xbreak diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index b86d1354a3a3..7305b0d53729 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.2.528"; + version = "3.2.529"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-bbGB6h9jhd3laeOTaSwZ2o3yu62vLMuCmYhS/qQBkeA="; + hash = "sha256-sfbwmeASE0gwN/jg+6l84G60tIZRbZc417QK0lqwr/s="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 97d633ad6797..9df908763dcd 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.6.0"; + version = "7.0.4"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-IJ7KUYUdLkaE8XP53SjSORzQYR7HiNoNgafktutnHzo="; + hash = "sha256-ntI2jWV1kS8ojbkhLaZhxkjK5ZNYOp9MIbzHpnCyEu0="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-PZHynhVBqMqpUD/COro3F3nvaolSC3Eq9z/tUdXpQoA="; + cargoHash = "sha256-tkPMlJqkQzFYItPPYW5kqLiymlNZPkwj0j/2Zj4Ysc8="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix index b6d8fe8a6065..b91d84a52a41 100644 --- a/pkgs/by-name/ci/cine/package.nix +++ b/pkgs/by-name/ci/cine/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cine"; - version = "1.1.1"; + version = "1.3.1"; pyproject = false; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Cine"; tag = "v${finalAttrs.version}"; - hash = "sha256-bpyI0xzzs1AdiSC0TdH0HiXRgdWj8sR4G6xO0cYWWPk="; + hash = "sha256-QYNtLTgpyQonmTsLnkwPRxQ14loirii09lJiPdooyOI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix index 01d4d82258ec..3b54608150a7 100644 --- a/pkgs/by-name/ck/ckan/package.nix +++ b/pkgs/by-name/ck/ckan/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.36.2"; + version = "1.36.4"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - hash = "sha256-EZSf+n6QUEZW2Bjl2ac/6e+Jo+PlxWd1Z1PKHvgC/Ko="; + hash = "sha256-d0gILN/PLbtfUCJhsYr8hQAxk4lMYEJ9BLCseo3+994="; }; icon = fetchurl { diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index a64dd406a5e1..e9444eb564d4 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.141", - "commit": "4f4623ddd339e1c1b87d659b7c9eb3b66397e7a3", - "buildDate": "2026-05-13T21:34:55Z", + "version": "2.1.143", + "commit": "cfb8132e4c3551e2773f41a1900efd1cc93637db", + "buildDate": "2026-05-15T17:47:13Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "31ac95bb19a33b1d0cddd3f3ff594bf8bfd2be5051cd2af7867109641cab705e", - "size": 207076896 + "checksum": "2701c6cfd68483f8faf0316a1ba6481a1455a90645ada179f0c48d8c36d722ef", + "size": 207605280 }, "darwin-x64": { "binary": "claude", - "checksum": "fa9000fdf4a522fcaf30ea283555aca2ba5d0e76cdb8842154b7735b558c7c25", - "size": 209591056 + "checksum": "bc8ff4ce02b765a033808fb596f9522306cbe5c50d21344ed8752c08966f362c", + "size": 210119440 }, "linux-arm64": { "binary": "claude", - "checksum": "dc931e24f62afbadc8dc68115278b08493825a3ed1ea753d587077181a6cc63b", - "size": 232437384 + "checksum": "32e8edc4a5c3c41d18607c75d1b8e7bec643330c03e266be46ac3b41a446c4eb", + "size": 232961672 }, "linux-x64": { "binary": "claude", - "checksum": "832be26e8f15b2ae99e520a22b034fc4bfad1cb5b84de6b706487072c56bb42e", - "size": 232572624 + "checksum": "f75fdc3ff9d9cd494b86192f9e349b5c5c6d3970ed4d5cd5c7b330c5a2b1dcc4", + "size": 233088720 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "e6e6a481c0aab084198b3529c6d96774e14d18da999aba7d22e207952ed8faf0", - "size": 225292120 + "checksum": "e68903ec56ddd5560bb0820c96c8f7a4193e7eab6236ede56cb2e05f450ce44f", + "size": 225816408 }, "linux-x64-musl": { "binary": "claude", - "checksum": "8af1f6e19d3786cac74dcf369ff58f79df08be429813b29ae076247cc8d1ddae", - "size": 226966576 + "checksum": "e4cb8588ed6e38f9920bdaa2611263d4a0b0d11300f1d23945df234fdf5e278a", + "size": 227482672 }, "win32-x64": { "binary": "claude.exe", - "checksum": "3ab326c39d195dbe394c173f31126d880a80270f98ade74ef555429e2dadb19f", - "size": 228410016 + "checksum": "e480244f2a4660fe76ed32442c1e3e2edda8fb5433417e73faba39f0e7f69eb6", + "size": 228902560 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "f622af48157bce7a24905fa6121191f5a472800ed9f77fa41c59bd5ecd161285", - "size": 224374432 + "checksum": "5cbad78d2f316fedd0d621289aae558aaf259b404d0a46e0e49662ef3b397986", + "size": 224866976 } } } diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix index d3358cb0df87..a89337e03f5b 100644 --- a/pkgs/by-name/cl/clevis/package.nix +++ b/pkgs/by-name/cl/clevis/package.nix @@ -5,6 +5,7 @@ cryptsetup, curl, fetchFromGitHub, + gawk, gnugrep, gnused, jansson, @@ -17,6 +18,7 @@ nixosTests, pkg-config, stdenv, + systemd, tpm2-tools, }: @@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { jose libpwquality luksmeta + systemd tpm2-tools ]; @@ -74,11 +77,18 @@ stdenv.mkDerivation (finalAttrs: { # The xargs command is a little bit convoluted because a simpler version would # be vulnerable to code injection. This hint is a courtesy of Stack Exchange: # https://unix.stackexchange.com/a/267438 + # + # The systemd pkgconfig variable 'systemdsystemunitdir' points into the + # read-only systemd store path. Redirect unit installation to $out. postPatch = '' for f in $(find src/ -type f -print0 |\ xargs -0 -I@ sh -c 'grep -q "/bin/cat" "$1" && echo "$1"' sh @); do substituteInPlace "$f" --replace-fail '/bin/cat' '${lib.getExe' coreutils "cat"}' done + + substituteInPlace src/luks/systemd/meson.build \ + --replace-fail "unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')" \ + "unitdir = join_paths(get_option('prefix'), 'lib', 'systemd', 'system')" ''; # We wrap the main clevis binary entrypoint but not the sub-binaries. @@ -94,10 +104,23 @@ stdenv.mkDerivation (finalAttrs: { luksmeta tpm2-tools ]; + askpassPath = [ + coreutils + cryptsetup + curl + gawk + gnugrep + gnused + jose + luksmeta + ]; in '' wrapProgram $out/bin/clevis \ --prefix PATH ':' "${lib.makeBinPath includeIntoPath}:${placeholder "out"}/bin" + + wrapProgram $out/libexec/clevis-luks-askpass \ + --prefix PATH ':' "${lib.makeBinPath askpassPath}:${placeholder "out"}/bin" ''; passthru.tests = { @@ -111,6 +134,9 @@ stdenv.mkDerivation (finalAttrs: { ; clevisLuksSystemdStage1 = nixosTests.installer-systemd-stage-1.clevisLuks; clevisLuksFallbackSystemdStage1 = nixosTests.installer-systemd-stage-1.clevisLuksFallback; + clevisLuksAskpassSystemdStage1 = nixosTests.installer-systemd-stage-1.clevisLuksAskpass; + clevisLuksAskpassFallbackSystemdStage1 = + nixosTests.installer-systemd-stage-1.clevisLuksAskpassFallback; clevisZfsSystemdStage1 = nixosTests.installer-systemd-stage-1.clevisZfs; clevisZfsFallbackSystemdStage1 = nixosTests.installer-systemd-stage-1.clevisZfsFallback; }; diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index f2f4987762b4..6c55324e9961 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-12"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "9bfd30f3ab029c31f1c012b12156bdac9a0d0351"; - hash = "sha256-JrR7nf6xQxzGHrOp1dof6GLOcH6BSiAd79RcgsUUU24="; + rev = "6c1efb649ac338692a65b7960e012ca7cb9ad233"; + hash = "sha256-5k+emMLI6S/YnD3uCDb5tXTYpi95h9E9aCLYfKcO7R8="; }; - npmDepsHash = "sha256-1+U4XG3zciSnVh8Syff/hZgSPBdwDfgf9KQFURJAddQ="; + npmDepsHash = "sha256-5stbU1HxF6R9/afL/CQsRgKedwudUIyeVuyr/wGrApY="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index f0e3ffd346d4..3cfeb5cbdad4 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -81,6 +81,12 @@ in }; }).overrideAttrs (oldAttrs: { + autoPatchelfIgnoreMissingDeps = + (oldAttrs.autoPatchelfIgnoreMissingDeps or [ ]) + ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) [ + "libc.musl-*.so.*" # musl-based node modules are not used on glibc systems + ]; + preFixup = (oldAttrs.preFixup or "") + lib.optionalString hostPlatform.isLinux '' diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index d830572aa9a8..6a8f27340cee 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "3.2.21", + "version": "3.4.16", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/x64/Cursor-3.2.21-x86_64.AppImage", - "hash": "sha256-1OtumCvJbLIoNflh1hrMz2at3k/FrqK+Qvhn/XGI2dU=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/x64/Cursor-3.4.16-x86_64.AppImage", + "hash": "sha256-KSicp27+WSr1qIRUFflRHbxc/eRzcOnWEVQkLYr0ekU=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/arm64/Cursor-3.2.21-aarch64.AppImage", - "hash": "sha256-R51osvw7sP19FbAhPIhHsZYOvEgSW/NhAgyg2N35wAM=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/arm64/Cursor-3.4.16-aarch64.AppImage", + "hash": "sha256-EHRffgia7L7l/WXtODIaeFUpfS5WD9mvwR7muPcycgY=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-Tvty+mDr4q7wRVJacuCxb6HO1QqsFdwm0U7dUY/sPu0=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-g2jrQNiYI2ekIOsaTeWfbvn2gLVDeBzRo4/jvNHNlSY=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-oewHIhqvWJgJzZJ81uBp6zNDOLCXBXcK10MEUSyRDRQ=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-PbU8WqoMyG2/9D7/iWWeqAxEgycH1kGUj7pfH5b4GqI=" } } } diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index b6bf755739f2..8453584321c7 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.130.0"; + version = "0.131.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-YeUeYbzUMUx0lhIKdtPa8vUYK2Cj1hmbLb68Y80r71o="; + hash = "sha256-pWQxDJZO+xbY8aax9QRQRtx/BJw+4CZRL65W3Od4Ep8="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-cpkj7H/jkKGbfJ92Ty9peqfxibFw2aWWG64tmgeG+2o="; + cargoHash = "sha256-CaCYBg8U4pxi3EFBH81k1dWtGY1AL/cZmP9ZtvjDxzw="; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index af5cd5fbd366..183cab9a8c44 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.2.3"; + version = "2.3.0"; outputs = [ "out" @@ -28,7 +28,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-jaOLZf246kmvBHHrwgvqrhxuh+n1HE6NDqckZK4tvnM="; + hash = "sha256-qdwzcXrMWZ/r0tsNw5OpJC3X2Kw3Yn92wRxNCjZhMw0="; }; postPatch = '' diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 09569c1acc11..f15596b28d36 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cook-cli"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${finalAttrs.version}"; - hash = "sha256-fg8qq4j9NbQvnduPRBwqp+GyQaHx2axqH39KeMZqy2k="; + hash = "sha256-UwO/pdop4grOuVEq0pSt9DXEQLCXKFrm9HhfQISdBXg="; }; - cargoHash = "sha256-eU/iOb5gHEjWdALeVQr2K3JkD0qOwco3Vkm05HWKdIs="; + cargoHash = "sha256-VobG+Ux56TNM3U2Y51/x59rpg27b2FZXTqpRcKttCEc="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix index 09073f05ef2e..cbbb9f4db8c1 100644 --- a/pkgs/by-name/co/copacetic/package.nix +++ b/pkgs/by-name/co/copacetic/package.nix @@ -12,16 +12,21 @@ buildGoModule (finalAttrs: { pname = "copacetic"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "project-copacetic"; repo = "copacetic"; tag = "v${finalAttrs.version}"; - hash = "sha256-FTldgBYOmJt3VIC3vwp415oPNRCAiR1cxEF8lJr5TSU="; + hash = "sha256-LuJn6DGINUMI7KVSCMMVBZyvNYWEk+DOQJqfciJ0n8E="; }; - vendorHash = "sha256-nkVAHqe61AR0GBK5upsk650kl8UDp1ppFWhyi3erpr4="; + vendorHash = "sha256-RKqaIwGDZj91lfbEJHcnG8RhIrixtR0VtieCfZD/rns="; + + excludedPackages = [ + "integration/..." + "test/..." + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix index 74b437417ebe..afe4b2b96e8c 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-sysinfo"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-sysinfo"; - rev = "fd12d6b638d7033756250ce5cfd82313bdca4124"; - hash = "sha256-DN/7N2I32PCC4RvmhvYn8iwVd/yk6nefhFBEZ8c6mRI="; + rev = "2e3f6ea5946ebbe06e4547a6eb48bed694b1721f"; + hash = "sha256-8XmLFY17uuqzHZFs3L8c5robIIuHF1SKaiPhkoiO2TQ="; }; cargoHash = "sha256-ogFEENZxj4ifLbqKL+gimcAMX1REp2oEohY0MqM6Jsg="; diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix index 681f92c56fd1..7e2bd44954eb 100644 --- a/pkgs/by-name/cr/cri-tools/package.nix +++ b/pkgs/by-name/cr/cri-tools/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "cri-tools"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cri-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-66UDoObxlNBTYJPpo4GoQlV66hXZRf5eLB3ji0KU/Zs="; + hash = "sha256-Ae0CL/BZdIBzZr+Tttg6sNhn1eS2E1odR6fGpbFRVjI="; }; vendorHash = null; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index a0ab5976cbfa..bf13d9e7044f 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -28,14 +28,14 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "ctranslate2"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Dc67hYgZ0aAauZLrVp10jmP52AwdLIZw0iWR9YKHTtU="; + hash = "sha256-jtOfMrC5kFKQN4eFEZeawo0blWHbpMu+peM3XtTSf5w="; }; # Fix CMake 4 compatibility diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 329d10288a25..9574d4b7dcba 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -10,26 +10,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-BTYNvK4UGWL8skJDjFkyBsEjvoUxaxHAlEKtr7gsyhs="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-E2YeEnyAjbGXe1lpcpZnb/NBWNOoQYRkCfuokvkQsaI="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-C+JfqTdhDGTxz3rUWH0a+TdUvQq26wAPQ1qN/U2C/0o="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-WM3Ucu5ia9rlEgXtfNYea6B7ccgmpFJm/p4JpQje+Vs="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-TI74gxQ1VgrSmMvUXXwTQv6ixlALnarYul9DRrU2Arc="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-0/CJxz14JgrCAwhbXeSHXYwnpvh4AnbjUHOUzNxxBJw="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-b1WL8URL+xtVjxOtJI1W3gAWh3i3cIN98f3aeDX5JlM="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-xVwbcStx3UW89PBCE4zfAWNUSvs4NlneLPgY8yJDLag="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-05-07"; + version = "0-unstable-2026-05-16"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 2c47b1f643b5..8b601a3e9820 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -12,6 +12,7 @@ shaka-packager, nix-update-script, runCommand, + versionCheckHook, }: let @@ -24,16 +25,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.32"; + version = "0.2.33"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kqOzJZR2eoua8ruGcwNHdQHXg58xIkH8wlx1sEwzqtA="; + hash = "sha256-IPWbS3kIn3rC1s7nJe3Q94scuW87LaQn5KAhXTYvWGg="; }; - cargoHash = "sha256-NHsEfqnJOyy5F3ALFKVB0by7xe4N/sVEBH0k8fO+cjI="; + cargoHash = "sha256-MmZwiH1Qzb5MiwhEYsCVo4xD5YmJ+mObpkgc6J0sfuw="; + + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper @@ -56,6 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: { } ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 1c2e8c5c84f5..ed324e5b3dbe 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "26.0.4"; + version = "26.0.5"; src = let @@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-BXhv4zuPz2uxcQUlVd8Ju53QKBF6rnRvw9cbJADibpc="; - aarch64-linux = "sha256-3ChHHgacfWlYIKUjNrGL78Q7+F9uC0frjRGyiTiLMT4="; - x86_64-darwin = "sha256-vgEkFqATKfTAVCX7hEivV+GURuyXyQYTTGlnTArSoPs="; - aarch64-darwin = "sha256-RkNPYpPKJw2nKOnR860ZGYZ45/G14y052XeSWKEWvgQ="; + x86_64-linux = "sha256-urgvGZNM7V5zmts+3Zv7nDtyBuyyAHjc9HDUP2CXx50="; + aarch64-linux = "sha256-Ye6NH8tBmSbDS3sJjTzvc9C+qyU3DA0HL0csFUzD1pc="; + x86_64-darwin = "sha256-iMyHZUNHzSpc2DrKSsduMx13hUY1SdHQTANR3Yj256A="; + aarch64-darwin = "sha256-F60zrgx2cS6HCmSznUapSgmuIxLI1Ma8WHrmawDzEUk="; }; in fetchurl { diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 542d0b667909..c76b64421136 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; - version = "20260120"; + version = "20260518"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; tag = finalAttrs.version; - sha256 = "sha256-XYa0WjVGtSainsosuFX3LU0JiWHGzycPzxirraNu8gw="; + sha256 = "sha256-/QAOeL1FruxklcWQfoysO1+WzCJB5v/wi81spO6V/Y8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index b33685dd1cd5..6a686bcc29db 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -20,6 +20,9 @@ help2man, nix-update-script, sendmailPath ? "/run/wrappers/bin/sendmail", + runCommand, + coreutils, + util-linux, }: let @@ -30,14 +33,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.26.7"; + version = "2.26.8"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-x9qr5NC2Mu/TlO3cJ4qxItU6l7XazgWuziVfRFpM9xA="; + hash = "sha256-MlBofpMoNQffZXUQnaqv0blRwHOIhmVuHWYsttoPP5M="; }; patches = [ @@ -46,9 +49,17 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Debian/devscripts/pull/2/commits/c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4.patch"; hash = "sha256-UpS239JiAM1IYxNuJLdILq2h0xlR5t0Tzhj47xiMHww="; }) + # Write to stdout and exit 0 for --help, --version + # https://salsa.debian.org/debian/devscripts/-/merge_requests/637 + (fetchpatch { + url = "https://salsa.debian.org/debian/devscripts/-/commit/dbb258ea17749e2d102d4d181fe2709bda5584e7.patch"; + hash = "sha256-+/E1UhxKk4PYD1bO1kI0qjfBpcMoFbo3xiY45IQ/FWU="; + }) ]; postPatch = '' + substituteInPlace scripts/annotate-output.sh \ + --replace-fail '/usr/bin/printf' '${lib.getExe' coreutils "printf"}' substituteInPlace scripts/debrebuild.pl \ --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl" patchShebangs scripts @@ -63,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper pkg-config + python3Packages.wrapPython ]; buildInputs = [ @@ -92,8 +104,19 @@ stdenv.mkDerivation (finalAttrs: { FileDirList FileTouch IOString + StringShellQuote + YAMLLibYAML ]); + pythonPath = with python3Packages; [ + junit-xml + magic + python-apt + python-debian + requests + unidiff + ]; + preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; tgtpy="$out/${python.sitePackages}" @@ -123,17 +146,29 @@ stdenv.mkDerivation (finalAttrs: { "PERLMOD_DIR=/share/devscripts" ]; - postInstall = '' + preFixup = '' + buildPythonPath "$out ''${pythonPath[*]}" + patchPythonScript "$out/bin/deb-check-file-conflicts" + patchPythonScript "$out/bin/deb-janitor" + patchPythonScript "$out/bin/debbisect" + patchPythonScript "$out/bin/debdiff-apply" + patchPythonScript "$out/bin/debftbfs" + patchPythonScript "$out/bin/debootsnap" + patchPythonScript "$out/bin/reproducible-check" + patchPythonScript "$out/bin/sadt" + patchPythonScript "$out/bin/suspicious-source" + patchPythonScript "$out/bin/wrap-and-sort" sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* - for i in "$out/bin"/*; do - wrapProgram "$i" \ + ln -s debchange $out/bin/dch + ln -s deb2apptainer $out/bin/deb2singularity + ln -s pts-subscribe $out/bin/pts-unsubscribe + mv "$out/bin" "$out/.bin-wrapped" + for i in "$out/.bin-wrapped"/*; do + makeWrapper "$i" "$out/bin/''${i#$out/.bin-wrapped/}" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PERL5LIB : "$out/share/devscripts" \ - --prefix PYTHONPATH : "$out/${python.sitePackages}" \ - --prefix PATH : "${dpkg}/bin" + --prefix PATH : "${curl}/bin:${dpkg}/bin:${gnupg}/bin:${util-linux}/bin" done - ln -s debchange $out/bin/dch - ln -s pts-subscribe $out/bin/pts-unsubscribe ''; passthru.updateScript = nix-update-script { @@ -143,6 +178,89 @@ stdenv.mkDerivation (finalAttrs: { ]; }; + passthru.tests.helpVersion = + runCommand "debian-devscripts-test-help-version" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } + '' + export HOME=/tmp + + for cmd in ${finalAttrs.finalPackage}/bin/*; do + echo "Running $cmd" + + case "''${cmd##*/}" in + + # Fails with an error from python-apt + debootsnap | \ + mk-origtargz | \ + reproducible-check) + ;; + + # Supports neither -h, --help, nor --version + add-patch | \ + archpath | \ + debrsign | \ + dscextract | \ + edit-patch | \ + list-unreleased | \ + namecheck | \ + salsa | \ + svnpath) + ;; + + # Supports -h but neither --help nor --version + deb2apptainer | \ + deb2docker | \ + deb2singularity) + "$cmd" -h + ;; + + # Supports --help but not --version + annotate-output | \ + dd-list | \ + deb-check-file-conflicts | \ + deb-janitor | \ + debbisect | \ + debcheckout | \ + debdiff-apply | \ + debftbfs | \ + debrebuild | \ + debrepro | \ + hardening-check | \ + ltnu | \ + origtargz | \ + sadt | \ + suspicious-source | \ + who-permits-upload | \ + wrap-and-sort) + "$cmd" --help + ;; + + # Everything else supports --help and --version + *) + "$cmd" --help + output=$("$cmd" --version) + case "$output" in + *'version ${finalAttrs.version} + '* | *'version ${finalAttrs.version}. + '* | *'version + ${finalAttrs.version} '* | *'v. ${finalAttrs.version} + '* | *'devscripts ${finalAttrs.version}.'* | *'(devscripts ${finalAttrs.version})'*) + ;; + *) + echo "$cmd --version did not output the expected version ${finalAttrs.version}:" >&2 + "$cmd" --version + false + esac + ;; + + esac + done + + : >"$out" + ''; + meta = { description = "Debian package maintenance scripts"; license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index b7f00122b70a..053b6aa93d68 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "delve"; - version = "1.26.1"; + version = "1.26.3"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; tag = "v${finalAttrs.version}"; - hash = "sha256-j/uGkAd/4Hpspgcb2J3UOs8iThx2YydUee31Hddl9zw="; + hash = "sha256-R7rxWJZ1AfwH/ytgQnq21D5d4YRm3fzYSIG0eugww1U="; }; patches = [ diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix index 8f601fddf0d9..138dfe7ffc7a 100644 --- a/pkgs/by-name/di/dippi/package.nix +++ b/pkgs/by-name/di/dippi/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + blueprint-compiler, meson, ninja, pkg-config, @@ -16,16 +17,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "dippi"; - version = "4.2.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "dippi"; rev = finalAttrs.version; - hash = "sha256-iA7ymByLVrkOatW4Y79pGV7GhlS8G2gHY6PHpOfMq8g="; + hash = "sha256-PfJp4DOM4uaDaKMYeLS70LA00mCeW/jaLmduJ1Wej4k="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja vala diff --git a/pkgs/by-name/di/discourse-mail-receiver/package.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix index 794d74da2fa8..77e8a95bdadb 100644 --- a/pkgs/by-name/di/discourse-mail-receiver/package.nix +++ b/pkgs/by-name/di/discourse-mail-receiver/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ruby, makeWrapper, - replace, + sd, }: stdenv.mkDerivation (finalAttrs: { @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - replace makeWrapper + sd ]; buildInputs = [ ruby ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' mkdir -p $out/bin - replace-literal -f -r -e /etc/postfix /run/discourse-mail-receiver . + find . -type f -exec sd '/etc/postfix' '/run/discourse-mail-receiver' {} + cp -r receive-mail discourse-smtp-fast-rejection $out/bin/ cp -r lib $out/ diff --git a/pkgs/by-name/dj/djmount/package.nix b/pkgs/by-name/dj/djmount/package.nix deleted file mode 100644 index 08e9c6aa1edf..000000000000 --- a/pkgs/by-name/dj/djmount/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - fuse, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "djmount"; - version = "0.71"; - src = fetchurl { - url = "mirror://sourceforge/djmount/${finalAttrs.version}/djmount-${finalAttrs.version}.tar.gz"; - sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; - }; - - postPatch = '' - # Taken from https://github.com/pupnp/pupnp/pull/334/files - substituteInPlace libupnp/threadutil/inc/ithread.h \ - --replace \ - "#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \ - '#define ithread_mutexattr_setkind_np pthread_mutexattr_settype' - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: libupnp/upnp/.libs/libupnp.a(libupnp_la-gena_ctrlpt.o):libupnp/upnp/src/inc/upnpapi.h:163: - # multiple definition of `pVirtualDirList'; libupnp/upnp/.libs/libupnp.a(libupnp_la-upnpapi.o):libupnp/upnp/src/inc/upnpapi.h:163: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = { - homepage = "https://djmount.sourceforge.net/"; - description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; - mainProgram = "djmount"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; - }; -}) diff --git a/pkgs/by-name/do/docuseal/Gemfile.lock b/pkgs/by-name/do/docuseal/Gemfile.lock index a52dd3b0b983..67f58c8782ef 100644 --- a/pkgs/by-name/do/docuseal/Gemfile.lock +++ b/pkgs/by-name/do/docuseal/Gemfile.lock @@ -179,7 +179,7 @@ GEM dotenv (3.2.0) drb (2.2.3) email_typo (0.2.3) - erb (6.0.2) + erb (6.0.4) erb_lint (0.9.0) activesupport better_html (>= 2.0.1) @@ -256,7 +256,7 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.2.1) - hexapdf (1.6.0) + hexapdf (1.7.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) @@ -318,7 +318,7 @@ GEM multi_json (1.19.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.3) + net-imap (0.6.4) date net-protocol net-pop (0.1.2) @@ -328,14 +328,14 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.19.2) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.19.2-aarch64-linux-musl) + nokogiri (1.19.3-aarch64-linux-musl) racc (~> 1.4) - nokogiri (1.19.2-arm64-darwin) + nokogiri (1.19.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.19.2-x86_64-linux-musl) + nokogiri (1.19.3-x86_64-linux-musl) racc (~> 1.4) numo-narray-alt (0.10.3) oj (3.16.16) @@ -661,4 +661,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.7.2 + 2.6.9 diff --git a/pkgs/by-name/do/docuseal/gemset.nix b/pkgs/by-name/do/docuseal/gemset.nix index cd083904d9c0..5f509e1ec7a3 100644 --- a/pkgs/by-name/do/docuseal/gemset.nix +++ b/pkgs/by-name/do/docuseal/gemset.nix @@ -868,10 +868,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ar4nmvk1sk7drjigqyh9nnps3mxg625b8chfk42557p8i6jdrlz"; + sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.4"; }; erb_lint = { dependencies = [ @@ -1208,10 +1208,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10i5826zgvk04jsn6yg7w72s1l5xghrapm6anay4g8w8l32jzqvq"; + sha256 = "0ma1rv2hc51hlji4d3xflx610pq4222bw51sax434b7fayhh55fz"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; i18n = { dependencies = [ "concurrent-ruby" ]; @@ -1592,10 +1592,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bgjhb65r1bl52wdym6wpbb0r3j7va8s44grggp0jvarfvw7bawv"; + sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.4"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -1662,10 +1662,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mhp90nf3g3yy5vgjnwd34czi6rbi0p7057vgngfmmdkknsxiz9q"; + sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; type = "gem"; }; - version = "1.19.2"; + version = "1.19.3"; }; numo-narray-alt = { groups = [ "default" ]; diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix index abb8db12fb46..5866efc1384e 100644 --- a/pkgs/by-name/do/docuseal/package.nix +++ b/pkgs/by-name/do/docuseal/package.nix @@ -4,10 +4,9 @@ fetchFromGitHub, bundlerEnv, nixosTests, - ruby_3_4, + ruby_4_0, pdfium-binaries, makeWrapper, - bundler, fetchYarnDeps, yarn, yarnConfigHook, @@ -16,23 +15,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "docuseal"; - version = "2.4.4"; - - bundler = bundler.override { ruby = ruby_3_4; }; + version = "2.5.3"; src = fetchFromGitHub { owner = "docusealco"; repo = "docuseal"; tag = finalAttrs.version; - hash = "sha256-GjWR0jxVRTs5KNbFDEcgCbG/HTJlJGYpbKf8+0YBSmk="; + hash = "sha256-9fDEj9gOBZrn4dNWf+QRCZs3gUv3Mx/YZLRx55ShS7E="; # https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333 postFetch = "rm $out/db/schema.rb"; }; rubyEnv = bundlerEnv { name = "docuseal-gems"; - ruby = ruby_3_4; - inherit (finalAttrs) bundler; + ruby = ruby_4_0; gemdir = ./.; }; diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index f0416673de8f..faab9a3647d4 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 = "23.0.2"; + version = "23.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; tag = finalAttrs.version; - hash = "sha256-WfMMikTmC+13HxI0YCKwJTrn57CJreU3GsEyrOjr/hg="; + hash = "sha256-Yse1rUaxRnuXawgAk0m4U3GCZNlV0IPPpZ9Qml4heA8="; }; dontBuild = true; diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 25b86d598cac..0bcf9e5f4371 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS/JSON) wrapper plugin"; - hash = "sha256-ccPkzEV0Gtzi6iKq6oIREvIccEFvHec06XxoUWufDZc="; + hash = "sha256-k+o4eiLwzoCF6MPX0dEn/3modSwvFYFuzMe47cdJWo8="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -17,6 +17,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.12.10.wasm"; - version = "0.12.10"; + url = "https://plugins.dprint.dev/biome-0.12.11.wasm"; + version = "0.12.11"; } diff --git a/pkgs/by-name/du/dusklight/package.nix b/pkgs/by-name/du/dusklight/package.nix new file mode 100644 index 000000000000..2b5da6952115 --- /dev/null +++ b/pkgs/by-name/du/dusklight/package.nix @@ -0,0 +1,199 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + abseil-cpp, + alsa-lib, + cmake, + cxxopts, + dbus, + fmt, + freetype, + libGL, + libglvnd, + libjpeg_turbo, + libpulseaudio, + libusb1, + libx11, + libxcb, + libxcursor, + libxi, + libxkbcommon, + libxrandr, + libxscrnsaver, + libxtst, + makeWrapper, + ninja, + nlohmann_json, + pkg-config, + python3, + sdl3, + tracy, + vulkan-loader, + wayland, + xxhash, + zstd, +}: + +let + auroraSrc = fetchFromGitHub { + owner = "encounter"; + repo = "aurora"; + rev = "10006618ee493f248b8597e4dfa1d2871d76a1d9"; + hash = "sha256-lY2xuVyB7aPJ9+2wwLRB3F5U/BuPSxdSpegdG+qNd9o="; + }; + dawnSrc = fetchzip { + url = "https://github.com/encounter/dawn-build/releases/download/v20260423.175430/dawn-linux-x86_64.tar.gz"; + hash = "sha256-HXfKTLHtMPwupnFnaflCARtXVPuS/0PoCePXidjE5xs="; + stripRoot = false; + }; + nodSrc = fetchzip { + url = "https://github.com/encounter/nod/releases/download/v2.0.0-alpha.8/libnod-linux-x86_64.tar.gz"; + hash = "sha256-mUqvLsbsqaZ+HAjMmHYPYO+MgtanGRTw7Gzn5uXR5rE="; + stripRoot = false; + }; + imguiSrc = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v1.91.9b-docking"; + hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ="; + }; + sqliteSrc = fetchzip { + url = "https://sqlite.org/2026/sqlite-amalgamation-3510300.zip"; + hash = "sha256-pNMR8zxaaqfAzQ0AQBOXMct4usdjey1Q0Gnitg06UhM="; + }; + rmluiSrc = fetchzip { + url = "https://github.com/mikke89/RmlUi/archive/f9b8c9e2935d5df2c7dff2c190d3968e99b0c3dc.tar.gz"; + hash = "sha256-g4O/JZUrrcseOz8o2QJRt+2CeuiLnVeuDJc906xvuIg="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "dusklight"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TwilitRealm"; + repo = "dusklight"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a5nCri4XTpnotJY9qRrKTJ8cb9L6cfGKPXmvbbj/1fQ="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + cmake + makeWrapper + ninja + pkg-config + python3 + ]; + + buildInputs = [ + abseil-cpp + alsa-lib + cxxopts + dbus + fmt + freetype + libGL + libglvnd + libjpeg_turbo + libpulseaudio + libusb1 + libx11 + libxcb + libxcursor + libxi + libxkbcommon + libxrandr + libxscrnsaver + libxtst + nlohmann_json + sdl3 + tracy + vulkan-loader + wayland + xxhash + zstd + ]; + + postUnpack = '' + chmod -R u+w "$sourceRoot" + mkdir -p "$sourceRoot/extern/aurora" + cp -rT --no-preserve=mode "${auroraSrc}" "$sourceRoot/extern/aurora" + sed -i '/add_subdirectory(tests)/d' "$sourceRoot/extern/aurora/CMakeLists.txt" + ''; + + cmakeBuildType = "RelWithDebInfo"; + + cmakeFlags = [ + (lib.cmakeFeature "DUSK_WC_DESCRIBE" "v${finalAttrs.version}") + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_Git" true) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CXXOPTS" cxxopts.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JSON" nlohmann_json.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DAWN_PREBUILT" dawnSrc.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_XXHASH" xxhash.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FMT" fmt.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TRACY" tracy.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_NOD_PREBUILT" nodSrc.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FREETYPE" freetype.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ZSTD" zstd.src.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SQLITE3" sqliteSrc.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" imguiSrc.outPath) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RMLUI" rmluiSrc.outPath) + (lib.cmakeFeature "AURORA_SDL3_PROVIDER" "system") + (lib.cmakeFeature "AURORA_NOD_PROVIDER" "package") + (lib.cmakeBool "CMAKE_CROSSCOMPILING" true) + (lib.cmakeBool "DUSK_ENABLE_SENTRY_NATIVE" false) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 dusklight $out/share/dusklight/dusklight + cp -r ../res $out/share/dusklight/res + mkdir -p $out/bin + ln -s ../share/dusklight/dusklight $out/bin/dusklight + + install -Dm644 \ + ../platforms/freedesktop/dusklight.desktop \ + $out/share/applications/dusklight.desktop + + substituteInPlace $out/share/applications/dusklight.desktop \ + --replace-fail "Icon=dusklight" "Icon=dev.twilitrealm.dusklight" + + for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do + install -Dm644 \ + ../platforms/freedesktop/$size/apps/dusklight.png \ + $out/share/icons/hicolor/$size/apps/dev.twilitrealm.dusklight.png + done + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/share/dusklight/dusklight \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + vulkan-loader + libGL + libglvnd + alsa-lib + libpulseaudio + ] + }" + ''; + + meta = { + description = "Reverse-engineered reimplementation of The Legend of Zelda: Twilight Princess"; + homepage = "https://github.com/TwilitRealm/dusklight"; + changelog = "https://github.com/TwilitRealm/dusklight/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.cc0; + mainProgram = "dusklight"; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ liberodark ]; + }; +}) diff --git a/pkgs/by-name/ec/ecasound/package.nix b/pkgs/by-name/ec/ecasound/package.nix index 395c103a6a3c..7c2f281b203b 100644 --- a/pkgs/by-name/ec/ecasound/package.nix +++ b/pkgs/by-name/ec/ecasound/package.nix @@ -18,9 +18,6 @@ }: # TODO: fix python. See configure log. -# fix -Dnullptr=0 cludge below. -# The error is -# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope stdenv.mkDerivation (finalAttrs: { pname = "ecasound"; @@ -64,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { env.CXXFLAGS = "-std=c++11"; configureFlags = [ "--enable-liblilv" - "--with-extra-cppflags=-Dnullptr=0" ]; postPatch = '' diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix index 28155d4376bd..2f8b19f7b25d 100644 --- a/pkgs/by-name/em/emboss/package.nix +++ b/pkgs/by-name/em/emboss/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; + env = { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + buildInputs = [ readline perl diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 30e26e3a1a81..15cd58bd8038 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-2HC2BeT4x4QGjj2tKB0yM9Bh7zsQ/S0xX/KaJvlgq2o="; + hash = "sha256-aNY7XQSUlLh3+Gs/9uMNAaHpITPZI7W7vHiLn5Mdjuk="; }; __structuredAttrs = true; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-AruojLPjozzajHksLDfi39Qq6gvnHem2glgS454yxVQ="; + cargoHash = "sha256-UIn0U9lW0EXbcGirIIWUzqtY1MgcXLQVHhFNTZRqw8g="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 4e277065f01a..5d743cfb1c3c 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.258"; + version = "0.0.260"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-1t4I+c+jktsymGinqTUQv1vNCcOvHQzyXeEokSjmrqM="; + hash = "sha256-juYkvJZUo0b7N/yRRgD4Xwh4nHxRQFMVoWTgIW+N0/0="; }; postPatch = '' diff --git a/pkgs/by-name/ex/exegol4/package.nix b/pkgs/by-name/ex/exegol4/package.nix index be9950a4a0e4..532cd5a4e94f 100644 --- a/pkgs/by-name/ex/exegol4/package.nix +++ b/pkgs/by-name/ex/exegol4/package.nix @@ -17,8 +17,9 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = with python3Packages; [ pdm-backend ]; pythonRelaxDeps = [ - "rich" "argcomplete" + "requests" + "rich" ]; dependencies = diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 28b993b717d9..3bf1b9b9fb47 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2026-05-14"; + version = "2026-05-16"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-1Dg2SNdg6gQyacSC6a1Nr8y3VnV8HcQ2Nu6eiYEh3/s="; + hash = "sha256-7cjqHHflxFfWDx9Bfe2+nX549blfZG0rLZDB3li8pkA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 077a641a7d48..6493f8d92fbd 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -30,13 +30,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; tag = finalAttrs.version; - hash = "sha256-Yvbb8f3bFnSiC6AcYuczwPZhU7FZpqpB9YEd52brXtw="; + hash = "sha256-VbE9wdO//rAEtxHtol/4hHd9tw4berdncMjIXZvOIYE="; }; postPatch = diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index e88656ca3a8b..ba7eabb6eced 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "15.0.0"; + version = "15.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZSUT0f3U6tmJLtSdpTorAYxJExdR+zVan+Gua3BIcDM="; + hash = "sha256-bNdTvjWs43qO3gAtaKZR5CgGmOnJmNWrJUbm6Xv+q+g="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-J0UvU/rXUpxJEn/p+ScO8omFwHY2JD3kq7zGes0ohQ8="; + vendorHash = "sha256-gR8FIVk+D40ALLdM+AzMkIUWLsBlWgoLp3DfEQa3a0s="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fe/fence/package.nix b/pkgs/by-name/fe/fence/package.nix index 1afdf6fb58b3..afc276324a40 100644 --- a/pkgs/by-name/fe/fence/package.nix +++ b/pkgs/by-name/fe/fence/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "fence"; - version = "0.1.57"; + version = "0.1.58"; src = fetchFromGitHub { owner = "Use-Tusk"; repo = "fence"; tag = "v${finalAttrs.version}"; - hash = "sha256-YX+DqD20hr/+hAXLVddEQjj0J7jybhNNdtQM3tlSPek="; + hash = "sha256-ACe3N4bXYJW6QDQHtRChFWOTXTZTbEUbZ4d8cuFRqMY="; }; - vendorHash = "sha256-Qct/M0zuggYzlN0gyO8nF58M5Av3HcYyMjrPab5Crr0="; + vendorHash = "sha256-sEGLnYC4gMo5jPCZxBXra3pmRigaq4bDcVFd52ru7rQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ff/ffmpeg-livepeer/package.nix b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix index 9cbd88f92ae4..2545fd2e28f3 100644 --- a/pkgs/by-name/ff/ffmpeg-livepeer/package.nix +++ b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix @@ -17,6 +17,12 @@ (old: { pname = "ffmpeg-livepeer"; + postPatch = (old.postPatch or "") + '' + substituteInPlace libavcodec/tableprint_vlc.h \ + --replace-fail 'define av_mallocz(s) NULL' 'define av_mallocz(s) NULL + #define av_malloc(s) NULL' + ''; + meta = { inherit (old.meta) license diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index c177df3fddae..419dfc6b038e 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.287"; + version = "2.15.297"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-iKVoQCyLcsGc51IKwUzCpLqG5VbkIASpZILVVX14Sv8="; + hash = "sha256-oXgAQikdzzcp0SxYSerqXvjZ4/hI8Wt9ZJio7tHlt38="; }; - vendorHash = "sha256-K9XXwKFC0xVYSwpQz7EubOoA2XSP7ROa3ORU9A/Gehg="; + vendorHash = "sha256-SYi7Pq+vIMp0SH434cp0zJLV7ZkzODW3+FIarnX4ezs="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/filius/package.nix b/pkgs/by-name/fi/filius/package.nix index 4857cf44688f..63f8ce377928 100644 --- a/pkgs/by-name/fi/filius/package.nix +++ b/pkgs/by-name/fi/filius/package.nix @@ -10,13 +10,13 @@ maven.buildMavenPackage rec { pname = "filius"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitLab { owner = "filius1"; repo = "filius"; tag = "v${version}"; - hash = "sha256-q6A+S50n09DgwayylAWbUFQ/sqfCVEkIoWCRtZT80M8="; + hash = "sha256-l90KnHfndGsEzgJpTNabW0ADJhTYr7z3243TZUJbxNw="; }; mvnHash = "sha256-R14EtImJJEC/DhKm7MKWzq9XEOqDGNPtLIaK3OKbyiQ="; diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 5c6a6b1f6dc7..990743c533c3 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -11,17 +11,17 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "15.17.0"; + version = "15.18.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-rj3EeqdgERZnTLMoAMNWoG1FAX/4IcRmDk7+PsFpBXA="; + hash = "sha256-bsCBDiHOkov3OgjGy29wmZVXDBX6AmH34wNYOPve6uI="; }; - npmDepsHash = "sha256-J0sPjtPd+T4DbcxHAyUh6RKCxnC5SxgrX3VfDlz3AQA="; + npmDepsHash = "sha256-qJezxPI1ao6/G4Ku7qjOFbdEaJohAH+7DWeP9QY/jOs="; # No more package-lock.json in upstream src postPatch = '' diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix index ff2863fcca03..dfbf11197fce 100644 --- a/pkgs/by-name/fl/flawfinder/package.nix +++ b/pkgs/by-name/fl/flawfinder/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "flawfinder"; - version = "2.0.19"; + version = "2.0.20"; pyproject = true; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-/lUJgdNwq/oKKWcTRswLA4Ipqb2QsjnqsPAfEiEt9hg="; + sha256 = "sha256-nXMqTg/vHNTq7v1KAJPxg8WYH2yENxHOrmpjQZQEmWs="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index fca91def2a8a..f891f6d5fab9 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "fly"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${finalAttrs.version}"; - hash = "sha256-zQ7J04QHozRRFPWKjKtI5nB15x5ztYennfM16rpZpP8="; + hash = "sha256-YKa1hGqmmwFNcPX6N7iJUjUL6FnPJLi9DZTkcujzVkY="; }; vendorHash = "sha256-dvE5rtJX3MIuYyswLgcwojd5LIkhD4WnPEL3HNfmhkA="; diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index c9e1947cf4a3..fed11620627f 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "foundry"; - version = "1.7.0"; + version = "1.7.1"; __structuredAttrs = true; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "foundry-rs"; repo = "foundry"; tag = "v${finalAttrs.version}"; - hash = "sha256-UCaBo4hMStmh79UiyYu7vEO7UtrvwJshe4PTMkqZV0w="; + hash = "sha256-pS0V7AbSVowKXWfmk4TM9HyEVO1GL+FCZgdmpCfGcmM="; }; - cargoHash = "sha256-iAWUEVgOgn2Zw9fINxyH9Bynh+flzCY40YFGoVLgG8k="; + cargoHash = "sha256-Ka751S1YhUQJCJYqD8bgjSm9IZPaBNg50DNDhmROQzs="; strictDeps = true; diff --git a/pkgs/by-name/fu/furmark/package.nix b/pkgs/by-name/fu/furmark/package.nix index c4a4f2b18e62..ef5e9acf6540 100644 --- a/pkgs/by-name/fu/furmark/package.nix +++ b/pkgs/by-name/fu/furmark/package.nix @@ -9,6 +9,7 @@ libxcrypt-legacy, makeDesktopItem, makeWrapper, + p7zip, stdenv, testers, vulkan-loader, @@ -18,25 +19,31 @@ let description = "OpenGL and Vulkan Benchmark and Stress Test"; versions = { - "x86_64-linux" = "2.3.0.0"; - "aarch64-linux" = "2.3.0.0"; + "x86_64-linux" = "2.10.2"; + "aarch64-linux" = "2.10.1"; "i686-linux" = "2.0.16"; }; sources = { "x86_64-linux" = { - url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.x86_64-linux}_linux64.zip"; - hash = "sha256-9xwnOo8gh6XlX2uTwvEorXsx9FafaeCyCPPPJLJGeuE="; + url = "https://gpumagick.com/downloads/files/2025/fm2/2_10_dbc69dd0a08da5ff09169a4fc759ddaa/FurMark_${versions.x86_64-linux}_linux64.7z"; + hash = "sha256-s9AEj9r7kBhPGPU365HgxS9tEyrm7UjLtoxD21pCrts="; }; "aarch64-linux" = { - url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.x86_64-linux}_rpi64.zip"; - hash = "sha256-az4prQbg9I+6rt2y1OTy3t21/VHyZS++57r4Ahe3fcQ="; + url = "https://gpumagick.com/downloads/files/2025/fm2/2_10_dbc69dd0a08da5ff09169a4fc759ddaa/FurMark_${versions.aarch64-linux}_arm64.7z"; + hash = "sha256-XQuK6UgZOjwqpENkHVYsoiG9zyZAbNjR+65hj9dvAY8="; }; "i686-linux" = { url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.i686-linux}_linux32.zip"; hash = "sha256-yXd90FgL3WbTga5x0mXT40BonA2NQtqLzRVzn4s4lLc="; }; }; + + is7z = + (stdenv.hostPlatform.system == "x86_64-linux") || (stdenv.hostPlatform.system == "aarch64-linux"); + + linkLogs = + (stdenv.hostPlatform.system == "x86_64-linux") || (stdenv.hostPlatform.system == "aarch64-linux"); in stdenv.mkDerivation (finalAttrs: { pname = "furmark"; @@ -44,12 +51,13 @@ stdenv.mkDerivation (finalAttrs: { versions.${stdenv.hostPlatform.system} or (throw "Furmark is not available on ${stdenv.hostPlatform.system}"); - src = fetchzip sources.${stdenv.hostPlatform.system}; + src = fetchurl sources.${stdenv.hostPlatform.system}; nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper + p7zip ]; buildInputs = [ @@ -58,12 +66,29 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ]; + unpackPhase = '' + runHook preUnpack + 7z x $src + '' + + lib.optionalString is7z '' + mv FurMark_linux64/* . + rmdir FurMark_linux64 + '' + + '' + runHook postUnpack + ''; + installPhase = '' runHook preInstall mkdir -p $out/share/furmark cp -rp * $out/share/furmark - + '' + + lib.optionalString linkLogs '' + ln -sf /tmp/furmark-geexlab.log $out/share/furmark/_geexlab_log.txt + ln -sf /tmp/furmark-furmark.log $out/share/furmark/_furmark_log.txt + '' + + '' mkdir -p $out/bin for i in $(find $out/share/furmark -maxdepth 1 -type f -executable); do ln -s "$i" "$out/bin/$(basename "$i")" @@ -103,7 +128,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.geeks3d.com/furmark/v2/"; license = lib.licenses.unfree; mainProgram = "FurMark_GUI"; - maintainers = with lib.maintainers; [ surfaceflinger ]; + maintainers = with lib.maintainers; [ + surfaceflinger + w1lldu + ]; platforms = [ "aarch64-linux" "i686-linux" diff --git a/pkgs/by-name/gc/gci/package.nix b/pkgs/by-name/gc/gci/package.nix index f6c49a055ac0..acd20c14547e 100644 --- a/pkgs/by-name/gc/gci/package.nix +++ b/pkgs/by-name/gc/gci/package.nix @@ -2,25 +2,36 @@ lib, buildGoModule, fetchFromGitHub, + testers, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gci"; - version = "0.13.7"; + version = "0.14.0"; src = fetchFromGitHub { owner = "daixiang0"; repo = "gci"; - rev = "v${version}"; - sha256 = "sha256-vSVa0fTGKf8H1cURFD0dha65TgOLMa43NuA043TEFu4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+qoHORHUMgr03v3RB+7+g9O/tlDkQKFmKybma0FdhVs="; }; - vendorHash = "sha256-NWVhuJAWwZ9EPLq/PY8nqqRXXPgahGdFNVqBTDvCnMw="; + vendorHash = "sha256-MS6Ei58HpR/ueqdmGEx15WoSSSwDpQUcxAWz36UnhmA="; + + excludedPackages = [ "v2" ]; + + ldflags = [ + "-s" + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; meta = { description = "Controls golang package import order and makes it always deterministic"; homepage = "https://github.com/daixiang0/gci"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ krostar ]; - broken = true; + mainProgram = "gci"; }; -} +}) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index e07f14806b03..a9e4fff504e9 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.41.2"; + version = "0.42.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-4jwEviWYzan97pVn0RWfWU4XS8c27L4ZJUwa2iGlFxY="; + hash = "sha256-QYSzJdyjJ5SvPkI/uf/wu8MdM76W+djai6zD38IJpos="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-4znN1YR3AX2SKeCJjUS8cm6WGcOGPXI27xrQCotBjgQ="; + npmDepsHash = "sha256-hKNEJ/MAseYs8WLr36h40pYv+5nef8EPhZIfmPKYJPY="; dontPatchElf = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix index d09a520137e7..014f8a9c397c 100644 --- a/pkgs/by-name/ge/geph/package.nix +++ b/pkgs/by-name/ge/geph/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, makeBinaryWrapper, @@ -23,18 +24,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "geph5"; - version = "0.2.99"; + version = "0.2.102"; src = fetchFromGitHub { owner = "geph-official"; repo = "geph5"; rev = "geph5-client-v${finalAttrs.version}"; - hash = "sha256-AWdVFpIP+LIZz6zqcx0GJxDs4ZWGR6JgpHDVAg0mHaU="; + hash = "sha256-E3msw4yG5RxKapHBvhGEVlsJiLgysCgjAtOrJ8fGES0="; }; - cargoHash = "sha256-zFCq29vtsbwbo6JBRdX+CziKZVoxwpt6y3BYVlIqZfc="; + cargoHash = "sha256-w+1JLxvflb8PQqNi5MnxoEcWctuaC6Ux3oNYJzB6oaE="; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace binaries/geph5-client/src/vpn/*.sh \ --replace-fail 'PATH=' 'PATH=${binPath}:' @@ -43,6 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/bin/env ' '${lib.getExe' coreutils "env"} ' ''; + postInstall = '' + rm -rf "$out/lib" + ''; + nativeBuildInputs = [ makeBinaryWrapper pkg-config @@ -61,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "aws_lambda" - "windivert" + # "windivert" # Only on Windows ]; checkFlags = [ @@ -74,9 +79,14 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=tests::test_blind_sign" "--skip=tests::test_generate_secret_key" "--skip=tests::ping_pong" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Cannot connect to the internet within the macOS sandbox + "--skip=tests::test_successful_ping" + "--skip=tests::test_failed_ping" ]; - postFixup = '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for program in $out/bin/*; do wrapProgram "$program" --prefix PATH : ${binPath} done @@ -94,7 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/geph-official/geph5"; changelog = "https://github.com/geph-official/geph5/releases/tag/geph5-client-v${finalAttrs.version}"; mainProgram = "geph5-client"; - platforms = lib.platforms.unix; + platforms = lib.platforms.linux ++ lib.platforms.darwin; # VPN mode is not yet available on macOS. license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ penalty1083 diff --git a/pkgs/by-name/ge/gephgui-wry/package.nix b/pkgs/by-name/ge/gephgui-wry/package.nix index d141ff8be816..0e058bac102f 100644 --- a/pkgs/by-name/ge/gephgui-wry/package.nix +++ b/pkgs/by-name/ge/gephgui-wry/package.nix @@ -3,6 +3,7 @@ rustPlatform, webkitgtk_4_1, pkg-config, + openssl, buildNpmPackage, makeDesktopItem, fetchFromGitHub, @@ -12,7 +13,6 @@ glib, copyDesktopItems, wrapGAppsHook4, - nodejs_22, }: let pac-cmd = stdenv.mkDerivation { @@ -28,11 +28,18 @@ let postPatch = '' rm binaries/*/pac - substituteInPlace Makefile --replace-fail 'uname -p' 'uname -m' + substituteInPlace Makefile \ + --replace-fail 'uname -p' 'uname -m' \ + --replace-fail 'ifneq ($(filter arm%,$(UNAME_P)),)' 'ifneq ($(filter aarch64 arm%,$(UNAME_P)),)' ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; + + preBuild = '' + mkdir -p binaries/linux_arm + ''; + installPhase = '' runHook preInstall @@ -52,13 +59,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gephgui-wry"; - version = "5.5.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; tag = "v${finalAttrs.version}"; - hash = "sha256-NxtE26GPG2EvgtMa6eEOZmOcqu4yYr3zioF1CmrxLRk="; + hash = "sha256-f6IC9dRQ3CW3P0TRuOe1mmG3jOAvyMPBpylHJ82AUpM="; fetchSubmodules = true; }; @@ -67,10 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui"; - npmDepsHash = "sha256-dGzmdvzKp/JHCgDf3NJb0oolgW4Y/spagzpeVpMF28w="; - - # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535 - nodejs = nodejs_22; + npmDepsHash = "sha256-GFeHowIv+TiejSNK6kAGAgYcwc2DHu3c4UBEeTScIPk="; installPhase = '' runHook preInstall @@ -83,32 +87,44 @@ rustPlatform.buildRustPackage (finalAttrs: { }; sourceRoot = "${finalAttrs.src.name}/gephgui-wry"; - cargoHash = "sha256-Dh1WuxU1rRDNu2cF9GCo1CIiph1sLc5j0GSPb7b7kJA="; + cargoHash = "sha256-Ekl03CvM32E3Q86YZL8eBFYAzDcpAXq8yVi2Fg3t5yc="; nativeBuildInputs = [ pkg-config perl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems wrapGAppsHook4 ]; - buildInputs = [ webkitgtk_4_1 ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; preBuild = '' cp -r ${finalAttrs.gephgui}/ gephgui/dist/ ''; - postInstall = '' - install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png - ''; + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + cp -a ../macos/template.app "$out/Applications/Geph.app" + chmod -R u+w "$out/Applications/Geph.app" + install -Dm755 "$out/bin/gephgui-wry" "$out/Applications/Geph.app/Contents/MacOS/bin/gephgui-wry" + ln -s "$out/Applications/Geph.app/Contents/MacOS/entrypoint" "$out/bin/Geph" + ''; - preFixup = '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=( --suffix PATH : ${lib.makeBinPath [ pac-cmd ]} ) ''; - desktopItems = [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "Geph"; desktopName = "Geph"; @@ -133,8 +149,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; homepage = "https://github.com/geph-official/gephgui-wry"; - mainProgram = "gephgui-wry"; - platforms = lib.platforms.linux; + mainProgram = if stdenv.hostPlatform.isDarwin then "Geph" else "gephgui-wry"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ penalty1083 diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index e49afbcd7f65..ee2378a3bac5 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20260508"; + version = "0.7.9_20260513"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-XcGykMUEMmrNQ8y++SM1s0RPfMFgBTDXAIeAGKgU2Iw="; + hash = "sha256-hx1/CE18lepkyTnT6yymGwAAJtRM8u7DAhPsKTj0gdo="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; diff --git a/pkgs/by-name/gf/gfortran16/package.nix b/pkgs/by-name/gf/gfortran16/package.nix new file mode 100644 index 000000000000..4236e7c7716a --- /dev/null +++ b/pkgs/by-name/gf/gfortran16/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc16 }: +wrapCC ( + gcc16.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gh/gh-enhance/package.nix b/pkgs/by-name/gh/gh-enhance/package.nix index e57ecb3d35d5..6863d5fa82b8 100644 --- a/pkgs/by-name/gh/gh-enhance/package.nix +++ b/pkgs/by-name/gh/gh-enhance/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "gh-enhance"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-enhance"; rev = "v${finalAttrs.version}"; - hash = "sha256-g6nhEcBt72sol/49FVlYSo9HKtWHfj+zKw7FZ0ZjKXI="; + hash = "sha256-sfTAhrZZPUOAyltlblDIgd/pKMSdugXQqCZ0fBqMcQM="; }; vendorHash = "sha256-us25CXQC3cd3BTa+wOYArbBiMtwkgpfeCQoD3S7+3rU="; diff --git a/pkgs/by-name/gh/gh-stack/package.nix b/pkgs/by-name/gh/gh-stack/package.nix index b78230c295f9..15cced95ab26 100644 --- a/pkgs/by-name/gh/gh-stack/package.nix +++ b/pkgs/by-name/gh/gh-stack/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "gh-stack"; - version = "0.0.3"; + version = "0.0.4"; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "github"; repo = "gh-stack"; tag = "v${finalAttrs.version}"; - hash = "sha256-CwUDoLLcEsA+dlPDLqQnBLqdtNQwDW6ghmTkyXMpM4M="; + hash = "sha256-sC8QQ4H2WsEVf4FjaWlPvMlVlVc3J6IVmdlqNbJ3M6I="; }; vendorHash = "sha256-JnuqORtdW+xz8pAGAFXdjRey8jCEj+miJiyfY7gzRSU="; diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index f793bc16bfd1..1410b566346a 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gickup"; - version = "0.10.42"; + version = "0.10.44"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; tag = "v${finalAttrs.version}"; - hash = "sha256-nQermDp6w1OgZgRMknj2f6B7T9ufTZXuA8FuhGGpnWM="; + hash = "sha256-AbeV/0CngNgCaLUIwv/uy8VgpiKiOXWGSjnW+xrd7gk="; }; - vendorHash = "sha256-lmPZlCiQXwe6FWwtDyZjqmF9I2609odpY4AjkEuqPUA="; + vendorHash = "sha256-lCeUEReVh0Fg1gyyTvWq2CIdQLuGCN20u9TftiokI0I="; ldflags = [ "-X main.version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 62bd34515996..3fc1ae6b605b 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -24,8 +24,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "nov25a"; - version = "20251101_a"; + srcVersion = "may26a"; + version = "20260501_a"; pname = "gildas"; src = fetchurl { @@ -35,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" ]; - hash = "sha256-1wUKOW0DtGuxggZXzZf2aXRf9F4EFkgU5D4SjK8EwXM="; + hash = "sha256-c/GwX4II6JFJXRaslPN/DfvtAis8apk+xonJ9WAvrQM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/ginac/ginac-example-test.nix b/pkgs/by-name/gi/ginac/ginac-example-test.nix new file mode 100644 index 000000000000..501beb499683 --- /dev/null +++ b/pkgs/by-name/gi/ginac/ginac-example-test.nix @@ -0,0 +1,36 @@ +{ + runCommand, + gccStdenv, + cln, + ginac, +}: +runCommand "ginac-example-test" + { + nativeBuildInputs = [ + gccStdenv.cc + ginac + cln + ]; + } + '' + echo " + #include + #include + using namespace std; + using namespace GiNaC; + + int main() { + symbol x(\"x\"), y(\"y\"); + ex poly; + + for (int i=0; i<3; ++i) { + poly += factorial(i+16)*pow(x,i)*pow(y,2-i); + } + + cout << poly << endl; + return 0; + }" > hello.cc + c++ -lginac -lcln hello.cc -o hello + ./hello + mkdir $out + '' diff --git a/pkgs/by-name/gi/ginac/package.nix b/pkgs/by-name/gi/ginac/package.nix index 87406bb062c0..1937b6577fa4 100644 --- a/pkgs/by-name/gi/ginac/package.nix +++ b/pkgs/by-name/gi/ginac/package.nix @@ -1,6 +1,8 @@ { lib, stdenv, + gccStdenv, + callPackage, fetchurl, cln, pkg-config, @@ -9,7 +11,7 @@ python3, }: -stdenv.mkDerivation (finalAttrs: { +gccStdenv.mkDerivation (finalAttrs: { pname = "ginac"; version = "1.8.10"; @@ -35,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-rpath" ]; + passthru.tests.example = callPackage ./ginac-example-test.nix { ginac = finalAttrs.finalPackage; }; + meta = { description = "GiNaC C++ library for symbolic manipulations"; homepage = "https://www.ginac.de/"; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index ada0206dc4dc..d75a0c67e02e 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-atda50YVT577YabcHRO/xQU68DUFpwPS2GAWScSUaKg="; + hash = "sha256-y6QGF2g9FhDxtWR//kaI5Xt2o+MwaNWCf2t0t61/vww="; }; vendorHash = "sha256-fVNMtCpodsr1Z9E21osHb+e63ZQqFKYwi4fz4OsTJe0="; diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json index 2a267236fb96..d6dac8df3eaf 100644 --- a/pkgs/by-name/gi/github-runner/deps.json +++ b/pkgs/by-name/gi/github-runner/deps.json @@ -24,6 +24,11 @@ "version": "6.0.0", "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" }, + { + "pname": "Microsoft.AspNetCore.WebUtilities", + "version": "8.0.25", + "hash": "sha256-jECs5Bnog26hhNXElS69wFzMkaVf9D6AwWrH6+qbfqI=" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "8.0.0", @@ -31,14 +36,39 @@ }, { "pname": "Microsoft.Bcl.Cryptography", - "version": "10.0.2", - "hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M=" + "version": "10.0.6", + "hash": "sha256-6VaDedxTljDNE+a4ao4xSG3rzZ6lbmCShtgMgHe9aH4=" }, { "pname": "Microsoft.CodeCoverage", "version": "17.14.1", "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" }, + { + "pname": "Microsoft.DevTunnels.Connections", + "version": "1.3.39", + "hash": "sha256-aJBUNv1n7b64EBrAa04+Gw1MLYC315xANCRdK3RnWlA=" + }, + { + "pname": "Microsoft.DevTunnels.Contracts", + "version": "1.3.39", + "hash": "sha256-lREgEhQhgQJyLoMYS/N5w+i6iX0s3Ppnl0T71KhG2u8=" + }, + { + "pname": "Microsoft.DevTunnels.Management", + "version": "1.3.39", + "hash": "sha256-twyduZ89fY69k5onUihezBwdiu3BxdOMBLIXq4aQvY0=" + }, + { + "pname": "Microsoft.DevTunnels.Ssh", + "version": "3.12.24", + "hash": "sha256-+GFTJiVQ5NZy3HeCiFIm4DggKAKPlEb90P/ZBB/rRxc=" + }, + { + "pname": "Microsoft.DevTunnels.Ssh.Tcp", + "version": "3.12.24", + "hash": "sha256-NCNAGmQ9ugp5ezJ8adujvP0HRtYkIn4Ly0AWq2nDH9M=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.2", @@ -49,6 +79,16 @@ "version": "8.0.3", "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + }, + { + "pname": "Microsoft.Net.Http.Headers", + "version": "8.0.25", + "hash": "sha256-nNRfKgfqUQTQHTV+rahK/Uo21XiGW1pTs5J6AYg3RrQ=" + }, { "pname": "Microsoft.NET.Test.Sdk", "version": "17.14.1", @@ -119,6 +159,11 @@ "version": "17.14.1", "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "17.13.22", + "hash": "sha256-ArINoBy7Q8bTCVPM9/y8MH0pe8TkhaYrH9PjrZijnY0=" + }, { "pname": "Microsoft.Win32.Primitives", "version": "4.0.1-rc2-24027", @@ -486,13 +531,18 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "6.0.0", - "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" + "version": "10.0.3", + "hash": "sha256-yT3XjTyXEsmn4ptBShNAPUpKIvCEj0H9Gopd5H6MkrQ=" }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.1", - "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" + "version": "10.0.6", + "hash": "sha256-MpXUz1TiiFkD1ngApC7HKqW+i37zi5V2ApOmqZwDqiI=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "6.0.0", + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, { "pname": "System.Diagnostics.Tools", @@ -511,8 +561,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "10.0.2", - "hash": "sha256-PY875Po9vWaGTNbyZaxo9AbKFc8pg1eKf9akGQnJ5cc=" + "version": "10.0.6", + "hash": "sha256-h5f9iYBUHgG9kOV7jlVQ8HqBQ0DQJt+wy3R/FbB1kaQ=" }, { "pname": "System.Globalization", @@ -589,6 +639,11 @@ "version": "10.0.1", "hash": "sha256-k8EHcxnLitXo0CxoDZAxFmUlJJdKZVsZJ2+9zDMYB94=" }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, { "pname": "System.Linq", "version": "4.1.0-rc2-24027", @@ -801,8 +856,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "10.0.2", - "hash": "sha256-B33jrdvy1mvc8CnZJvnGp438K8wBI/d9x2IGxijefuU=" + "version": "10.0.6", + "hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -811,8 +866,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "8.0.0", - "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + "version": "10.0.3", + "hash": "sha256-JF/WTKv00v/C4ml4g/VL3j4JMPpZa1HBmVMvUnphHr4=" }, { "pname": "System.Security.Cryptography.X509Certificates", @@ -836,8 +891,13 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "8.0.1", - "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" + "version": "10.0.3", + "hash": "sha256-3QQOhe001OZv58OeH51TfQ2Kch9T0SnhjyKSRioGj84=" + }, + { + "pname": "System.ServiceProcess.ServiceController", + "version": "10.0.6", + "hash": "sha256-Lvkb2mzQT/tcJ2yxkQDmKKFpEyaUbQ75qU51FwD1dzY=" }, { "pname": "System.Text.Encoding", @@ -851,8 +911,8 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" + "version": "10.0.3", + "hash": "sha256-tDbCCtsmw1O8G9QvH2wyJtF7txxt6lpBy35w5rVZ800=" }, { "pname": "System.Text.Encoding.Extensions", @@ -881,8 +941,8 @@ }, { "pname": "System.Threading.Channels", - "version": "8.0.0", - "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" + "version": "10.0.3", + "hash": "sha256-JuimR9Phq1bx34EQzFxWINDyANQV8ZCP2zN2cBydGVI=" }, { "pname": "System.Threading.Tasks", diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 4e032f8f44df..6999b71a8a44 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -35,13 +35,13 @@ assert builtins.all ( buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.333.1"; + version = "2.334.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-5hSnveIebRQhvIHZc8sN9/8e9W1rlfITIB2uNMsQM6k="; + hash = "sha256-KSfzWwIf8Vpc8H0XM1tIqdZhdY/noZCeYLBvdWjqmLA="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -184,13 +184,21 @@ buildDotnetModule (finalAttrs: { "TestSelfUpdateAsync_ValidateHash" "TestSelfUpdateAsync" ] + # Includes an `ActionDownloadInfo` that fails with sandboxed networking ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ + "BatchesResolutionAcrossCompositeActions" "CompositeActionWithActionfile_CompositeContainerNested" "CompositeActionWithActionfile_CompositePrestepNested" "CompositeActionWithActionfile_MaxLimit" "CompositeActionWithActionfile_Node" + "DeduplicatesResolutionAcrossDepthLevels" "DownloadActionFromGraph" + "DownloadsNextLevelActionsBeforeRecursing" + "MultipleTopLevelActions_BatchesResolution" + "NestedCompositeContainers_BatchedResolution" "NotPullOrBuildImagesMultipleTimes" + "ParallelDownloadsAtSameDepth" + "ParallelDownloads_MultipleUniqueActions" "RepositoryActionWithActionYamlFile_DockerHubImage" "RepositoryActionWithActionfileAndDockerfile" "RepositoryActionWithActionfile_DockerHubImage" diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 998995947ca3..9f63ac631fca 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl2Plus ]; platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; teams = [ lib.teams.gnome ]; }; }) diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index 2ff2029a03af..6180f3daf5ee 100644 --- a/pkgs/by-name/go/go-containerregistry/package.nix +++ b/pkgs/by-name/go/go-containerregistry/package.nix @@ -15,13 +15,13 @@ in buildGoModule (finalAttrs: { pname = "go-containerregistry"; - version = "0.21.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "google"; repo = "go-containerregistry"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2cC2fZe22K8mPIXa8YI1MgUlEn6p1z7RBEQhFjYNsxA="; + sha256 = "sha256-qqtcvpxqvOG+zVGse5vCdxaA8tgH3WrKjfLUTRLxA7s="; }; vendorHash = null; diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index b1fe5902ade5..273b2f9123a7 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "go-sendxmpp"; - version = "0.15.6"; + version = "0.15.8"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "mdosch"; repo = "go-sendxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-HoK13rhsH5OyRHLuuCC+zGpcrK1591Zqy0hUinHbhcE="; + hash = "sha256-9p9/3kMW25lfWDdN1EExomVRaNXEytJ6/V8MUA3rABQ="; }; - vendorHash = "sha256-Zy3oewVeoKEIOmh2lxyjBIHNCJX/YtWxuGOk6IM9CXs="; + vendorHash = "sha256-/38b5tMB7ZHMl16ZzB8UJvWfysa1MD9OLRyqX5X0ACY="; passthru = { tests = { inherit (nixosTests) ejabberd prosody; }; diff --git a/pkgs/by-name/go/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock index 7680896c072f..a8174d6d1b98 100644 --- a/pkgs/by-name/go/gollum/Gemfile.lock +++ b/pkgs/by-name/go/gollum/Gemfile.lock @@ -5,11 +5,11 @@ GEM asciidoctor (2.0.26) base64 (0.3.0) builder (3.3.0) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.6) crass (1.0.6) creole (0.5.0) - date (3.5.0) - erb (6.0.0) + date (3.5.1) + erb (6.0.4) expression_parser (0.9.0) gemojione (4.3.3) json @@ -45,57 +45,55 @@ GEM mime-types (~> 3.4) rugged (~> 1.5) htmlentities (4.4.2) - i18n (1.14.7) + i18n (1.14.8) concurrent-ruby (~> 1.0) - json (2.16.0) - kramdown (2.5.1) - rexml (>= 3.3.9) + json (2.19.5) + kramdown (2.5.2) + rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) logger (1.7.0) - loofah (2.24.1) + loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0924) + mime-types-data (3.2026.0414) mini_portile2 (2.8.9) - multi_json (1.17.0) - mustache (1.1.1) + multi_json (1.21.1) + mustache (1.1.2) mustache-sinatra (2.0.0) mustache (~> 1.0) - mustermann (3.0.4) - ruby2_keywords (~> 0.0.1) - nokogiri (1.18.10) + mustermann (3.1.1) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octicons (19.21.0) + octicons (19.25.0) org-ruby (0.9.12) rubypants (~> 0.2) - psych (5.2.6) + psych (5.3.1) date stringio racc (1.8.1) - rack (3.2.4) + rack (3.2.6) rack-protection (4.2.1) base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.1.1) + rack-session (2.1.2) base64 (>= 0.1.0) rack (>= 3.0.0) - rackup (2.2.1) + rackup (2.3.1) rack (>= 3) - rdoc (6.15.1) + rdoc (6.17.0) erb psych (>= 4.0.0) tsort rexml (3.4.4) rouge (3.30.0) - rss (0.3.1) + rss (0.3.2) rexml - ruby2_keywords (0.0.5) rubypants (0.7.1) rugged (1.9.0) sinatra (4.2.1) @@ -117,11 +115,11 @@ GEM rack (>= 2.2.4, < 4) sprockets-helpers (1.4.0) sprockets (>= 2.2) - stringio (3.1.8) + stringio (3.2.0) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - tilt (2.6.1) + tilt (2.7.0) tsort (0.2.0) twitter-text (1.14.7) unf (~> 0.1.0) @@ -129,7 +127,7 @@ GEM unf_ext unf_ext (0.0.9.1) useragent (0.16.11) - webrick (1.9.1) + webrick (1.9.2) wikicloth (0.8.3) builder expression_parser diff --git a/pkgs/by-name/go/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix index 14a236725030..c7ecbe45f2af 100644 --- a/pkgs/by-name/go/gollum/gemset.nix +++ b/pkgs/by-name/go/gollum/gemset.nix @@ -34,10 +34,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; crass = { groups = [ "default" ]; @@ -64,20 +64,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rbfqkzr6i8b6538z16chvrkgywf5p5vafsgmnbmvrmh0ingsx2y"; + sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; erb = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y95ynlfngs0s5x1w6mwralszhbi9d75lcdbdkqk75wcklzqjc17"; + sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.4"; }; expression_parser = { groups = [ "default" ]; @@ -189,20 +189,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8"; type = "gem"; }; - version = "1.14.7"; + version = "1.14.8"; }; json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "098m3q2jrx4xbf0knrbmflsynmmb5x9q9b0bzpmj7jmm1cr30mna"; + sha256 = "0n9ch455pnvl9vxs2f3j77bpdmxg5g3mn3vyr9wxa0a87raii2i1"; type = "gem"; }; - version = "2.16.0"; + version = "2.19.5"; }; kramdown = { dependencies = [ "rexml" ]; @@ -210,10 +210,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; + sha256 = "1yh2gwpwhh0p4vc0aabzn0hb55av0wkcq3gh3w8zkdk69hh4598v"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; kramdown-parser-gfm = { dependencies = [ "kramdown" ]; @@ -245,10 +245,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5"; + sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl"; type = "gem"; }; - version = "2.24.1"; + version = "2.25.1"; }; mime-types = { dependencies = [ @@ -269,10 +269,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2025.0924"; + version = "3.2026.0414"; }; mini_portile2 = { groups = [ "default" ]; @@ -289,20 +289,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; + sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.1"; }; mustache = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch"; + sha256 = "003cyf76zmki1lnh55cvir7dkn0s70dm909dxn6sfk9m00s2886l"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; mustache-sinatra = { dependencies = [ "mustache" ]; @@ -316,15 +316,14 @@ version = "2.0.0"; }; mustermann = { - dependencies = [ "ruby2_keywords" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5"; + sha256 = "163i29mdcr1h0nximk3d51a1fgp7vz3sfasn8p1rjm2d4g3p0qac"; type = "gem"; }; - version = "3.0.4"; + version = "3.1.1"; }; nokogiri = { dependencies = [ @@ -335,20 +334,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; + sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; type = "gem"; }; - version = "1.18.10"; + version = "1.19.3"; }; octicons = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1np1wipr98padazkah6flc1iqhs8n2k02w6inrd5v12f75fxw3w9"; + sha256 = "0n60z2nnpp1zn3rk6na67rp2v7ihk00sr28j837qbwgakqaza76j"; type = "gem"; }; - version = "19.21.0"; + version = "19.25.0"; }; org-ruby = { dependencies = [ "rubypants" ]; @@ -370,10 +369,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1"; + sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb"; type = "gem"; }; - version = "5.2.6"; + version = "5.3.1"; }; racc = { groups = [ "default" ]; @@ -390,10 +389,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x"; + sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.6"; }; rack-protection = { dependencies = [ @@ -419,10 +418,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b"; + sha256 = "1s7zcxlmg88a6dam4aqbgk9xkpy6dkdfqmmcszkkliy3q3w38m2r"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rackup = { dependencies = [ "rack" ]; @@ -430,10 +429,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp"; + sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; rdoc = { dependencies = [ @@ -445,10 +444,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8"; + sha256 = "1dq2bani47fzyqpb4psizfmzxiznvzlajmdikdgik67wd3jx8l0g"; type = "gem"; }; - version = "6.15.1"; + version = "6.17.0"; }; RedCloth = { groups = [ "default" ]; @@ -486,20 +485,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dv74a07j3ih5ykyszs1k2cjvgs5c1pzrvcb1wc2bfai8p038qml"; + sha256 = "1yhya0dfd3ghy70amzd15ssh7y81jhblnzx01fhcscnq69nl9l1v"; type = "gem"; }; - version = "0.3.1"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "0.3.2"; }; rubypants = { groups = [ "default" ]; @@ -587,10 +576,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v74k5yw7ndikr53wgbjn6j51p83qnzqbn9z4b53r102jcx3ri4r"; + sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63"; type = "gem"; }; - version = "3.1.8"; + version = "3.2.0"; }; therubyrhino = { dependencies = [ "therubyrhino_jar" ]; @@ -618,10 +607,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m"; + sha256 = "1cvaikq1dcbfl008i16c1pi1gmdax7vfkvmhch64jdkakyk9nnqd"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.0"; }; tsort = { groups = [ "default" ]; @@ -680,10 +669,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; + sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; wikicloth = { dependencies = [ diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix index a7f9e63aee4f..2fa7366d7570 100644 --- a/pkgs/by-name/go/gomuks-web/package.nix +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -11,17 +11,17 @@ buildGoModule (finalAttrs: { pname = "gomuks-web"; - version = "26.04"; + version = "26.05"; src = fetchFromGitHub { owner = "gomuks"; repo = "gomuks"; tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0"; - hash = "sha256-IysL++H3ncAU1xqNWKy2Z9RKkF1hriVmIDdQu0SkDbQ="; + hash = "sha256-BoTD4c9ZhfyFytsxUCvTIoCoBiFbPW1T1uGWRDx+OIE="; }; proxyVendor = true; - vendorHash = "sha256-Ev6nmmOzLPjXp8XYj+7MRPElfGAv8fUcXJ5fXP8LCvs="; + vendorHash = "sha256-WJQmei6+T98k2Dkma3rHM2c7pzvze0hT8W5UnnARLok="; nativeBuildInputs = [ nodejs @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { npmRoot = "web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/web"; - hash = "sha256-NeQzz2+Vdi1OtVN7ZF8I33nFCO7OpccD1AjpPl7tML4="; + hash = "sha256-H76LUuhEqjuAh7PxjIjMBW5TvsOg9Ra2T7Y39SfktqM="; }; }; diff --git a/pkgs/by-name/go/google-amber/package.nix b/pkgs/by-name/go/google-amber/package.nix index 8cedbc82006b..8620de8f7864 100644 --- a/pkgs/by-name/go/google-amber/package.nix +++ b/pkgs/by-name/go/google-amber/package.nix @@ -39,27 +39,27 @@ let spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b"; - hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; + rev = "babee77020ff82b571d723ce2c0262e2ec0ee3f1"; + hash = "sha256-GWcNNw08XoKaZs/BTW9nPAEMHL8wqbhbUm56PUtEan4="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "13b59bf1d84054b8ccd29cdc6b1303f69e8f9e77"; - hash = "sha256-k/mTHiLbZdnslC24fjcrzqsZYMyVaAADGEqngqJcC2c="; + rev = "4c1ae3cd6f9076271cd64acde8cbef1d1287f27f"; + hash = "sha256-x7OXe0q9ml8PIxWyTEx3j3tvSgIPp8kg5HwlLWIzNuk="; }; in stdenv.mkDerivation (finalAttrs: { pname = "amber"; - version = "0-unstable-2025-02-03"; + version = "0-unstable-2026-04-29"; src = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "3f078e41d86ca1a5881560f00e26198f59bb8ac0"; - hash = "sha256-pAotVFmtEGp9GKmDD0vrbfbO+Xt2URmM8gYCjl0LEnk="; + rev = "fc02f9bad7ddaf5ca685ad01c3a0668d19910fbf"; + hash = "sha256-en+q6pLBTiVRg5XdP2qmPfkPnywYqEOsm2/er3m75Jw="; }; buildInputs = [ @@ -96,9 +96,13 @@ stdenv.mkDerivation (finalAttrs: { ''; installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin amber image_diff wrapProgram $out/bin/amber \ --suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d + + runHook postInstall ''; passthru.tests.lavapipe = diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 6b446a00ec00..9cd4d80d1cd5 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -184,11 +184,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "148.0.7778.167"; + version = "148.0.7778.178"; 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-1k9PrK1mpUJFJ6RbC3ZEN0CqOLX4JbGpmpXQrDpZTVU="; + hash = "sha256-3iuKxcuwt/+BIcUqC715hbeRLhUjepNU1GbB3daIokI="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -302,11 +302,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "148.0.7778.168"; + version = "148.0.7778.179"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/l7nnht2cublegpab37bdleb52y_148.0.7778.168/GoogleChrome-148.0.7778.168.dmg"; - hash = "sha256-HaextZ70Os3EN5mguSmKp0GD0LAy1kE4dWUYwOA+JOs="; + url = "http://dl.google.com/release2/chrome/adxxii2zvsza6zjfnjbfh6fn4tqq_148.0.7778.179/GoogleChrome-148.0.7778.179.dmg"; + hash = "sha256-QBHyF222wnaEmI79CQFOXQl5WkRNwneCYd/JFNMEEWU="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index 64ea99c1681b..b5daf05fd3a7 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "google-lighthouse"; - version = "13.2.0"; + version = "13.3.0"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${finalAttrs.version}"; - hash = "sha256-D/HQP34/EGJLWgRneiYP8eByUNSjKwQQLD0FScgYAVo="; + hash = "sha256-5GFaM6R836Z/EKTvDLF0/aLox5VltcwgLSWzAmn77EY="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-DKFPnSj3jujCWb+KitgTZaIJB8XkHJBoncaNvzcuIVU="; + hash = "sha256-tzN0rAHahBs4n6KCCAS2xoCxXmaZVtmB4WSNxia9TME="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index c097a90c3341..fc32575b4948 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -11,28 +11,24 @@ buildGoLatestModule (finalAttrs: { pname = "gopls"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; tag = "gopls/v${finalAttrs.version}"; - hash = "sha256-D/HBqFy5pNSOhMxx/G102HuL+l+oPljsG8rPNLZjUCs="; + hash = "sha256-JO3FHKBjAGPPuVvrgdc4RZJreiPHbZp+4RwiZubusVg="; }; modRoot = "gopls"; - vendorHash = "sha256-hT0rvmTyniUdZx1ZVd80nJgsWUpOMKkb9VaCAlKM4lk="; + vendorHash = "sha256-mZvjoEgVZ5iNTiduLEC3Oy4RCcxEdVlN6a0Us47IdIQ="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${finalAttrs.version}" ]; doCheck = false; - # Only build gopls & modernize, not the integration tests or documentation generator. - subPackages = [ - "." - "internal/analysis/modernize/cmd/modernize" - ]; + subPackages = [ "." ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index f2fbe865f170..92a8bc90b03d 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotip"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lusingander"; repo = "gotip"; tag = "v${finalAttrs.version}"; - hash = "sha256-9oLHvIY2GlBq7NdsWG1CC+jhH3LvnC9rxCwPtS2aN9o="; + hash = "sha256-CgTznW4SwKrJ4Q7dIo2ebn51G13nP36tv8n2G9T+MZ0="; }; - vendorHash = "sha256-ft2mmOClDil5/bLNToJM8Ui6YDeoYjvTtbYX6Dy9yjo="; + vendorHash = "sha256-Sj7JzyWviGxp10O1zGONN49TXtwquXYJ1KoijIVcyj0="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/goupile/package.nix b/pkgs/by-name/go/goupile/package.nix index 00887513597c..ac7af04aad39 100644 --- a/pkgs/by-name/go/goupile/package.nix +++ b/pkgs/by-name/go/goupile/package.nix @@ -27,14 +27,14 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "goupile"; - version = "3.12.4"; + version = "3.12.5"; # https://github.com/Koromix/rygel/tags src = fetchFromGitHub { owner = "Koromix"; repo = "rygel"; tag = "goupile/${finalAttrs.version}"; - hash = "sha256-2lHCOsvjTZeRkboefIdyh7JoSmes3KgvjFnXKnQ4On4="; + hash = "sha256-REgop8kMiB9j64hMsDmyuYidsKgMtKVYf/lwRbuf5Ho="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gu/gubbi-font/package.nix b/pkgs/by-name/gu/gubbi-font/package.nix index bd141293b31b..0841242b1b7f 100644 --- a/pkgs/by-name/gu/gubbi-font/package.nix +++ b/pkgs/by-name/gu/gubbi-font/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fontforge, + installFonts, }: stdenv.mkDerivation (finalAttrs: { @@ -12,21 +13,28 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "aravindavk"; repo = "gubbi"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "10w9i3pmjvs1b3xclrgn4q5a95ss4ipldbxbqrys2dmfivx7i994"; }; - nativeBuildInputs = [ fontforge ]; + nativeBuildInputs = [ + fontforge + installFonts + ]; dontConfigure = true; preBuild = "patchShebangs generate.pe"; - installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf"; + installPhase = '' + runHook preInstall + runHook postInstall + ''; meta = { inherit (finalAttrs.src.meta) homepage; description = "Kannada font"; + maintainers = with lib.maintainers; [ pancaek ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 6b33013f5935..2f5eaa846498 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "23.0.0"; + version = "23.1.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-WmHBR7BCkmyTx7l88lEV9aRrPFp1Dj+qh6bs23E6wnA="; + hash = "sha256-dDyXUYDP+kWBtr7WCkPO2BetdwEYDWs9pyLMPLEi8zI="; }; postPatch = '' diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix index ad8a4df44af3..1bd9030a5d2b 100644 --- a/pkgs/by-name/gv/gvproxy/package.nix +++ b/pkgs/by-name/gv/gvproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gvproxy"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${finalAttrs.version}"; - hash = "sha256-wwQ4Wf9KtXwYTpoCUMuMUpTQBPlgynGe/VFqP/79xUA="; + hash = "sha256-wWsxqMpHu+YY9LaiA8SohZSDCSJgYc/FnUkx6GzfhYw="; }; vendorHash = null; diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index b00524358deb..089dd611b092 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hddfancontrol"; - version = "2.0.6"; + version = "2.1.1"; src = fetchFromGitHub { owner = "desbma"; repo = "hddfancontrol"; tag = finalAttrs.version; - hash = "sha256-VnHXRheqh+NwbFBWsX9XUbRuto7weyX7aHZ+BDi2Vns="; + hash = "sha256-Fqkx2pO97RCFa1vFTCuMsO+WVs/2WGLsHwyKcuEnq5I="; }; - cargoHash = "sha256-lm4ARffPOYCewNyREb1PQ8M5icqh8c+z6ZNXZKpBlRE="; + cargoHash = "sha256-8NNFL5aeQjdXP/qw9yxL2fFOJaLUVM2GJ0YSW5OuR4A="; nativeBuildInputs = [ makeWrapper @@ -28,8 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postBuild = '' - mkdir -p target/man - cargo run --features gen-man-pages -- target/man + mkdir -p target/man target/shell-completions + cargo run --features generate-extras -- gen-man-pages target/man + cargo run --features generate-extras -- gen-shell-completions target/shell-completions ''; postInstall = '' @@ -38,8 +39,12 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail /usr/bin/hddfancontrol $out/bin/hddfancontrol sed -i -e '/EnvironmentFile=.*/d' $out/etc/systemd/system/hddfancontrol.service - cd target/man - installManPage hddfancontrol-daemon.1 hddfancontrol-pwm-test.1 hddfancontrol.1 + installManPage target/man/*.1 + + installShellCompletion --cmd hddfancontrol \ + --bash target/shell-completions/hddfancontrol.bash \ + --fish target/shell-completions/hddfancontrol.fish \ + --zsh target/shell-completions/_hddfancontrol ''; postFixup = '' @@ -64,5 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: { philipwilk ]; mainProgram = "hddfancontrol"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ho/homebridge/package.nix b/pkgs/by-name/ho/homebridge/package.nix index 43a82b3e2957..afc14f348b94 100644 --- a/pkgs/by-name/ho/homebridge/package.nix +++ b/pkgs/by-name/ho/homebridge/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "homebridge"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-JHeyyPh2ePIrUhqfo1Cb4pNf+lB3ldE6NR0OunbLuKk="; + hash = "sha256-bs7h9qHAWPNEqomTbit2LBtM5yLHQnFLjCMJ/ybHxHU="; }; - npmDepsHash = "sha256-zJ9WPnhtC0rnyT5dqPfC/eg+TRlKlDDQW3XYx67pl5s="; + npmDepsHash = "sha256-/1mIwWFa6L7bLao0/Q3I+nniVt5crVa8ufuvkYeoJUY="; meta = { description = "Lightweight emulator of iOS HomeKit API"; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 2ca921488e7a..c15c19b5b177 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "26.4.0-0"; + version = "26.4.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-qpwtXAVrBAdDnK9FLkvPdbVtPIZpAaZ0srT+Hw7ckNA="; + hash = "sha256-SXJwGw8PVz4+TDjv0ZdCdR6GStr6+NsjD9qi04nFD7E="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-LtEHmdSxIiWNHIAkVycsNMhmjS7VWkMiwLcY544fQ1Y="; + hash = "sha256-wwQbXPGii5M/0rWb7KnWrrzIOYxXNp2OjyxNHVzWNTY="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-bgo+R01NJ3ElfHHvRZ42K8AcioJyjhs52yHkq30nsyg="; + hash = "sha256-86oDb+ZNWPxvsQEwWw/8Wmn50eU4fJkDs/E45MQ+prI="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ht/httpdirfs/package.nix b/pkgs/by-name/ht/httpdirfs/package.nix index 7874f816a8d2..635ade85e860 100644 --- a/pkgs/by-name/ht/httpdirfs/package.nix +++ b/pkgs/by-name/ht/httpdirfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httpdirfs"; - version = "1.2.7"; + version = "1.2.10"; src = fetchFromGitHub { owner = "fangfufu"; repo = "httpdirfs"; tag = finalAttrs.version; - hash = "sha256-6TGptKWX0hSNL3Z3ioP7puzozWLiMhCybN7hATQdD/k="; + hash = "sha256-dfMavLEBXry1cW4o2yQjuvBbYIvct1GXzACj+9Hh4wE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index bd7085713e53..6366b58731fc 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, testers, hwatch, installShellFiles, @@ -9,24 +10,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hwatch"; - version = "0.3.19"; + version = "0.4.2"; src = fetchFromGitHub { owner = "blacknon"; repo = "hwatch"; tag = finalAttrs.version; - sha256 = "sha256-lMsBzMDMgpHxcQFtfZ4K7r2WRUaVR8Ry/kPvwfzPObI="; + hash = "sha256-ic83D46CGDWRqcNJt/KcMEsnKj6rO/LsTNm247YK/Qs="; }; - cargoHash = "sha256-UnaZZEmX5XoTVFLEFj5JkJXJkjoUBwzJokfffJTPP4M="; + cargoHash = "sha256-xJZpZPhjU81cb00O/FE0QGOsRKY9BG4oGMk2jNy2skw="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installShellCompletion --cmd hwatch \ - --bash $src/completion/bash/hwatch-completion.bash \ - --fish $src/completion/fish/hwatch.fish \ - --zsh $src/completion/zsh/_hwatch + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd hwatch --"$shell" <("$out/bin/hwatch" --completion "$shell") + done ''; passthru.tests.version = testers.testVersion { @@ -34,14 +34,15 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - homepage = "https://github.com/blacknon/hwatch"; description = "Modern alternative to the watch command"; longDescription = '' A modern alternative to the watch command, records the differences in execution results and can check this differences at after. ''; + homepage = "https://github.com/blacknon/hwatch"; + changelog = "https://github.com/blacknon/hwatch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "hwatch"; }; }) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 3caf9986dad1..c98e8ffb220e 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.55.1-b", - "commit_hash": "a47147bc095e5b3be3eb8bd04f0ac242b968cd4d", - "commit_message": "[gha] Nix: update inputs", - "date": "2026-05-13", - "tag": "v0.55.1" + "branch": "v0.55.2-b", + "commit_hash": "39d7e209c79d451efab1b21151d5938289da838d", + "commit_message": "version: bump to 0.55.2", + "date": "2026-05-16", + "tag": "v0.55.2" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 4923531518e5..c8253c178cf7 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -83,14 +83,14 @@ let in customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.55.1"; + version = "0.55.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-tjoO+3kzYCAJKJCzmh7R4Hzz7zBQKYoCrSSHMeKXxsA="; + hash = "sha256-RuXKYFqd+yr9ppkbRzq07Jt0IgiNa8nCpyfoBElpSDY="; }; postPatch = '' diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index d7e14c60df11..f0c09ef91722 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.9.5"; + version = "4.10.0"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-dTZQ2e7Ie3CMiaDXZlSWnUHgMm375BIyVQ75LaNSDd8="; + hash = "sha256-/U+tHSyDhqqXZGcH1jFRbg82j3g/YR6KlLUoGtSXS8w="; }; - cargoHash = "sha256-8r+f+iNLICssybsL2D/SFrjguZA2wVLGjEgXZhsmIgU="; + cargoHash = "sha256-sQLyyugM5/AMplleophPGp8NoEc543cpl6xFMo1MUIo="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix index 36cb48b7f6b8..c287967061b7 100644 --- a/pkgs/by-name/hy/hysteria/package.nix +++ b/pkgs/by-name/hy/hysteria/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "hysteria"; - version = "2.8.2"; + version = "2.9.1"; src = fetchFromGitHub { owner = "apernet"; repo = "hysteria"; rev = "app/v${finalAttrs.version}"; - hash = "sha256-HgZVwaHL5q8aOxHhVt6RaHaBxoj83ujHaqLemQkLRUM="; + hash = "sha256-pWiEY1H9iX5aX2nR/K8fNKeAbzLOCZhEe5KLk4arot4="; }; - vendorHash = "sha256-oHxnawchsHU/M1PZ0zXR5luopso1FptXi+PL5pNgdj0="; + vendorHash = "sha256-IFC/LMI28cGfUTtgTYf045OAEaMdPgd1bzhdSngQlrA="; proxyVendor = true; ldflags = diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index d676eebee49d..16fcb1d7a14e 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -18,16 +18,16 @@ buildNpmPackage rec { pname = "igir"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-EKi1m2p4/7E/godxEPnaGaqkRX6PlSbqQYQXw+Eg5hA="; + hash = "sha256-vMas5QGpk3bwn4VkdRtYga8cgf6G+dVr3jJCGeyb5mQ="; }; - npmDepsHash = "sha256-98+DFC7j3lmr9GGnDbrzChzGJG1uU1TTr429JAx7310="; + npmDepsHash = "sha256-QhvGc8HLY61LptHdPZbOTjr5jDvUZ4dML+MV7KrqU/0="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/in/intel-oneapi-toolkit/package.nix b/pkgs/by-name/in/intel-oneapi-toolkit/package.nix new file mode 100644 index 000000000000..17bd42cac69f --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi-toolkit/package.nix @@ -0,0 +1,301 @@ +{ + lib, + stdenv, + callPackage, + fetchurl, + ncurses5, + bc, + bubblewrap, + autoPatchelfHook, + python3, + libgcc, + glibc, + writableTmpDirAsHomeHook, + writeShellApplication, + curl, + htmlq, + common-updater-scripts, + zlib, + rdma-core, + libpsm2, + ucx, + numactl, + level-zero, + libdrm, + elfutils, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, + glib, + nss, + nspr, + dbus, + at-spi2-atk, + cups, + gtk3, + pango, + cairo, + libgbm, + expat, + libxkbcommon, + eudev, + alsa-lib, + bzip2, + gdbm, + libxcrypt-legacy, + libuuid, + sqlite, + libffi, + bash, + # The list of components to install; + # Either [ "all" ], [ "default" ], or a custom list of components. + # If you want to install all default components plus an extra one, pass [ "default" ] + # Note that changing this will also change the `buildInputs` of the derivation. + components ? [ "all" ], +}: +let + shortName = name: builtins.elemAt (lib.splitString "." name) 3; + + mkUpdateScript = + { + pname, + downloadPage, + file, + }: + lib.getExe (writeShellApplication { + name = "update-intel-oneapi"; + runtimeInputs = [ + curl + htmlq + common-updater-scripts + ]; + text = '' + download_page=${lib.escapeShellArg downloadPage} + pname=${lib.escapeShellArg pname} + nixpkgs="$(git rev-parse --show-toplevel)" + file="$nixpkgs/pkgs/by-name/in/intel-oneapi-toolkit/${lib.escapeShellArg file}" + + echo 'Figuring out the download URL' >&2 + + # Intel helpfully gives us a wget command to run so that we can download the toolkit installer, as part of their product page. + # This variable will contain that command (wget https://...), we will extract the URL from it. + wget_command="$(curl "$download_page" \ + | htmlq 'code' --text \ + | grep "wget.*$pname.*sh")" + + # _offline is optional: Intel sometimes only links the online installer, which shares the same UUID and version. + regex="wget (https://registrationcenter-download[.]intel[.]com/akdlm/IRC_NAS/([0-9a-z-]+)/$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)(_offline)?[.]sh)" + if [[ "$wget_command" =~ $regex ]]; then + uuid="''${BASH_REMATCH[2]}" + versionYear="''${BASH_REMATCH[3]}" + versionMajor="''${BASH_REMATCH[4]}" + versionMinor="''${BASH_REMATCH[5]}" + versionRel="''${BASH_REMATCH[6]}" + else + echo "'$wget_command' does not match the expected format $regex" >&2 + exit 1 + fi + + # Always reconstruct to point at the offline installer + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/$uuid/$pname-$versionYear.$versionMajor.$versionMinor.''${versionRel}_offline.sh" + + if grep -qF "url = \"$url\"" "$file"; then + echo "The URL is the same ($url), skipping update" >&2 + exit 0 + fi + + echo "The new download URL is $url, prefetching it to store" >&2 + hash="$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")")" + + sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file" + sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file" + sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file" + sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file" + sed -i "s|url = \".*\";|url = \"$url\";|" "$file" + sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file" + ''; + }); + + # Figured out by looking at autoPatchelfHook failure output + depsByComponent = rec { + dpcpp-cpp-compiler = [ + zlib + level-zero + ]; + dpcpp_dbg = [ + level-zero + zlib + ]; + dpcpp-ct = [ zlib ]; + mpi = [ + zlib + rdma-core + libpsm2 + ucx + libuuid + numactl + level-zero + libffi + ]; + pti = [ level-zero ]; + vtune = [ + libdrm + elfutils + zlib + libx11 + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr + glib + nss + dbus + at-spi2-atk + cups + gtk3 + pango + cairo + libgbm + expat + libxkbcommon + eudev + alsa-lib + at-spi2-atk + ncurses5 + bzip2 + libuuid + gdbm + libxcrypt-legacy + sqlite + nspr + ]; + ifort-compiler = [ ]; + tbb = [ ]; + mkl = mpi ++ pti; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "intel-oneapi-toolkit"; + + versionYear = "2026"; + versionMajor = "0"; + versionMinor = "0"; + versionRel = "198"; + + version = "${finalAttrs.versionYear}.${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionRel}"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/71180075-e4e3-4c6f-bbbb-19017ed0cf7d/intel-oneapi-toolkit-2026.0.0.198_offline.sh"; + hash = "sha256-FVpSiWvSQjndxzP0h+zLKvXK2ZV+7R4r/mDOFFNpTls="; + }; + + nativeBuildInputs = [ + ncurses5 + bc + bubblewrap + autoPatchelfHook + writableTmpDirAsHomeHook + ]; + + buildInputs = [ + python3 + # Required for patchShebangs to discover the correct interpreter + bash + ] + ++ lib.concatMap ( + comp: + if comp == "all" || comp == "default" then + lib.concatLists (builtins.attrValues depsByComponent) + else + depsByComponent.${shortName comp} or [ ] + ) components; + + dontUnpack = true; + + # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html + installPhase = '' + runHook preInstall + mkdir -p "$out" + + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libgcc.lib ]}" + + # The installer is an insane four-stage rube goldberg machine: + # 1. Our $src (bash script) unpacks install.sh (bash script) + # 2. install.sh unpacks bootstrapper (dylinked binary with hardcoded interpreter in /lib) + # 3. bootstrapper unpacks installer (dylinked binary with hardcoded interpreter and libraries in /lib) + # 4. installer installs the actual components we need + # + # While stage 1 allows to "only extract", other stages always try running the next executable down, and remove stuff if they fail. + # I'm afraid this is the cleanest solution for now. + mkdir -p fhs-root/{lib,lib64} + ln -s "${glibc}/lib/"* fhs-root/lib/ + ln -s "${glibc}/lib/"* fhs-root/lib64/ + bwrap \ + --bind fhs-root / \ + --bind /nix /nix \ + --ro-bind /bin /bin \ + --dev /dev \ + --proc /proc \ + bash "$src" \ + -a \ + --silent \ + --eula accept \ + --install-dir "$out" \ + --components ${lib.concatStringsSep ":" components} + + rm -rf "$out"/logs + rm -rf "$out"/.toolkit_linking_tool + + ln -s "$out/$versionYear.$versionMajor"/{lib,etc,bin,share,opt,include} "$out" + + runHook postInstall + ''; + + autoPatchelfIgnoreMissingDeps = [ + # Needs to be dynamically loaded as it depends on the hardware + "libcuda.so.1" + # All too old, not in nixpkgs anymore + "libffi.so.6" + "libgdbm.so.4" + "libreadline.so.6" + # Bundled only as unversioned .so in GTPin; the .so.14 soname isn't present + "libopencl-clang.so.14" + # 2026 ships libsycl.so.9; some vtune binaries still reference the old .so.8 + "libsycl.so.8" + # GTPin internal, not present in the package + "liboutputgenerator.so" + ]; + + passthru.updateScript = mkUpdateScript { + inherit (finalAttrs) pname; + file = "package.nix"; + downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/oneapi-toolkit-download.html"; + }; + + passthru.stdenv = callPackage ./stdenv.nix { kit = finalAttrs.finalPackage; }; + + passthru.tests = callPackage ./tests.nix { kit = finalAttrs.finalPackage; }; + + meta = { + description = "Intel oneAPI Toolkit"; + homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/oneapi-toolkit.html"; + license = with lib.licenses; [ + intel-eula + issl + asl20 + ]; + maintainers = with lib.maintainers; [ + balsoft + ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/in/intel-oneapi-toolkit/stdenv.nix b/pkgs/by-name/in/intel-oneapi-toolkit/stdenv.nix new file mode 100644 index 000000000000..f813889df3e8 --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi-toolkit/stdenv.nix @@ -0,0 +1,58 @@ +{ + kit, + stdenvNoCC, + stdenv, + overrideCC, + wrapCCWith, +}: +let + unwrappedCC = stdenvNoCC.mkDerivation { + name = "intel-oneapi-cc-unwrapped"; + dontUnpack = true; + + # Note: use a wrapper script, not symlinks. The compiler inspects argv[0] + # to decide how to behave, so it must see itself invoked as + # icx/icpx. Through a symlink it would see clang/clang++ and + # select the wrong behavior. + installPhase = '' + mkdir -p $out/bin + + cat > $out/bin/clang++ << 'EOF' + #!/bin/sh + exec ${kit}/compiler/latest/bin/icpx "$@" + EOF + chmod +x $out/bin/clang++ + + cat > $out/bin/clang << 'EOF' + #!/bin/sh + exec ${kit}/compiler/latest/bin/icx "$@" + EOF + chmod +x $out/bin/clang + ''; + + passthru.isClang = true; + + # icpx rejects these flags for the SPIR-V device target (spir64-unknown-unknown). + hardeningUnsupportedFlags = [ + "zerocallusedregs" + "pacret" + "shadowstack" + ]; + }; + + wrappedCC = wrapCCWith { + cc = unwrappedCC; + extraPackages = [ kit ]; + extraBuildCommands = '' + # Consumers expect the icpx/icx names and might reject clang++/clang. + ln -s $out/bin/clang++ $out/bin/icpx + ln -s $out/bin/clang $out/bin/icx + + echo "export CXX=\"$out/bin/icpx\"" >> $out/nix-support/setup-hook + echo "export CC=\"$out/bin/icx\"" >> $out/nix-support/setup-hook + + echo "export ONEAPI_ROOT=\"${kit}\"" >> $out/nix-support/setup-hook + ''; + }; +in +overrideCC stdenv wrappedCC diff --git a/pkgs/by-name/in/intel-oneapi-toolkit/tests.nix b/pkgs/by-name/in/intel-oneapi-toolkit/tests.nix new file mode 100644 index 000000000000..4fe3de40afbb --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi-toolkit/tests.nix @@ -0,0 +1,131 @@ +{ + kit, + stdenv, + runCommand, + pkg-config, + writeText, +}: +{ + mkl-libs = stdenv.mkDerivation { + name = "intel-oneapi-test-mkl-libs"; + src = writeText "test.c" '' + #include + #include + int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + float dp = cblas_sdot(3, u, 1, v, 1); + assert(dp == 32.); + } + ''; + dontUnpack = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ kit ]; + buildPhase = '' + # This will fail if no libs with mkl- in their name are found + libs="$(pkg-config --list-all | cut -d\ -f1 | grep mkl-)" + [ -n "$libs" ] || { echo "No MKL libs found via pkg-config" >&2; exit 1; } + for lib in $libs; do + echo "Testing that the build succeeds with $lib" >&2 + gcc $src -o test-with-$lib $(pkg-config --cflags --libs $lib) + done + ''; + doCheck = true; + checkPhase = '' + for lib in $libs; do + echo "Testing that the executable built with $lib runs" >&2 + ./test-with-$lib + done + ''; + installPhase = ''touch "$out"''; + }; + + all-binaries-run = runCommand "intel-oneapi-test-all-binaries-run" { } '' + # .*-32: 32-bit executables can't be properly patched by patchelf + # IMB-.*: all fail with a weird "bad file descriptor" error + # fi_info, fi_pingpong: exits with 1 even if ran with `--help` + # gdb-oneapi: Python not initialized + # hydra_bstrap_proxy, hydra_nameserver, hydra_pmi_proxy: doesn't respect --help + # mpirun: can't find mpiexec.hydra for some reason + # sycl-ls, sycl-trace: doesn't respect --help + regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" + export I_MPI_ROOT="${kit}/mpi/latest" + export PATH="${kit}/bin:$PATH" + for bin in "${kit}"/bin/*; do + if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then + echo "skipping $bin" + continue + fi + echo "trying to run $bin --help or -help" + "$bin" --help || "$bin" -help + done + touch "$out" + ''; + + sycl-compile = kit.stdenv.mkDerivation { + name = "intel-oneapi-test-sycl-compile"; + src = writeText "test.cpp" '' + #include + #include + int main() { + // We likely won't have a SYCL device available, + // due to the nix sandbox, but this test only + // verifies that SYCL compiles, so we don't need a device + try { + sycl::queue q; + std::cout << q.get_device().get_info() << std::endl; + } catch (const sycl::exception& e) { + std::cerr << "No SYCL device found: " << e.what() << std::endl; + } + return 0; + } + ''; + dontUnpack = true; + buildPhase = "icpx -fsycl $src -o test"; + doCheck = true; + checkPhase = "./test"; + installPhase = ''touch "$out"''; + }; + + headers-available = kit.stdenv.mkDerivation { + name = "intel-oneapi-test-headers-available"; + dontUnpack = true; + buildPhase = '' + echo '#include ' | icpx -fsycl -x c++ -E - > /dev/null + echo '#include ' | icpx -fsycl -x c++ -E - > /dev/null + echo '#include ' | icpx -x c++ -E - > /dev/null + ''; + installPhase = ''touch "$out"''; + }; + + c-compile = kit.stdenv.mkDerivation { + name = "intel-oneapi-test-c-compile"; + src = writeText "test.c" '' + #include + int main() { printf("Hello from Intel C compiler!\n"); return 0; } + ''; + dontUnpack = true; + buildPhase = "icx $src -o test"; + doCheck = true; + checkPhase = "./test"; + installPhase = ''touch "$out"''; + }; + + openmp-compile = kit.stdenv.mkDerivation { + name = "intel-oneapi-test-openmp-compile"; + src = writeText "test.c" '' + #include + #include + int main() { + #pragma omp parallel + { printf("Hello from thread %d\n", omp_get_thread_num()); } + return 0; + } + ''; + dontUnpack = true; + buildPhase = "icx -fiopenmp $src -o test"; + doCheck = true; + checkPhase = "./test"; + installPhase = ''touch "$out"''; + }; +} diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix index fac827819b3d..0c482f107696 100644 --- a/pkgs/by-name/iw/iwe/package.nix +++ b/pkgs/by-name/iw/iwe/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iwe"; - version = "0.0.70"; + version = "0.1.3"; src = fetchFromGitHub { owner = "iwe-org"; repo = "iwe"; tag = "iwe-v${finalAttrs.version}"; - hash = "sha256-ehRth5vBUjswn9oM97WuMYvHs0LohXBwrdN23VRELa0="; + hash = "sha256-2mFCujePThwqOnXNF9x1Hyv9KRme44gtTcy8frziNXo="; }; - cargoHash = "sha256-rQre02fRRcf0FCmRpWh1UHsvCpp/iLqCA4QHvSZYBwA="; + cargoHash = "sha256-8l7cTW8riEa1nFjftc5lnEQcY9gz4dYli9FQBZ5SFT8="; cargoBuildFlags = [ "--package=iwe" diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index e95370728979..b6b311d61878 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.1831"; + version = "0.24.1879"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-ipOlkUz1DK0U01OUI2Kd3gQTF2/MULkk5CVu4EfELmI="; + hash = "sha256-gtDN77TB1AKLfqtvFPoQ3tatXB63Ajax2j1gokgHX4s="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/by-name/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix index d809c1b7cfbd..21fee0b1b48e 100644 --- a/pkgs/by-name/jf/jf/package.nix +++ b/pkgs/by-name/jf/jf/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jf"; - version = "0.6.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sayanarijit"; repo = "jf"; rev = "v${finalAttrs.version}"; - hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M="; + hash = "sha256-GKAOM+YQicpPlCiecl4EgVDdvlHXP8j5txCodZVUKRg="; }; - cargoHash = "sha256-NU5D7VMQtlOFzr+LqODvDzVw56wFClcBxKo1h8zfgfY="; + cargoHash = "sha256-6fs3fhm0l24EZNZm3xXw8Uxb1Ot3pw+myfSJzWG3alU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index f7e4da042458..f757a64df839 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jj-pre-push"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${finalAttrs.version}"; - hash = "sha256-TekLYlx2b+gcf0UzLOqWv2VtwS6etE/uPBQwc99z1Lw="; + hash = "sha256-AIsLUI42ewYqmgOP9livXE0tGAVWTfSh9K7h+PMObJg="; }; postPatch = '' diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index c00abb320409..70835942d8ed 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,16 +8,16 @@ }: buildGo125Module (finalAttrs: { pname = "jjui"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-3cr6aSJoIAv9Ine2ePHCC6xBaS1G4i23yQh8I5mq47g="; + hash = "sha256-kz1GDk+M98yWVu69nTRVxjC/Kk9qbGFfXXJ5ZwDLEiU="; }; - vendorHash = "sha256-iUWeQIYwOkXhRFsQc5zBjFFG5m412ysR5LsZsHET1ak="; + vendorHash = "sha256-I39Tcb28voPSuZhYkEPdvhsViZD7QZZtZjDtRKkZ5LE="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/jp/jpsxdec/package.nix b/pkgs/by-name/jp/jpsxdec/package.nix index be0543651ae7..549d8ddef873 100644 --- a/pkgs/by-name/jp/jpsxdec/package.nix +++ b/pkgs/by-name/jp/jpsxdec/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jpsxdec"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "m35"; repo = "jpsxdec"; rev = "v${finalAttrs.version}"; - hash = "sha256-PZOc5mpnUiUyydWyfZjWuPG4w+tRd6WLJ6YQMqu/95I="; + hash = "sha256-X55/FKfPLSwl7veB0LOmXeFEh5zJ10zKdTbCUnnyB5g="; }; sourceRoot = "${finalAttrs.src.name}/jpsxdec"; diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index b13be50d918e..969ec2c1fc7f 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.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-D47BSI0BcVyO8y42+aqkp1/59548kENtqdQyXg519os="; + hash = "sha256-QmXoap/irR0SoN6abkXVgKThl3jMMmWSwKaAER2bgZI="; }; - vendorHash = "sha256-zUKfn7dli/vfHha3AaFrSbux1oDOZyV2dWE/BorYN8I="; + vendorHash = "sha256-KPhOpeFtwYF9kJjl09351DSoDhxpWIxZxyXrAyJwlNo="; ldflags = [ "-s" diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix index 53fd3cffc4ae..c7c20bcfc936 100644 --- a/pkgs/by-name/ka/katana/package.nix +++ b/pkgs/by-name/ka/katana/package.nix @@ -6,21 +6,20 @@ buildGoModule (finalAttrs: { pname = "katana"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "katana"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Q7ZcbiOo7/HHF/1NYfoOxAQk6zUJsrz6n2HJzw9/Ic="; + hash = "sha256-XzJav0YGWBHNSrWiVVFOcHcAIIUjBCIUrbnfUzP9Vco="; }; - vendorHash = "sha256-rq19948HzGgtc6bRx9PYaPoeUk+3evE0UGpgM08i/ZM="; + vendorHash = "sha256-xvMmBQ7am5uRbVQlAr42TqRLyfxMDF/Gygiud5LnewY="; subPackages = [ "cmd/katana" ]; ldflags = [ - "-w" "-s" ]; @@ -29,7 +28,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/projectdiscovery/katana"; changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "katana"; }; }) diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix index 486598023765..dfff244ffb0b 100644 --- a/pkgs/by-name/kd/kdash/package.nix +++ b/pkgs/by-name/kd/kdash/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kdash"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "kdash-rs"; repo = "kdash"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-yIBBWtdIvx9lMU9hoh0bsqYqXkSSBtfOMmUxM5UR+IQ="; + sha256 = "sha256-xc2vNPQWg6P+FWxKekvOTW3QHxgmkD6t/jgYGdoaMeI="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Fix for build failure with gcc15 env.NIX_CFLAGS_COMPILE = "-std=gnu17"; - cargoHash = "sha256-eRXW3EBkNMClxLUKufhrz9WJVBY5UTA/JnabGJvAvF4="; + cargoHash = "sha256-aEVV5E0GvskhSRwwPD8at4xwkn2Q6k5SO1fyFrsDbFM="; meta = { description = "Simple and fast dashboard for Kubernetes"; diff --git a/pkgs/by-name/ke/keifu/package.nix b/pkgs/by-name/ke/keifu/package.nix new file mode 100644 index 000000000000..7ce00967fc52 --- /dev/null +++ b/pkgs/by-name/ke/keifu/package.nix @@ -0,0 +1,64 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + openssl, + zlib, + makeWrapper, + gitMinimal, + stdenv, + libiconv, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "keifu"; + version = "0.3.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "trasta298"; + repo = "keifu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Srw71Rswafu70kKI36dY1PtB4BQhpTYYzqbrWJuvaUM="; + }; + + cargoHash = "sha256-Ga405TV1uDSZbADrV+3aAeLDRfdPFHzdxxTEDu+f+b4="; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + libgit2 + openssl + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + postInstall = '' + wrapProgram $out/bin/keifu \ + --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A TUI tool to visualize Git commit graphs with branch genealogy"; + homepage = "https://github.com/trasta298/keifu"; + changelog = "https://github.com/trasta298/keifu/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + usu171 + ]; + mainProgram = "keifu"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix index 55976ff0e8c9..c43b90c1face 100644 --- a/pkgs/by-name/ki/kicad/base.nix +++ b/pkgs/by-name/ki/kicad/base.nix @@ -62,6 +62,7 @@ debug, sanitizeAddress, sanitizeThreads, + templateDir ? null, }: assert lib.assertMsg ( @@ -207,6 +208,14 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = debug; + # KiCad looks for the stock library tables at + # KICAD_LIBRARY_DATA/template/{sym,fp}-lib-table, where KICAD_LIBRARY_DATA is + # compiled in as $out/share/kicad. Those files live in separate library packages. + postInstall = optionalString (templateDir != null) '' + rm -rf $out/share/kicad/template + ln -s ${templateDir} $out/share/kicad/template + ''; + meta = { description = "Just the built source without the libraries"; longDescription = '' diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 17375461d17d..9fc7856da47f 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -186,6 +186,7 @@ stdenv.mkDerivation rec { inherit wxGTK python wxPython; inherit withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; + templateDir = template_dir; }; inherit pname; diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index a720b38fbcda..fa0b8d5287d7 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -14,23 +14,23 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "2.2.2"; + version = "2.3.0"; src = let darwinDmg = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-z+eTOA5PTKYEcjdzHL4/LeFqUO61eXhdl0Yn3dzwtw0="; + hash = "sha256-lHBlzPFeT9m54dbFBXm7l/bJIVcBJqodZ6xKD9XThJc="; }; in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-QU8akDY0VrNMrcwuQJHZIUiJrCnjYzshmsaqviY0+PY="; + hash = "sha256-zLizK/0m9PdIzN4IMicq7/95lWahj7sdLzEEYpv/o+E="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-hFJN6FFE3uY1Wdjibb+PoXIKF6W70osg/euxSuLqCZA="; + hash = "sha256-B4NElbGE0M7P6eGrd90UYvoeqN1fEoe+2g1/M1wM3ZY="; }; x86_64-darwin = darwinDmg; aarch64-darwin = darwinDmg; diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json index 2d77d383209b..f49f603e3f4c 100644 --- a/pkgs/by-name/kn/knossosnet/deps.json +++ b/pkgs/by-name/kn/knossosnet/deps.json @@ -201,8 +201,8 @@ }, { "pname": "SharpCompress", - "version": "0.39.0", - "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" + "version": "0.48.0", + "hash": "sha256-2MXainbTJeuBwRA6eJU+AlUT8ireNrWxHYNCMkFG8Lc=" }, { "pname": "SkiaSharp", @@ -229,11 +229,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "System.Buffers", - "version": "4.6.0", - "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" - }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -241,17 +236,12 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.21.2", - "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + "version": "0.21.3", + "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI=" }, { "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 cf2b56838ef4..96e16c05e9af 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; tag = "v${version}"; - hash = "sha256-5EQ34o1hgQvLfuVMS5l+YFD8wvnQuKioZUQhoImBo28="; + hash = "sha256-zUV+sQdQ71ORKOZzd4yxgRK1HjtZc9wgkmnzz6bG8FA="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index c788d2d0c922..68f8fe86a3dc 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -10,12 +10,12 @@ kopia, }: let - version = "0.22.3"; + version = "0.23.0"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-5oNam99Mij78snSO6jiGPYzeD68sXEBKM2dGQtTUrww="; + hash = "sha256-9xvgm+A8h2pAX3oHtiFSa2xNab5BDkEBEtXQZz3Fd5A="; }; in buildNpmPackage { @@ -24,7 +24,7 @@ buildNpmPackage { sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-DRsPiIiikp0pCAo0np0E3TYT1L6HGKXAXwKuB1jX6lw="; + npmDepsHash = "sha256-Ctp41vNZPVbycwIzWiTh+1ej3NpCf1WJCqnJsyoyxlc="; makeCacheWritable = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index 941f0d767ba4..0d0cec62fd1a 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -22,7 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: { sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84="; }; - cargoHash = "sha256-DpZsi2eIhuetHnLLYGAvv871mbPfAIUevqBLaV8ljGA="; + cargoHash = "sha256-ciam95rUUh9iKmhTadqWCy1rU4otuRiQkWg0lGRHzng="; + + cargoPatches = [ + # bump coreaudio-sys past 0.2.11; bindgen 0.61 panics on apple-sdk-14 anonymous enums + ./update-coreaudio-sys.patch + ]; patches = [ # Fixes build issues due to refactored Rust compiler feature annotations. @@ -35,6 +40,11 @@ rustPlatform.buildRustPackage (finalAttrs: { }) ]; + # concat_idents feature gate was removed in rust 1.90; never invoked here. + postPatch = '' + substituteInPlace src/lib.rs --replace-fail '#![feature(concat_idents)]' "" + ''; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ko/kord/update-coreaudio-sys.patch b/pkgs/by-name/ko/kord/update-coreaudio-sys.patch new file mode 100644 index 000000000000..f047422c7a34 --- /dev/null +++ b/pkgs/by-name/ko/kord/update-coreaudio-sys.patch @@ -0,0 +1,455 @@ +--- 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 = "adler" +@@ -47,7 +47,7 @@ + checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" + dependencies = [ + "alsa-sys", +- "bitflags", ++ "bitflags 1.3.2", + "libc", + "nix", + ] +@@ -106,7 +106,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -148,22 +148,20 @@ + + [[package]] + name = "bindgen" +-version = "0.61.0" ++version = "0.70.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" ++checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" + dependencies = [ +- "bitflags", ++ "bitflags 2.11.1", + "cexpr", + "clang-sys", +- "lazy_static", +- "lazycell", +- "peeking_take_while", ++ "itertools", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +- "syn", ++ "syn 2.0.12", + ] + + [[package]] +@@ -173,6 +171,12 @@ + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] ++name = "bitflags" ++version = "2.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" ++ ++[[package]] + name = "block-buffer" + version = "0.10.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -265,7 +269,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -325,7 +329,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -464,7 +468,7 @@ + dependencies = [ + "ansi_term", + "atty", +- "bitflags", ++ "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", +@@ -477,7 +481,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "clap_derive", + "clap_lex", + "is-terminal", +@@ -496,7 +500,7 @@ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -639,7 +643,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", +@@ -652,7 +656,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "core-foundation", + "foreign-types", + "libc", +@@ -676,16 +680,16 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "core-foundation-sys 0.6.2", + "coreaudio-sys", + ] + + [[package]] + name = "coreaudio-sys" +-version = "0.2.11" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" ++checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b" + dependencies = [ + "bindgen", + ] +@@ -800,7 +804,7 @@ + checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -827,7 +831,7 @@ + "proc-macro2", + "quote", + "scratch", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -844,7 +848,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -868,7 +872,7 @@ + "proc-macro2", + "quote", + "strsim 0.9.3", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -879,7 +883,7 @@ + dependencies = [ + "darling_core", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -896,7 +900,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -907,7 +911,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1075,7 +1079,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "byteorder", + "core-foundation", + "core-graphics", +@@ -1195,7 +1199,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1463,6 +1467,15 @@ + ] + + [[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.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1570,12 +1583,6 @@ + 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.140" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1757,7 +1764,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", +@@ -1786,7 +1793,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + ] +@@ -1824,7 +1831,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1886,7 +1893,7 @@ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1901,7 +1908,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "288bd66a5a56d8c97b178412b328419b3fdec261c0cbc4628ddc49cc16db8fc6" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "libloading", + "nvml-wrapper-sys", + "static_assertions", +@@ -2059,12 +2066,6 @@ + ] + + [[package]] +-name = "peeking_take_while" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +- +-[[package]] + name = "percent-encoding" + version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2100,7 +2101,7 @@ + "pest_meta", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2184,7 +2185,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "crc32fast", + "flate2", + "miniz_oxide", +@@ -2242,7 +2243,7 @@ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "version_check", + ] + +@@ -2361,7 +2362,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + ] + + [[package]] +@@ -2462,7 +2463,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", +@@ -2564,7 +2565,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2699,7 +2700,7 @@ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2748,7 +2749,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "lazy_static", + "log", + "symphonia-core", +@@ -2814,7 +2815,7 @@ + checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" + dependencies = [ + "arrayvec", +- "bitflags", ++ "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +@@ -2903,6 +2904,17 @@ + ] + + [[package]] ++name = "syn" ++version = "2.0.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] + name = "tch" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2975,7 +2987,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -3253,7 +3265,7 @@ + "once_cell", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-shared", + ] + +@@ -3287,7 +3299,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +@@ -3493,7 +3505,7 @@ + "darling", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix index 25c30c9c49e1..69492c5d538c 100644 --- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -14,13 +14,13 @@ }: buildPythonPackage (finalAttrs: { pname = "kubernetes-validate"; - version = "1.35.0"; + version = "1.36.0"; pyproject = true; src = fetchPypi { pname = "kubernetes_validate"; inherit (finalAttrs) version; - hash = "sha256-UKnkbaLARxwoK7MTjH14XSkjH28be8LmimEatBsigyY="; + hash = "sha256-7b/S256ItXECmqFqsRFsZQKtK5YotnON051jkyP4RxU="; }; build-system = [ diff --git a/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch b/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch deleted file mode 100644 index 37089cc80a60..000000000000 --- a/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkg/runner/internal/test_deps.go b/pkg/runner/internal/test_deps.go -index f7728f3..90dbca5 100644 ---- a/pkg/runner/internal/test_deps.go -+++ b/pkg/runner/internal/test_deps.go -@@ -41,6 +41,10 @@ func (*TestDeps) ImportPath() string { - return "" - } - -+func (*TestDeps) ModulePath() string { -+ return "" -+} -+ - func (*TestDeps) StartTestLog(w io.Writer) {} - - func (*TestDeps) StopTestLog() error { diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index e72190d0e071..0141dc8d9b62 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -10,18 +10,16 @@ buildGoModule (finalAttrs: { pname = "kyverno-chainsaw"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-wHwjcpcum3ByBGYUxJ38Qi0RliQUmAIBYmE7t3gEonI="; + hash = "sha256-BULaac8UBF6pX7EWDKY3MFJjEEk1e5fJzTAahp/IRjs="; }; - patches = [ ./go-1.26-testdeps-modulepath.patch ]; - - vendorHash = "sha256-lG+odKD1TGQ7GTh/y9ogREtY59T8fvN/6FyKsdgsU0M="; + vendorHash = "sha256-DTFtbinBKWmtkbCr9+j3md00tCR9Dh2i+15NvxHjuEw="; subPackages = [ "." ]; @@ -61,6 +59,8 @@ buildGoModule (finalAttrs: { * Asserting operators react (or not) the way they should ''; mainProgram = "chainsaw"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + LorenzBischof + ]; }; }) diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix index 18d1351e6063..e0c450fbe9f6 100644 --- a/pkgs/by-name/la/laszip/package.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, fixDarwinDylibNames, }: @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xZ8IFnqrGt47lN+C6/ibgbIWqpObDf4RHPaGMXw0WZ4="; }; + patches = [ + # Fix aarch64-darwin build. + (fetchpatch { + url = "https://github.com/LASzip/LASzip/commit/2274e52076c5f4cbe2d826d690c21713ddd842b4.patch"; + hash = "sha256-C6AOJSY8JJCNNA5Fuz3OiQpzSFO/PwI6Wj+WBUW948k="; + }) + ]; + hardeningDisable = [ "format" ]; # -Werror=format-security nativeBuildInputs = [ diff --git a/pkgs/by-name/ld/ldap-manager/package.nix b/pkgs/by-name/ld/ldap-manager/package.nix index f79f1b6a6afd..8884ce731d8a 100644 --- a/pkgs/by-name/ld/ldap-manager/package.nix +++ b/pkgs/by-name/ld/ldap-manager/package.nix @@ -2,90 +2,34 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, - stdenvNoCC, - nodejs, - pnpm_10, templ, - pnpmConfigHook, - fetchPnpmDeps, versionCheckHook, nix-update-script, }: -let - version = "1.1.4"; +buildGoModule (finalAttrs: { + pname = "ldap-manager"; + version = "1.4.1"; src = fetchFromGitHub { owner = "netresearch"; repo = "ldap-manager"; - tag = "v${version}"; - hash = "sha256-G4UUgjTbRmVmbLvSv95kwhqnTUCygW8plkdYFGcHBqE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wq/VZ+F/m13YQjJfCoN+UgaeAazWup2JINJ3I9KM3d0="; }; - frontend = stdenvNoCC.mkDerivation { - pname = "ldap-manager-frontend"; - inherit version src; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm_10 - ]; - - pnpmDeps = fetchPnpmDeps { - pname = "ldap-manager"; - inherit version src; - pnpm = pnpm_10; - fetcherVersion = 3; - hash = "sha256-XFdKb43NxslB60GEDIBbKFYRClq0SeUqPwA81SAZaug="; - }; - - buildPhase = '' - runHook preBuild - - pnpm css:build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r internal/web/static $out/static - - runHook postInstall - ''; - }; -in - -buildGoModule (finalAttrs: { - pname = "ldap-manager"; - inherit version src; - - vendorHash = "sha256-ekgnjhO9GAml/A8pf9Hj6lseYJkvvf87f7tiwWixyKU="; + vendorHash = "sha256-sE8XGlQg6FLDfgYdioa5i5Gv8LyQo16p0oIaiyMOzZ4="; nativeBuildInputs = [ templ ]; - patches = [ - # Add --version support - # https://github.com/netresearch/ldap-manager/pull/462 - (fetchpatch { - url = "https://github.com/netresearch/ldap-manager/pull/462.patch"; - hash = "sha256-OykLep7uGZ79/lqOC4KNnSThCqQsmDo6vDqaoWVX3XI="; - }) - ]; - excludedPackages = [ "internal/e2e" "internal/integration" ]; preBuild = '' - cp -r ${frontend}/static/* internal/web/static/ templ generate ''; diff --git a/pkgs/by-name/le/lektor/package.nix b/pkgs/by-name/le/lektor/package.nix index 0934cb382088..bf2d4b7c17ea 100644 --- a/pkgs/by-name/le/lektor/package.nix +++ b/pkgs/by-name/le/lektor/package.nix @@ -1,9 +1,9 @@ { lib, + stdenv, fetchFromGitHub, fetchNpmDeps, fetchPypi, - fetchpatch, nodejs, npmHooks, python3, @@ -26,7 +26,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "lektor"; - version = "3.4.0b12"; + version = "3.4.0b14"; pyproject = true; src = fetchFromGitHub { @@ -37,22 +37,12 @@ python.pkgs.buildPythonApplication rec { postFetch = '' rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt ''; - hash = "sha256-y0/fYuiIB/O5tsYKjzOPnCafOIZCn4Z5OITPMcnHd/M="; + hash = "sha256-Wr3MhUGihqlPyUlWM8KT+sb/FtHH/NfRNDT9QCKJj5k="; }; - patches = [ - # Fixes test_thumbnail.py with Pillow 11.0 - # see lektor/lektor #1202 - (fetchpatch { - name = "lektor-pillow-11.patch"; - url = "https://github.com/lektor/lektor/commit/af99ea4265e05227d7452977949475196a58edfa.patch"; - hash = "sha256-PmSmX9Ku5rAzN2FzLwvXYeUqN683opLRt9J35w56cfg="; - }) - ]; - npmDeps = fetchNpmDeps { src = "${src}/${npmRoot}"; - hash = "sha256-LXe5/u4nAGig8RSu6r8Qsr3p3Od8eoMxukW8Z4HkJ44="; + hash = "sha256-zcvfVVLhHPas4ulyQ9HDG3f5Bofco1A6pDx9TmREOIk="; }; npmRoot = "frontend"; @@ -100,6 +90,17 @@ python.pkgs.buildPythonApplication rec { # Tests require network access "test_path_installed_plugin_is_none" "test_VirtualEnv_run_pip_install" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This is a bit weird, but for some reason fs watch tests fail with sandbox + "test_sees_created_file" + "test_sees_deleted_file" + "test_sees_modified_file" + "test_sees_file_moved_in" + "test_sees_file_moved_out" + "test_sees_deleted_directory" + "test_sees_file_in_directory_moved_in" + "test_sees_directory_moved_out" ]; postCheck = '' diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index d3182147cddc..ab4921dcd5ca 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.2.0"; + version = "12.3.0"; # 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-24oRmHjP7q1jwKeCNsV3xAU5xXWUlpUOoO0yps9WeGU="; + hash = "sha256-3lMqcsCC0jP/UMkXscsQPQjlL6rkuJ6WRJFpXZ+sJDw="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix new file mode 100644 index 000000000000..a0c8816a50bd --- /dev/null +++ b/pkgs/by-name/li/linear/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "linear"; + version = "1.30.2"; + + src = fetchurl { + url = "https://releases.linear.app/Linear-${finalAttrs.version}-universal.dmg"; + hash = "sha256-udtN7sOnbT1B684q/JhPFGq8mYvhc5CbTxuJi6NYFac="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ _7zz ]; + + sourceRoot = "Linear"; + + # -snld prevents "ERROR: Dangerous symbolic link path was ignored". + # -xr'!*:com.apple.*' prevents macOS extended attributes from being + # extracted as regular files, which corrupts the .app bundle. + unpackCmd = "7zz x -snld -xr'!*:com.apple.*' $curSrc"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R Linear.app "$out/Applications" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "App to manage software development and track bugs"; + homepage = "https://linear.app/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ iniw ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/li/linear/update.sh b/pkgs/by-name/li/linear/update.sh new file mode 100755 index 000000000000..c6ee30c2ac3a --- /dev/null +++ b/pkgs/by-name/li/linear/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl gnugrep common-updater-scripts +#shellcheck shell=bash + +set -eu -o pipefail + +source_url="https://releases.linear.app/mac" + +version="$(curl -L -I "$source_url" | grep -ioE 'filename="Linear-[0-9]+(\.[0-9]+)*-universal\.dmg"' | grep -oE '[0-9]+(\.[0-9]+)*')" + +if [[ -z $version ]]; then + echo "Could not find the latest Linear version in release headers" >&2 + exit 1 +fi + +hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "https://releases.linear.app/Linear-${version}-universal.dmg")") + +update-source-version linear "$version" "$hash" --ignore-same-version diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 723135eb39e9..0ef2d8a853b1 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 = "17.0.2"; + version = "17.0.4"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-6WlTa1QFQU3lzAv3y9GgJi4FtfFvpnSvDgzyy38TbeQ="; + hash = "sha256-E0qShnB3zVz7oL+qPzPzLhEJ9PQDlMc4+L4vpD2enI8="; }; - npmDepsHash = "sha256-Ew4nR9G/YqIY5LpEajGyE+wmn+8gHiNPFV4woVkffr8="; + npmDepsHash = "sha256-KYltk2z/1nTnaLroTErIu6eTyofvWp/wC1awEf0Ryg0="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index 21ea63d5ae1d..f26f8e593019 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20260410"; + version = "20260519"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; tag = version; - hash = "sha256-nceQEGm6+Cj6KCeUNwmYsUdArRULfLXysXjzOXdCBQw="; + hash = "sha256-vyrnHNnyNko7m/fZ3fXgLvvasYyJ/pzs5be/Ele+6vY="; }; postUnpack = '' diff --git a/pkgs/by-name/li/listmonk/email-builder.nix b/pkgs/by-name/li/listmonk/email-builder.nix index 50715aff28cf..a8c4718730e6 100644 --- a/pkgs/by-name/li/listmonk/email-builder.nix +++ b/pkgs/by-name/li/listmonk/email-builder.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/email-builder/yarn.lock"; - hash = "sha256-glt7tMfP3x0Mr/hFG1t6TfwVJ+yZ551jeZK2UPIKI8g="; + hash = "sha256-sFRmnMPStNp45hxcF+Iq1WhH6LtVFtgq2regq6MPzcc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/frontend.nix b/pkgs/by-name/li/listmonk/frontend.nix index 0125cc5e8c63..4fec2c272de4 100644 --- a/pkgs/by-name/li/listmonk/frontend.nix +++ b/pkgs/by-name/li/listmonk/frontend.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-FVnODCSLJYXb9KO2nNV52Z6hza+1619KjXNtXqmZv8o="; + hash = "sha256-VCaEMftA7AzW/6jyceVO596iby0wC3LW9YDG66kLJmw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index d43306c0f926..27da85d559f3 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "listmonk"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${finalAttrs.version}"; - hash = "sha256-FUhmbp4P9zQFlSf3ss17zs4ZaPUi0CbVceq3ZJeIXBY="; + hash = "sha256-SG9PhQOu3QB0LA9dNLnNzwwtfaib7MCfvOcBMkWMRPw="; }; - vendorHash = "sha256-R4chuOzpy/aEB5i5owZV3M7ByqnrXzxLaCeUOcjzQKE="; + vendorHash = "sha256-0KrjaExgT9tN4M99CfyQpqpGYnXOpzsPRk/Ih4qXsuE="; nativeBuildInputs = [ stuffbin diff --git a/pkgs/by-name/li/listres/package.nix b/pkgs/by-name/li/listres/package.nix index f4fb53abc6c6..52f7146d402f 100644 --- a/pkgs/by-name/li/listres/package.nix +++ b/pkgs/by-name/li/listres/package.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "listres"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "mirror://xorg/individual/app/listres-${finalAttrs.version}.tar.xz"; - hash = "sha256-TRxT79abplTyh34Vd+mUx4h0sFEvobBmbP/PRSruQ8o="; + hash = "sha256-173HNUpT83hkhzmbbV6oFp+sndrCx1HFMDg8d30a8Tk="; }; strictDeps = true; diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index ad10b7ef8a1e..8c9451d47023 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "livepeer"; - version = "0.8.8"; + version = "0.8.10"; proxyVendor = true; - vendorHash = "sha256-cEpRLnLR0ia5vvoJ8Fwk/0qgvsnYw7vSpyS9BJQ8UfY="; + vendorHash = "sha256-Cn7GHNrFjGgzKPjSVGnoRE9Q2gd3Ji/ZrdVGB9v+0A8="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; tag = "v${finalAttrs.version}"; - hash = "sha256-DVgB/pE3nq6oHzLi+g/WUMQqrmXvJhPub7bmeLgyEDQ="; + hash = "sha256-jz8lgZItPDzAGKJrAFLiEUJ5nyTdw6kGneP6LtmWDYw="; }; nativeBuildInputs = [ @@ -31,6 +31,10 @@ buildGoModule (finalAttrs: { gnutls ]; + CGO_LDFLAGS = [ + "-lm" + ]; + __darwinAllowLocalNetworking = true; postPatch = '' diff --git a/pkgs/by-name/lo/lockfile-progs/package.nix b/pkgs/by-name/lo/lockfile-progs/package.nix index 2cdf16824d98..f780d8cf77e7 100644 --- a/pkgs/by-name/lo/lockfile-progs/package.nix +++ b/pkgs/by-name/lo/lockfile-progs/package.nix @@ -7,19 +7,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "lockfile-progs"; - version = "0.1.19"; + version = "0.2.0"; src = fetchurl { - url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${finalAttrs.version}.tar.gz"; - sha256 = "sha256-LFcEsByPR0+CkheA5Fkqknsr9qbXYWNUpsXXzVZkhX4="; + url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${finalAttrs.version}.tar.xz"; + sha256 = "sha256-KYj7WotAflLiqmKCzkVJf0Zckh1ZETjBAPSJghWETJA="; }; buildInputs = [ liblockfile ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU (toString [ - # Needed with GCC 12 - "-Wno-error=format-overflow" - ]); + preBuild = '' + patchShebangs . + ''; + + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.cc.isGNU (toString [ + # Needed with GCC 12 + "-Wno-error=format-overflow" + ]) + + lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + "-Wno-error=c23-extensions" + ]); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index a871f30cac5d..abd3a6eb5cd8 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.66.1"; + version = "1.67.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-Lz6tnCfkjQc7YhfCETaFLAvW6fTrRwmELxBNURavNeY="; + hash = "sha256-J2/ARONeRZ5gy/3RE25GgPNahDUkrgbwQaQLU5AxVhk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 7b7cbdf2f10d..eb5a631853a6 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.6.8"; + version = "3.6.10"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-JiT9PNi4UT7oIKRw6xmTvFxjKvJrMqDqOebxpiaiFZy6OWgl3det22i8yYO/Wk4KucydJqg+aYQ+YOi1+yK5tA=="; + hash = "sha512-qdr6CcCtZa++KLzfmpA8ChdHXO3N+syn06pTXH7EQY0uI10ZI0w4os+hZ6SNoh0+YOcMY90gv4k4zpI9jWKPVg=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 4bb85d741c10..9d242d59460f 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-jQkqWngHLHf0myzy7PjiNQFEI0/cq9FZQNst3BzIexs="; + hash = "sha256-x1sq83rtY3oiL6h4MO6GSyAItj7CX5/25DwXMhXefAU="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-+geQjo/hvx+ZtF2n2bWfQZMbAI6zPgbDAVH2TZbrKQc="; + cargoHash = "sha256-Z9WC14DMK13UCWDm1nGpN9UXY9wpFJkB21nkI2y77bw="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ma/macaulay2/package.nix b/pkgs/by-name/ma/macaulay2/package.nix index 861e814322ba..d2fc7de8fc46 100644 --- a/pkgs/by-name/ma/macaulay2/package.nix +++ b/pkgs/by-name/ma/macaulay2/package.nix @@ -23,6 +23,7 @@ flint, frobby, gdbm, + getconf, gfortran, gfan, givaro, @@ -53,10 +54,11 @@ readline, singular, texinfo, - time, + runtimeShell, topcom, which, xz, + llvmPackages, downloadDocs ? true, }: @@ -87,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { flint frobby gdbm + getconf givaro glpk gtest @@ -111,6 +114,9 @@ stdenv.mkDerivation (finalAttrs: { readline singular xz + ] + ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; nativeBuildInputs = [ @@ -119,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { emacs-nox flex gdbm + getconf gfortran makeWrapper pkg-config @@ -147,6 +154,13 @@ stdenv.mkDerivation (finalAttrs: { sed -i 's/AC_SUBST(REL,.*uname -r.*)/AC_SUBST(REL,"")/' configure.ac substituteInPlace Macaulay2/packages/DeterminantalRepresentations.m2 \ --replace-fail "eps = 1e-15" "eps = 1e-14" + '' + # ForeignFunctions.m2 uses `brew --prefix` to discover potential library paths, + # which fails when Homebrew is not installed. + # We patch it to return an empty path instead, which should be harmless + + '' + substituteInPlace Macaulay2/packages/ForeignFunctions.m2 \ + --replace-fail 'get "!brew --prefix"' 'try get "!brew --prefix" else ""' ''; preConfigure = '' @@ -181,8 +195,17 @@ stdenv.mkDerivation (finalAttrs: { "MakeDocumentation=false" ]; + env.LDFLAGS = lib.concatStringsSep " " ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-lblas" + ] + ); + postInstall = '' - wrapProgram "$out/bin/M2" \ + substituteInPlace "$out/bin/M2" \ + --replace-fail "/bin/sh" "${runtimeShell}" + + wrapProgram "$out/bin/M2-binary" \ --prefix PATH : ${ lib.makeBinPath [ _4ti2 @@ -198,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: { topcom ] } \ - --prefix LD_LIBRARY_PATH : ${ + --prefix ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${ lib.makeLibraryPath [ cddlib flint diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index 32d046e79f4d..e566720e433a 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -7,14 +7,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "mackup"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; src = fetchFromGitHub { owner = "lra"; repo = "mackup"; rev = "${finalAttrs.version}"; - hash = "sha256-f2mbxehOMg9pZU7uQwWk9JjEa90d5YtS/Ha1m2wns+c="; + hash = "sha256-xK/01vnJP8eyyqyeEp7lv+fSN8KdCGIscqjlI32D/xA="; }; postPatch = '' diff --git a/pkgs/by-name/ma/mailpit/package.nix b/pkgs/by-name/ma/mailpit/package.nix index 2f83a2a169dd..4af3b4aa66d8 100644 --- a/pkgs/by-name/ma/mailpit/package.nix +++ b/pkgs/by-name/ma/mailpit/package.nix @@ -83,13 +83,15 @@ buildGoModule (finalAttrs: { passthru = { tests = { - inherit (nixosTests) mailpit; # cannot use versionCheckHook due to the extra --no-release-check flag # for workarounds and other solutions see https://github.com/NixOS/nixpkgs/pull/486143#discussion_r2754533347 version = testers.testVersion { package = mailpit; command = "mailpit version --no-release-check"; }; + } + // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + inherit (nixosTests) mailpit; }; updateScript = { diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index 5b19c38381bf..bb8737aef7fe 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.29.7"; - hash = "sha256-nd52Kf7wRJXSrLPgrYQ5VjUWFARObRRAJe3nIW19wZU="; - npmDepsHash = "sha256-s71BVJpim593GknE1XyBCb4sQwY8fKpAH7q/e/0Nmg0="; - vendorHash = "sha256-mGlzb4Q6nWew13Io8fAtR+3u4w1vjj4ssUaBJ9sjz6A="; + version = "1.30.0"; + hash = "sha256-lUynHDFfbX9BxwTdREbgAMil7S3+vwAl05myzMEWgGQ="; + npmDepsHash = "sha256-snWhjSy9au81bJZwjh/KVvchjEaJJ05HYhyh3V8/Y5g="; + vendorHash = "sha256-LMjS0YxRTvHZ8U10BOST/5Zthqhoi5OxngWWB+2CSeQ="; } diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index cb3aab996add..083ef6a6fcd4 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -1,30 +1,28 @@ { lib, fetchFromGitHub, - python3, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "malwoverview"; - version = "6.1.1"; + version = "8.0.1"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; - tag = "v${version}"; - hash = "sha256-43LcrP89vhVFDRRRItFL6hl++mvdGoPugMwD3TEOSE0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yIlKrZaIJmz3INGTrk+ydU+8gjAt54glSteMUrXSAgU="; }; - pythonRemoveDeps = [ - "pathlib" - ]; - - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ colorama configparser geocoder @@ -34,6 +32,11 @@ python3.pkgs.buildPythonApplication rec { requests simplejson validators + tqdm + python-whois + ipwhois + # For --tui + textual ]; # Project has no tests @@ -46,9 +49,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool for threat hunting and gathering intel information from various sources"; homepage = "https://github.com/alexandreborges/malwoverview"; - changelog = "https://github.com/alexandreborges/malwoverview/releases/tag/v${version}"; + changelog = "https://github.com/alexandreborges/malwoverview/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; - mainProgram = "malwoverview.py"; + mainProgram = "malwoverview"; }; -} +}) diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index 29d4436a0b6b..5882cdc3e01e 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -8,16 +8,16 @@ # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 buildGoModule (finalAttrs: { pname = "mark"; - version = "16.3.0"; + version = "16.4.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ntTJHeesm3yZmjcRW6Hu2HsQjJaL2mZ0TY1hbfZNp3Q="; + sha256 = "sha256-eru4EwF5LASyR2Xc1+t2fpvRd3PsZFomi83xxMDHzeE="; }; - vendorHash = "sha256-04X107Y92qZTX1oK5hKED56CwR1ceUW6Ztppo4diAkw="; + vendorHash = "sha256-eXUw4FnXoDxoWphwA+7inC4Fd8iuI8q5HtobnewHP44="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 9d5735f92b9f..9fa9691a0742 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2026.5.6"; + version = "2026.5.13"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-bx+zsMjODi3l6VXES5rKZMARGDFTBwHtD2eYAxBouW4="; + hash = "sha256-MCOEw8GxyqZgQFTWzOmCnMxHEGKkp5WupJUllclw9Vg="; }; vendorHash = "sha256-YlWc8EkM6GfNdH7ot9JmDFB5Xko3+O1Qr5vVNlDNCvI="; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix index d4bd29df0586..5a8519b6929a 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "matrix-synapse-s3-storage-provider"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse-s3-storage-provider"; tag = "v${version}"; - hash = "sha256-aeacw6Fpv4zFhZI4LdsJiV2pcOAMv3aV5CicnwYRxw8="; + hash = "sha256-vRDjN9BDp7Rta/F91OVEH8FWyiwxR67PQSqBCs3bDkM="; }; postPatch = '' diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index 838bb42eead6..2f8d6cbca8b7 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "25.11"; - tag = "v0.2511.0"; + version = "26.05"; + tag = "v0.2605.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; inherit tag; - hash = "sha256-WmZ2eRKRckZtYMsI7r0b+atLSYA5e3N4ifeSEI2Rvu8="; + hash = "sha256-ScsjUmQZsB86hT+EqIoI4V3KX3T1sV9C4/3ytcLV8O0="; }; - vendorHash = "sha256-HVM9W4gOZFs9BDT1wFzDXkhDklCDtKUyNdYxPWkGZ3w="; + vendorHash = "sha256-rEcPW/egdx2AhXWqpjpaXbIjbmU9fShOKSv4fUZiX0w="; ldflags = [ "-s" @@ -38,7 +38,7 @@ buildGoModule rec { buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - doCheck = false; + doCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index d9604ee36977..437f5622a114 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,8 +15,8 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "25.12"; - tag = "v0.2512.0"; + version = "26.05"; + tag = "v0.2605.0"; subPackages = [ "cmd/mautrix-meta" ]; @@ -24,13 +24,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; inherit tag; - hash = "sha256-S5vPAuie0BrRXaDNgSpXUI1V0C3P/CihgzGK1V7iU7w="; + hash = "sha256-zpolDtwGulDTiojJPnkj9O0D5b4rgPYQX6A28rvuvM0="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-aANrYWhIAXQxpe/rtMMkHfhTtuRs5fgJxNUQK29pdvM="; + vendorHash = "sha256-+i45bXBhlXPXX24VMS9IJLLX+i4VPnqy5RAH4j88sTA="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix index 1a5e37d51fbe..c3a2fe26074f 100644 --- a/pkgs/by-name/me/megabasterd/package.nix +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -6,7 +6,7 @@ maven, }: let - version = "8.23"; + version = "8.46"; in maven.buildMavenPackage { pname = "megabasterd"; @@ -16,10 +16,10 @@ maven.buildMavenPackage { owner = "tonikelope"; repo = "megabasterd"; tag = "v${version}"; - hash = "sha256-FcEG+DvHa+ZcMV2CfKmLzMaXgEXzTW3qmULV4PwHaQ8="; + hash = "sha256-3iKU3QyCEViTFDRCIt8aCa9jO77vZg9S+OM9dt0Iamw="; }; - mvnHash = "sha256-b7+17CXmBB65fMG472FPjOvr+9nAsUurdBC/7esalCE="; + mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/me/melonloader-installer/deps.json b/pkgs/by-name/me/melonloader-installer/deps.json new file mode 100644 index 000000000000..7a3870ef4aa5 --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/deps.json @@ -0,0 +1,752 @@ +[ + { + "pname": "Avalonia", + "version": "11.3.13", + "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.3.13", + "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.3.13", + "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.3.13", + "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.3.13", + "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.3.13", + "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" + }, + { + "pname": "Avalonia.Native", + "version": "11.3.13", + "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.13", + "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.3.13", + "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.3.13", + "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.3.13", + "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.3.13", + "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs=" + }, + { + "pname": "Avalonia.X11", + "version": "11.3.13", + "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.2", + "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" + }, + { + "pname": "ELFSharp", + "version": "2.17.3", + "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0=" + }, + { + "pname": "Gameloop.Vdf", + "version": "0.6.2", + "hash": "sha256-z34mcUx7qcaFlVsenGKYuxFNCQNWwOeFZYGecbRT3ZA=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.1", + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.1.1", + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.1.1", + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "5.0.1", + "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU=" + }, + { + "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.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.3", + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "10.0.5", + "hash": "sha256-+P58Oxl4W1oXE2a13MSA8dzX4oGm/4Ix9HDT6Z+yHlI=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "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.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.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.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.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "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.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" + }, + { + "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": "Samboy063.Tomlet", + "version": "6.2.0", + "hash": "sha256-kVuz3w25flcNbr4t7eDRQvH9zTIsuVjsRF2K/lkVeH0=" + }, + { + "pname": "Semver", + "version": "3.0.0", + "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ=" + }, + { + "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.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.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.Drawing.Common", + "version": "10.0.5", + "hash": "sha256-39eTfw3/FAIIJOPmDwgsM6soRJMGvU96MXo6vqbjJJk=" + }, + { + "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.Net.Http", + "version": "4.3.4", + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" + }, + { + "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.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.2", + "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=" + }, + { + "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.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", + "version": "4.3.1", + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" + }, + { + "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.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.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.1", + "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" + }, + { + "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.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.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + } +] diff --git a/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch b/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch new file mode 100644 index 000000000000..03e73a1ffc8e --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch @@ -0,0 +1,17 @@ +Index: MelonLoader.Installer/Updater.cs +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/MelonLoader.Installer/Updater.cs b/MelonLoader.Installer/Updater.cs +--- a/MelonLoader.Installer/Updater.cs (revision 617af4f21813ab4e997effdd6ee78a52ad22b59e) ++++ b/MelonLoader.Installer/Updater.cs (date 1779144321145) +@@ -18,7 +18,7 @@ + return null; + + // Don't auto-update on CI builds +- if (Program.Version.Revision > 0) ++ if (true) + { + State = UpdateState.AlreadyChecked; + return null; diff --git a/pkgs/by-name/me/melonloader-installer/package.nix b/pkgs/by-name/me/melonloader-installer/package.nix new file mode 100644 index 000000000000..418d5437e79b --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + dotnetCorePackages, + buildDotnetModule, + makeDesktopItem, + copyDesktopItems, + lib, +}: +buildDotnetModule rec { + pname = "melonloader-installer"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "LavaGang"; + repo = "MelonLoader.Installer"; + tag = version; + hash = "sha256-6tSbLgr44xBoJsNOGUq62KBirIU6sNCy24fwKROZRPE="; + }; + + patches = [ + ./disable-auto-updates.patch + ]; + + projectFile = "MelonLoader.Installer/MelonLoader.Installer.csproj"; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + nugetDeps = ./deps.json; + selfContainedBuild = true; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ copyDesktopItems ]; + + postInstall = '' + install -Dm644 Resources/ML_Icon.png $out/share/icons/MelonLoader.Installer.Linux.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "MelonLoader Installer"; + exec = meta.mainProgram; + comment = meta.description; + categories = [ + "Game" + "Utility" + ]; + icon = meta.mainProgram; + }) + ]; + + passthru.updateScript = ./update.sh; + + meta = { + homepage = "https://melonwiki.xyz"; + mainProgram = "MelonLoader.Installer.Linux"; + description = "Automated installer for MelonLoader, the universal mod-loader for games built in the Unity Engine"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ WillemToorenburgh ]; + }; +} diff --git a/pkgs/by-name/me/melonloader-installer/update.sh b/pkgs/by-name/me/melonloader-installer/update.sh new file mode 100644 index 000000000000..481a62f604e5 --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +# Implementation lovingly referenced and adapted from cavalier package's update.sh + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/LavaGang/MelonLoader.Installer/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A melonloader-installer.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version melonloader-installer "$version" + +$(nix-build -A melonloader-installer.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.json" diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index c0e3d35c4e49..c5a7236bcaf0 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "meowlnir"; - version = "26.01"; - tag = "v0.2601.0"; + version = "26.05"; + tag = "v0.2605.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; inherit tag; - hash = "sha256-vrj19+YuhCFwluR+f73WPOJ4bMVxzoG3WjWrN3QuhZ0="; + hash = "sha256-f2SgDFswjBDFQq9KvFo6A02vghMfYRkV26uWN8yxOz0="; }; buildInputs = [ olm ]; - vendorHash = "sha256-l6H6NqAq3C0OBYaea3ed6g/wHdNmo5tVkgizx+vU09E="; + vendorHash = "sha256-rHBGTOqBfbu9EN0rWCui03aW2Co6Y4yxOvpuznjQ4qc="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/me/metee/package.nix b/pkgs/by-name/me/metee/package.nix index 042761a11381..8c3f0fbe007e 100644 --- a/pkgs/by-name/me/metee/package.nix +++ b/pkgs/by-name/me/metee/package.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metee"; - version = "6.2.1"; + version = "6.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "metee"; tag = finalAttrs.version; - hash = "sha256-TMHc/0N1DUx+aKOCrfBRoQgKj968FIq+FcusyLG0oPI="; + hash = "sha256-ac4ypAi8voTpHB5D1V6WoA6MBO4zf45Tx4JL6Gl+468="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index f396929480ef..09875f0d22ff 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -170,11 +170,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "148.0.3967.54"; + version = "148.0.3967.70"; 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-ccMYxwaQ70p+za3LoM0vT+lXiRIlYmoldVDqsHT7I9o="; + hash = "sha256-rwG3zPxMHjC00P591/CZIWRIHb4td4q3Rfz4fvf89k0="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix similarity index 100% rename from pkgs/games/minecraft-servers/derivation.nix rename to pkgs/by-name/mi/minecraft-server/derivation.nix diff --git a/pkgs/by-name/mi/minecraft-server/package.nix b/pkgs/by-name/mi/minecraft-server/package.nix new file mode 100644 index 000000000000..608bddaff15d --- /dev/null +++ b/pkgs/by-name/mi/minecraft-server/package.nix @@ -0,0 +1 @@ +{ callPackage }: (callPackage ./versions.nix { }).vanilla diff --git a/pkgs/games/minecraft-servers/update.py b/pkgs/by-name/mi/minecraft-server/update.py similarity index 100% rename from pkgs/games/minecraft-servers/update.py rename to pkgs/by-name/mi/minecraft-server/update.py diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json similarity index 100% rename from pkgs/games/minecraft-servers/versions.json rename to pkgs/by-name/mi/minecraft-server/versions.json diff --git a/pkgs/by-name/mi/minecraft-server/versions.nix b/pkgs/by-name/mi/minecraft-server/versions.nix new file mode 100644 index 000000000000..c8f4aa2ad336 --- /dev/null +++ b/pkgs/by-name/mi/minecraft-server/versions.nix @@ -0,0 +1,50 @@ +{ + lib, + javaPackages, + stdenv, + fetchurl, + nixosTests, + makeWrapper, + udev, +}: +let + versions = lib.importJSON ./versions.json; + + latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); + escapeVersion = builtins.replaceStrings [ "." ] [ "-" ]; + + getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless; + + mkVersion = ( + version: value: { + name = "vanilla-${escapeVersion version}"; + value = import ./derivation.nix { + inherit + lib + stdenv + fetchurl + nixosTests + makeWrapper + udev + ; + inherit (value) version url sha1; + jre_headless = getJavaVersion ( + if value.javaVersion == null then + 8 + else if value.javaVersion == 16 then + 17 + else + value.javaVersion + ); # versions <= 1.6 will default to 8 + }; + } + ); + + packages = lib.mapAttrs' mkVersion versions; +in +lib.recurseIntoAttrs ( + packages + // { + vanilla = (mkVersion latestVersion versions.${latestVersion}).value; + } +) diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix index 00e3e21eaad8..99df735260a0 100644 --- a/pkgs/by-name/mi/minilibx/package.nix +++ b/pkgs/by-name/mi/minilibx/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "0-unstable-2026-04-16"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "42Paris"; repo = "minilibx-linux"; - rev = "a0ce07ba22460ee66e62b6c56d60b33946aeb13d"; - hash = "sha256-LyFCmuGXAAv7O9jrmfeIVeYoi7d1Mdw6e8u2Z0/yO4s="; + rev = "b8de9b411818f2e56dd2f4f23c5aa9bffc18a612"; + hash = "sha256-LTZeVxa4NdGOai/GIrhPbWwXO7Vj7ct/gexeC81IvDw="; }; outputs = [ diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index 372e8bb91e5f..38ad0e5ee06f 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.3.9"; + version = "2.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-themes"; rev = version; - hash = "sha256-Zvy/qqyzc6Yu6TJC+vbJ660MYeyX27LIm1TovwbRjMs="; + hash = "sha256-pO2qotVR48VTKIS1IDqb9GwKTo/l1BV1Hk0w4Pf5V+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 41ab919dcb3f..19d45f24a1a4 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "misconfig-mapper"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${finalAttrs.version}"; - hash = "sha256-WHVNUdzYDC3vV1UDYSAHkwWUlfBvMg1OCh/BwE7shWE="; + hash = "sha256-cxBoGk9K9Y2mtkAM4JW3XoQi+MrOGhRmQ3iRKF2cueA="; }; vendorHash = "sha256-jM+td4OUDK7Z4zZy/w0foupQMYpFhOTIefSUoovgEeE="; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 027f6224f1af..916eeea0a340 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-05-07"; + version = "0-unstable-2026-05-19"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "2e5b87a9c20c198dba4e3c8eba3ccfa959499790"; - hash = "sha256-dZLzWgur3zccc92/iaeckcCMCFYOqBz49p1b5gzMaDY="; + rev = "db0a7cf6113f380b15e8ab21944e5de18bb30feb"; + hash = "sha256-kFskkQ5YrK7ler8s+vC5ONEjmNmOpiIKAZqoiCk97Qk="; }; node_modules = stdenvNoCC.mkDerivation { @@ -57,7 +57,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-eXgzhb/yhgw0B1WDrpaEmH5Tyya+/rye6kJVKdiV56w="; + outputHash = "sha256-kn5Ung5DGDYMf5MHnZ+jsqXCg+MYahfkbiixcD9kh4Y="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index c15ad31eb41a..8bf165d0c899 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.13.0"; + version = "2.13.2"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-aEwazj3RXOrPPOxZDfvyHqetO5tvhnzQ19rE+NQf8wQ="; + hash = "sha256-5VfldFEPcYva6yKDolgs1ZzGSAkn3Caxk29sedniw58="; }; vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM="; diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix index 7ec8c7fe4551..2ac697866da2 100644 --- a/pkgs/by-name/mo/motrix-next/package.nix +++ b/pkgs/by-name/mo/motrix-next/package.nix @@ -25,16 +25,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "motrix-next"; - version = "3.8.9"; + version = "3.8.10"; src = fetchFromGitHub { owner = "AnInsomniacy"; repo = "motrix-next"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z3oGUwol6vtnrjpvJdPtrdaoaANaW3dtl2vNwpmMXEM="; + hash = "sha256-gDRxeQBw2l04zHbt8SVl49FzUEo3gaDWvY0cUofrL50="; }; - cargoHash = "sha256-BWPYzGYw6W3Gl1T+eXINFgbo58rvOzOUMa83fcOHJq0="; + cargoHash = "sha256-vLcbFlxKHio58i6nNXdpPLdj8ISEo5vdQ1uTqPhx6xA="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) diff --git a/pkgs/by-name/mo/motus/package.nix b/pkgs/by-name/mo/motus/package.nix index 62f652e17ce9..e9d99d833707 100644 --- a/pkgs/by-name/mo/motus/package.nix +++ b/pkgs/by-name/mo/motus/package.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, + libxcb, nix-update-script, rustPlatform, stdenv, - libxcb, versionCheckHook, withClipboard ? true, }: rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; + pname = "motus"; version = "0.4.0"; @@ -23,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-6MKEHnB2MJVB4cNvz3JYlhuzxhzsA+Pq5OkpLNoAEyU="; - buildAndTestSubdir = "crates/motus-cli"; - # The CLI crate version was not bumped to match the v0.4.0 release tag: # https://github.com/oleiade/motus/issues/58 postPatch = '' @@ -32,12 +31,13 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '#[command(version = "0.3.1")]' '#[command(version = "${finalAttrs.version}")]' ''; - buildNoDefaultFeatures = !withClipboard; - buildInputs = lib.optionals (withClipboard && stdenv.hostPlatform.isLinux) [ libxcb ]; - nativeInstallCheckInputs = [ versionCheckHook ]; + buildAndTestSubdir = "crates/motus-cli"; + buildNoDefaultFeatures = !withClipboard; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/move-mount-beneath/package.nix b/pkgs/by-name/mo/move-mount-beneath/package.nix deleted file mode 100644 index 844e37c2978b..000000000000 --- a/pkgs/by-name/mo/move-mount-beneath/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "move-mount-beneath"; - version = "0-unstable-2025-09-24"; - - src = fetchFromGitHub { - owner = "brauner"; - repo = "move-mount-beneath"; - rev = "f8773d1f99f9cfa2f5bf173e1b1d1b21eb1ee446"; - hash = "sha256-C7QiClwFTKBcdmGilwZSCAsaVoEDXTO9384Y/47JrPk="; - }; - - installPhase = '' - runHook preInstall - install -D move-mount $out/bin/move-mount - runHook postInstall - ''; - - meta = { - description = "Toy binary to illustrate adding a mount beneath an existing mount"; - mainProgram = "move-mount"; - homepage = "https://github.com/brauner/move-mount-beneath"; - license = lib.licenses.mit0; - maintainers = with lib.maintainers; [ nikstur ]; - }; -} diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 26a57c5df185..92fe72f905f7 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mpls"; - version = "0.21.1"; + version = "0.21.3"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${finalAttrs.version}"; - hash = "sha256-MMFwWHgdSkUgwx+XxBCIL4dElY1HIM5h2XNFTZBKNkQ="; + hash = "sha256-DG3op0bKCePp0LLM5faVlnPGiq2bghB+0EItr3yrjqQ="; }; vendorHash = "sha256-fE6GFfrDS3k9BmsL2+UbefG/EQngI/WGRZA3U10VBP4="; diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 8b23b859cc72..880940f82117 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "148.0.3967.54"; + version = "148.0.3967.70"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-woGkky1i9so+1D61irtJYjDQ0xoHUeGQsJi/eQ4VGhU="; + hash = "sha256-e0WYaLmuR/ebupSYnS1D4BpTWJldMmiR1TqbTA5Fl0s="; stripRoot = false; }; diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index 7ad2ac9d982b..178113626913 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.2.29"; + version = "0.3.2"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-RW9GXWMOJZGc2RsuKAmfTOol66/XwQLdyK7iPoGFF48="; + hash = "sha256-1ioDiNieaB+PX/NTR7B5FQGjvKZCIM6PgkgO5jSjZyE="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/mu/music-assistant-desktop/package.nix b/pkgs/by-name/mu/music-assistant-desktop/package.nix new file mode 100644 index 000000000000..7f425820f709 --- /dev/null +++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + rustPlatform, + + fetchFromGitHub, + fetchYarnDeps, + + # nativeBuildInputs + cargo-tauri, + nodejs, + pkg-config, + yarnBuildHook, + yarnConfigHook, + yarnInstallHook, + wrapGAppsHook3, + + # buildInputs + openssl, + alsa-lib, + atk, + dbus, + glib-networking, + libappindicator-gtk3, + llvmPackages, + pulseaudio, + gtk3, + webkitgtk_4_1, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "music-assistant-desktop"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "desktop-app"; + tag = finalAttrs.version; + hash = "sha256-GL9Cpk6NDhRV0npVXwGjR3Dm0H/uo9cD4ebaI751VLM="; + }; + + # hide update feature + postPatch = '' + substituteInPlace src-tauri/src/lib.rs \ + --replace-fail \ + "let update =" \ + "// let update =" \ + --replace-fail \ + "&update," \ + "// &update," \ + ''; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + cargoHash = "sha256-rd0kvUTAi4fOh3hxCY1cmkkLWsxNPxVmPVzB9uEv/8c="; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-dOJ5ETRodpnuaI+L2wckNU0XANUcjqzvdqw/cd5sJC4="; + }; + + nativeBuildInputs = [ + cargo-tauri.hook + nodejs + pkg-config + yarnBuildHook + yarnConfigHook + yarnInstallHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + atk + dbus + glib-networking + libappindicator-gtk3 + pulseaudio + gtk3 + webkitgtk_4_1 + ]; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}" + ) + ''; + + env = { + # `LIBCLANG_PATH` is needed to build `coreaudio-sys` on darwin + LIBCLANG_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "${lib.getLib llvmPackages.libclang}/lib"; + }; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + description = "Official companion desktop app for Music Assistant"; + homepage = "https://github.com/music-assistant/desktop-app"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nim65s ]; + mainProgram = "music-assistant-companion"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mu/music-discord-rpc/package.nix b/pkgs/by-name/mu/music-discord-rpc/package.nix index cabecf32e976..a049e17f771b 100644 --- a/pkgs/by-name/mu/music-discord-rpc/package.nix +++ b/pkgs/by-name/mu/music-discord-rpc/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "music-discord-rpc"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "patryk-ku"; repo = "music-discord-rpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-HZh7rwZR/9dccNyQV2BEyQF2vtoH+L/lW4L4hu9RJTI="; + hash = "sha256-X2PIXP5W42ihT50BLApfULQxeUOAqDaNzn9tdxFir3A="; }; - cargoHash = "sha256-vCqjeY07R/AuNruBYS3sc7n9kN/Y4IwvvpSooWTu7Oc="; + cargoHash = "sha256-ROzRR1wQQNpweFcPzRnOMKjb6HTmViVbFR/zWugSYrU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix index c132cbec943d..5dfc67ded1ff 100644 --- a/pkgs/by-name/mu/muvm/package.nix +++ b/pkgs/by-name/mu/muvm/package.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "muvm"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "muvm"; tag = "muvm-${finalAttrs.version}"; - hash = "sha256-eXsU2QRJ55gx5RhjT+m9F1KAFqGrd4WwnyR3eMpuIc4="; + hash = "sha256-9lrJ622kPCfVo/QrtRmLLQs5rjh3FJE8EelqPHdU/vc="; }; - cargoHash = "sha256-OP44LRMN4Lp9LaXQ8Oa8B4LRTqlMyaTa0xKn4eoh1LQ="; + cargoHash = "sha256-Ij2Tdn7HhQ815mXCuamfej4KpDjHALTusrx06t8M87w="; postPatch = '' substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 1a2e901ea6e2..1820c6f2ad1b 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -5,7 +5,6 @@ installShellFiles, makeWrapper, maven, - mvnd, nix-update-script, runCommand, stdenv, @@ -19,16 +18,15 @@ let x86_64-darwin = "darwin-amd64"; x86_64-linux = "linux-amd64"; }; - inherit (platformMap.${stdenv.system}) os arch; in -maven.buildMavenPackage rec { +maven.buildMavenPackage (finalAttrs: { pname = "mvnd"; version = "1.0.5"; src = fetchFromGitHub { owner = "apache"; repo = "maven-mvnd"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/ODRS6xaxkn7okUh8phN1GUNG7tDAKjmAIQn8NrC+ag="; }; @@ -42,7 +40,7 @@ maven.buildMavenPackage rec { makeWrapper ]; - mvnDepsParameters = mvnParameters; + mvnDepsParameters = finalAttrs.mvnParameters; mvnParameters = lib.concatStringsSep " " ( [ "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository @@ -69,7 +67,7 @@ maven.buildMavenPackage rec { mkdir -p $out/bin mkdir -p $out/mvnd-home - cp -r dist/target/maven-mvnd-${version}-${platformMap.${stdenv.system}}/* $out/mvnd-home + cp -r dist/target/maven-mvnd-${finalAttrs.version}-${platformMap.${stdenv.system}}/* $out/mvnd-home makeWrapper $out/mvnd-home/bin/mvnd $out/bin/mvnd \ --set-default MVND_HOME $out/mvnd-home @@ -89,13 +87,13 @@ maven.buildMavenPackage rec { package = runCommand "mvnd" { - inherit version; + inherit (finalAttrs) version; nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin - makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \ - --suffix PATH : ${lib.makeBinPath [ mvnJdk ]} + makeWrapper ${finalAttrs.finalPackage}/bin/mvnd $out/bin/mvnd \ + --suffix PATH : ${lib.makeBinPath [ finalAttrs.mvnJdk ]} ''; }; }); @@ -108,4 +106,4 @@ maven.buildMavenPackage rec { maintainers = with lib.maintainers; [ nathanregner ]; mainProgram = "mvnd"; }; -} +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 06ce1c095c2d..9a68a0749167 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.509"; + version = "0.0.516"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-jePgbLvXhQxwvE7lwTE/NtpadzEadQaD/qlmyzOVHp0="; + hash = "sha256-IVKqyANGPLbeogh058fy1/mr/jWbceuQml4qKdDUwFQ="; }; - vendorHash = "sha256-FnmcBDPQIISPGiz28yqdfiD26ZrBBeiHPmJawdMYqwE="; + vendorHash = "sha256-XNCogbQkG/BQPWW04Lpzca2sEXeIvp2XC//BILbshwQ="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/na/nanosvg/package.nix b/pkgs/by-name/na/nanosvg/package.nix index 5dd78db653c9..baf35af4d9bc 100644 --- a/pkgs/by-name/na/nanosvg/package.nix +++ b/pkgs/by-name/na/nanosvg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "nanosvg"; - version = "0-unstable-2025-11-21"; + version = "0-unstable-2026-05-18"; src = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "5cefd9847949af6df13f65027fd43af5a7513633"; - hash = "sha256-BozXqp3pNxAew+aFUbh6M3ppVQ+U7XMmMCbGT1urfWE="; + rev = "48120e91e64b2f409ed600cdfd6d790a49ba11ab"; + hash = "sha256-onjmiWQPftr4AWySwJOpMLZ3WQGvUp9wj9isdUyNIPc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix index 9df6802b9991..4f8ffa396e77 100644 --- a/pkgs/by-name/ne/netbox_4_5/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/package.nix @@ -122,6 +122,15 @@ py.pkgs.buildPythonApplication rec { inherit (nixosTests) netbox-upgrade; }; updateScript = nix-update-script { }; + plugins = lib.recurseIntoAttrs ( + lib.makeExtensible ( + self: + lib.packagesFromDirectoryRecursive { + inherit (py.pkgs) callPackage; + directory = ./plugins; + } + ) + ); }; meta = { diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-attachments/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-attachments/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-attachments/package.nix diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-bgp/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-contextmenus/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-contract/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-dns/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix diff --git a/pkgs/development/python-modules/netbox-documents/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-documents/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix diff --git a/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-floorplan-plugin/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-interface-synchronization/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-interface-synchronization/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-interface-synchronization/package.nix diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-napalm-plugin/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-napalm-plugin/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-napalm-plugin/package.nix diff --git a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-plugin-prometheus-sd/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-plugin-prometheus-sd/package.nix diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-qrcode/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-qrcode/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-qrcode/package.nix diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-reorder-rack/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-routing/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-topology-views/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix diff --git a/pkgs/by-name/ne/netcap/ndpi_4_0.nix b/pkgs/by-name/ne/netcap/ndpi_4_14.nix similarity index 86% rename from pkgs/by-name/ne/netcap/ndpi_4_0.nix rename to pkgs/by-name/ne/netcap/ndpi_4_14.nix index 8f63ddcc337a..73adccca7d2e 100644 --- a/pkgs/by-name/ne/netcap/ndpi_4_0.nix +++ b/pkgs/by-name/ne/netcap/ndpi_4_14.nix @@ -11,12 +11,12 @@ ndpi.overrideAttrs ( finalAttrs: prevAttrs: { - version = "4.0"; + version = "4.14"; src = fetchFromGitHub { inherit (prevAttrs.src) owner repo; tag = finalAttrs.version; - hash = "sha256-vWx6IVyxPJBgOkXpHdnvstvDGJbAtndFPtowpjLd32o="; + hash = "sha256-W8ZBWMQH6bRHl+fXmG3XLO37UxEnSgCVCgzfwy8N+OM="; }; configureScript = "./autogen.sh"; diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index 92768c3334e3..5cd67f88757d 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -8,32 +8,63 @@ libprotoident, libflowmanager, libtrace, + ndpi, + pkg-config, + protobuf, + protoc-gen-go, + yara-x, versionCheckHook, nix-update-script, }: let - ndpi = callPackage ./ndpi_4_0.nix { }; + ndpi_4_14 = callPackage ./ndpi_4_14.nix { }; in buildGoModule (finalAttrs: { pname = "netcap"; - version = "0.6.11"; + version = "0.9.0"; src = fetchFromGitHub { owner = "dreadl0ck"; repo = "netcap"; tag = "v${finalAttrs.version}"; - hash = "sha256-SCBKOIC/s+rfrVWmryp9EBp7ARpZZcxymsnZWtEHrhk="; + hash = "sha256-hk0aPU+pQ+A90GvlFhCRpj4hRiFOcpcP64xznh50Kts="; }; - vendorHash = "sha256-MvHrJLhcFA0fEgK+YT0rwI6wIwTGMcLWQt6AYkx1eZM="; + vendorHash = "sha256-DLjSeSXwA4zPVg3ISPqEHTihIp9uVu7dXv9bTSepsaI="; + + nativeBuildInputs = [ + pkg-config + protobuf + protoc-gen-go + ]; + + postPatch = '' + rm go.work go.work.sum + ''; + + preBuild = '' + # satisfiy go:embed + mkdir -p cmd/capture/webui/frontend/dist + touch cmd/capture/webui/frontend/dist/index.html + + # generate protobuf types + # we need to patch the proto file to have a valid go_package + substituteInPlace netcap.proto --replace-fail 'option go_package = "types";' 'option go_package = "github.com/dreadl0ck/netcap/types";' + protoc --go_out=. --go_opt=paths=source_relative netcap.proto + mv netcap.pb.go types/ + + # Patch types to replace calling String() (panics) with string literal + find types -name "*.go" -exec sed -i 's/Type_NC_\([A-Za-z0-9_]*\).String()/"NC_\1"/g' {} + + ''; subPackages = [ "cmd" ]; buildInputs = [ libpcap + yara-x ] ++ lib.optionals withDpi [ - ndpi + ndpi_4_14 libprotoident libflowmanager libtrace @@ -50,14 +81,14 @@ buildGoModule (finalAttrs: { env = lib.optionalAttrs withDpi { CGO_LDFLAGS = toString [ - "-L${ndpi}/lib" + "-L${ndpi_4_14}/lib" "-lndpi" "-L${libprotoident}/lib" - "-lndpi" + "-lprotoident" ]; CGO_CFLAGS = toString [ - "-I${ndpi}/include" + "-I${ndpi_4_14}/include" "-I${libprotoident}/include" ]; }; diff --git a/pkgs/by-name/ne/netmask/package.nix b/pkgs/by-name/ne/netmask/package.nix index 59847d82c024..0a4101087271 100644 --- a/pkgs/by-name/ne/netmask/package.nix +++ b/pkgs/by-name/ne/netmask/package.nix @@ -3,22 +3,33 @@ stdenv, fetchFromGitHub, autoreconfHook, + autoconf-archive, + pkg-config, texinfo, + check, }: stdenv.mkDerivation (finalAttrs: { pname = "netmask"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "tlby"; repo = "netmask"; rev = "v${finalAttrs.version}"; - sha256 = "1269bmdvl534wr0bamd7cqbnr76pnb14yn8ly4qsfg29kh7hrds6"; + hash = "sha256-BXCZsk+52nygxtY1s4C79WCwy/iOSwgRnQYnauWGipQ="; }; buildInputs = [ texinfo ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + nativeCheckInputs = [ check ]; + + doCheck = true; meta = { homepage = "https://github.com/tlby/netmask"; diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix index b76c35cc08fe..23564c756a7a 100644 --- a/pkgs/by-name/ne/netpeek/package.nix +++ b/pkgs/by-name/ne/netpeek/package.nix @@ -14,14 +14,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "netpeek"; - version = "0.2.6"; + version = "0.2.7"; pyproject = false; src = fetchFromGitHub { owner = "ZingyTomato"; repo = "NetPeek"; tag = "v${finalAttrs.version}"; - hash = "sha256-SFY/bUUS4AOniOGjngH/fUHrYiq+dMWxHYvoSkhfnkA="; + hash = "sha256-Cc8x9diBeKIk1G5fU1WHtgmUwCCbAwIrw8zEQScKlZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 67323d4e2656..86f8b316ab4e 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "5.0"; + version = "5.2"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-O4ry1G7Y55bjr4APrYMSCfrkNy8KrhSgG0Nh1rOGMvU="; + hash = "sha256-AjKcM/JD43htQZhNWcVv6ljhN2T9BPOv9ZdO6uxImOw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch b/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch deleted file mode 100644 index c2f3f520c3d1..000000000000 --- a/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch +++ /dev/null @@ -1,29 +0,0 @@ -Kill google analytics from local documentation. - -diff -r bb0a2fbdc886 xslt/ga.xslt ---- a/xslt/ga.xslt Mon Apr 06 11:17:11 2020 +0100 -+++ b/xslt/ga.xslt Thu Apr 09 10:29:02 2020 -0400 -@@ -6,23 +6,6 @@ - - - -- -- -- - - - diff --git a/pkgs/by-name/ng/nginx-doc/package.nix b/pkgs/by-name/ng/nginx-doc/package.nix index f662c9696f7b..82ce623bb70b 100644 --- a/pkgs/by-name/ng/nginx-doc/package.nix +++ b/pkgs/by-name/ng/nginx-doc/package.nix @@ -3,7 +3,7 @@ stdenv, libxml2, libxslt, - fetchhg, + fetchFromGitHub, }: # Upstream maintains documentation (sources of https://nginx.org) in separate @@ -14,13 +14,13 @@ # $out/bin/nginx, but we have no better options. stdenv.mkDerivation { pname = "nginx-doc-unstable"; - version = "2022-05-05"; - src = fetchhg { - url = "https://hg.nginx.org/nginx.org"; - rev = "a3aee2697d4e"; - sha256 = "029n4mnmjw94h01qalmjgf1c2h3h7wm798xv5knk3padxiy4m28b"; + version = "0-unstable-2026-05-15"; + src = fetchFromGitHub { + owner = "nginx"; + repo = "nginx.org"; + rev = "7884e3ae20269c6aa718dc104c0c578f797e5269"; + hash = "sha256-ut2LRZg2gyGPbili7XcOH0wZ/nI3ArA2RGWJKcZTBOk="; }; - patches = [ ./exclude-google-analytics.patch ]; nativeBuildInputs = [ libxslt libxml2 diff --git a/pkgs/by-name/ni/nim_builder/nim_builder.nim b/pkgs/by-name/ni/nim_builder/nim_builder.nim index 6339645bb4ad..79836b631eb4 100644 --- a/pkgs/by-name/ni/nim_builder/nim_builder.nim +++ b/pkgs/by-name/ni/nim_builder/nim_builder.nim @@ -1,7 +1,33 @@ # SPDX-FileCopyrightText: 2021 Nixpkgs/NixOS contributors ## Custom Nim builder for Nixpkgs. -import std/[os, osproc, parseutils, sequtils, streams, strutils] +import std/[json, os, osproc, parseutils, sequtils, streams, strutils, tables] + +proc getEnvBool(key: string; default = false): bool = + ## Parse a boolean environmental variable. + let val = getEnv(key) + if val == "": default + else: parseBool(val) + +type + BuilderAttrs = object + structuredAttrs: bool + outputs: Table[string, string] + nimFlags: seq[string] + nimDefines: seq[string] + nimRelease: bool + nimbleFile: string + nimDoc: bool + nimCopySources: bool + +proc getSeq(n: JsonNode): seq[string] = + if not n.isNil: result = n.to(seq[string]) + +proc getEnvOutputs(): Table[string, string] = + let outputs = splitWhitespace getEnv("outputs") + doAssert(outputs.len > 0) + for output in outputs: + result[output] = getEnv(output) proc findNimbleFile(): string = ## Copied from Nimble. @@ -21,12 +47,6 @@ proc findNimbleFile(): string = elif hits == 0: quit("Could not find a file with a .nimble extension in " & dir) -proc getEnvBool(key: string; default = false): bool = - ## Parse a boolean environmental variable. - let val = getEnv(key) - if val == "": default - else: parseBool(val) - proc getNimbleFilePath(): string = ## Get the Nimble file for the current package. if existsEnv"nimbleFile": @@ -34,6 +54,34 @@ proc getNimbleFilePath(): string = else: findNimbleFile() +proc init[T: BuilderAttrs](_: typedesc[T]): T = + ## populated based on __structuredAttrs when possible + let attrFile = getEnv("NIX_ATTRS_JSON_FILE") + if attrFile != "": + result.structuredAttrs = true + let jsonAttrs = parseJson(readFile(attrFile)) + result.outputs = jsonAttrs{"outputs"}.to(Table[string, string]) + result.nimDefines = jsonAttrs{"nimDefines"}.getSeq() + result.nimFlags = jsonAttrs{"nimFlags"}.getSeq() + result.nimRelease = jsonAttrs{"nimRelease"}.getBool(true) + result.nimDoc = jsonAttrs{"nimDoc"}.getBool() + result.nimCopySources = jsonAttrs{"nimCopySources"}.getBool() + result.nimbleFile = jsonAttrs{"nimbleFile"}.getStr() + else: + result.outputs = getEnvOutputs() + result.nimFlags = getEnv("nimFlags").split + result.nimDefines = getEnv("nimDefines").split + result.nimRelease = getEnvBool("nimRelease", true) + result.nimDoc = getEnvBool("nimDoc") + result.nimCopySources = getEnvBool("nimCopySources") + + + if result.nimbleFile == "": + result.nimbleFile = getNimbleFilePath() + + +let attrs = BuilderAttrs.init() + proc getNimbleValue(filePath, key: string; default = ""): string = ## Extract a string value from the Nimble file at ``filePath``. var @@ -64,44 +112,40 @@ proc getNimbleValues(filePath, key: string): seq[string] = if s.len > 0 and s[0] == '"': s = s.unescape() +proc getNimbleValue(attrs: BuilderAttrs, key: string, default = ""): string = + attrs.nimbleFile.getNimbleValue(key, default) + +proc getNimbleValues(attrs: BuilderAttrs, key: string): seq[string] = + attrs.nimbleFile.getNimbleValues(key) + proc getOutputDir(name: string): string = - ## Return the output directory for output `name`. - ## If `name` is not a valid output then the first output - ## is returned as a default. - let outputs = splitWhitespace getEnv("outputs") - doAssert(outputs.len > 0) - if outputs.contains name: - result = getEnv(name) - if result == "": - result = getEnv("out") - if result == "": - result = getEnv(outputs[0], "/dev/null") + let outDir = attrs.outputs.getOrDefault("out", "/dev/null") + if name == "out": outDir + else: attrs.outputs.getOrDefault(name, outDir) proc configurePhase*() = ## Generate "config.nims" which will be read by the Nim ## compiler during later phases. const configFilePath = "config.nims" echo "generating ", configFilePath - let - nf = getNimbleFilePath() - mode = - if fileExists configFilePath: fmAppend - else: fmWrite + let mode = + if fileExists configFilePath: fmAppend + else: fmWrite var cfg = newFileStream(configFilePath, mode) proc switch(key, val: string) = cfg.writeLine("\nswitch(", key.escape, ",", val.escape, ")") - switch("backend", nf.getNimbleValue("backend", "c")) + switch("backend", attrs.getNimbleValue("backend", "c")) switch("nimcache", getEnv("NIX_BUILD_TOP", ".") / "nimcache") - if getEnvBool("nimRelease", true): + if attrs.nimRelease: switch("define", "release") - for def in getEnv("nimDefines").split: + for def in attrs.nimDefines: if def != "": switch("define", def) for input in getEnv("NIX_NIM_BUILD_INPUTS").split: if input != "": for nimbleFile in walkFiles(input / "*.nimble"): let inputSrc = normalizedPath( - input / nimbleFile.getNimbleValue("srcDir", ".")) + input / attrs.getNimbleValue("srcDir", ".")) echo "found nimble input ", inputSrc switch("path", inputSrc) close(cfg) @@ -113,15 +157,14 @@ proc buildPhase*() = proc before(idx: int) = echo "build job ", idx, ": ", cmds[idx] let - nf = getNimbleFilePath() - bins = nf.getNimbleValues("bin") - srcDir = nf.getNimbleValue("srcDir", ".") + bins = attrs.getNimbleValues("bin") + srcDir = attrs.getNimbleValue("srcDir", ".") binDir = getOutputDir("bin") / "bin" if bins != @[]: for bin in bins: cmds.add("nim compile $# --parallelBuild:$# --outdir:$# $#" % - [getenv("nimFlags"), getenv("NIX_BUILD_CORES","1"), binDir, normalizedPath(srcDir / bin)]) - if getEnvBool"nimDoc": + [attrs.nimFlags.join(" "), getenv("NIX_BUILD_CORES","1"), binDir, normalizedPath(srcDir / bin)]) + if attrs.nimDoc: echo "generating documentation" let docDir = getOutputDir("doc") / "doc" for path in walkFiles(srcDir / "*.nim"): @@ -135,14 +178,13 @@ proc buildPhase*() = proc installPhase*() = ## Install the Nim sources if ``nimCopySources`` is ## set in the environment. - if getEnvBool"nimCopySources": + if attrs.nimCopySources: let - nf = getNimbleFilePath() - srcDir = nf.getNimbleValue("srcDir", ".") - devDir = getOutputDir "dev" + srcDir = attrs.getNimbleValue("srcDir", ".") + devDir = getOutputDir("dev") echo "Install ", srcDir, " to ", devDir copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir)) - copyFile(nf, devDir / nf.extractFilename) + copyFile(attrs.nimbleFile, devDir / attrs.nimbleFile.extractFilename) proc checkPhase*() = ## Build and run the tests in ``tests``. @@ -150,7 +192,7 @@ proc checkPhase*() = proc before(idx: int) = echo "check job ", idx, ": ", cmds[idx] for path in walkPattern("tests/t*.nim"): - cmds.add("nim r $# $#" % [getenv("nimFlags"), path]) + cmds.add("nim r $# $#" % [attrs.nimFlags.join(" "), path]) let err = execProcesses( cmds, n = 1, beforeRunEvent = before) diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index 1c59a2d98d6f..547184e50a37 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -9,13 +9,13 @@ resholve.mkDerivation (finalAttrs: { pname = "nix-direnv"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = finalAttrs.version; - hash = "sha256-AsWnRH7LAb78iFfE+ZdYyCR5AVuPloT8ZnghDXW6arY="; + hash = "sha256-3qT5mSqHi+0cskdoOGPVbuSzkoWtwOHBVXUOL84dAM8="; }; installPhase = '' diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix index 9a22bd3cf401..060f79e0ff17 100644 --- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix +++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-index"; version = "0.1.10"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "nix-community"; repo = "nix-index"; diff --git a/pkgs/by-name/no/node-core-utils/package.nix b/pkgs/by-name/no/node-core-utils/package.nix index e2026de8f56e..c560a5d6bb62 100644 --- a/pkgs/by-name/no/node-core-utils/package.nix +++ b/pkgs/by-name/no/node-core-utils/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "node-core-utils"; - version = "6.3.3"; + version = "6.4.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-core-utils"; tag = "v${finalAttrs.version}"; - hash = "sha256-NjtvCsmXWDy8Z0syi/KlZN9YtMlfuUQLjF1PmIj6Vv8="; + hash = "sha256-VGl2Tz3oErFXrmnekVAGMSYiCn4sFuTWlzn5EWvKbcw="; }; - npmDepsHash = "sha256-xSV5goCw5GmfgZ+GgsAbfH+Hds2jrdpIZoh/nZIUrwo="; + npmDepsHash = "sha256-NQSWOALsSfv2rjQW3gQDIYw28zDETRxKYaqHMPgUqew="; dontNpmBuild = true; dontNpmPrune = true; diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix index a059db197398..2c7352df28df 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -2,8 +2,6 @@ cargo-tauri, desktop-file-utils, fetchFromGitHub, - fetchpatch, - fetchurl, fetchYarnDeps, glib, gtk3, @@ -20,20 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "noriskclient-launcher-unwrapped"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "NoRiskClient"; repo = "noriskclient-launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-VChMA6XXKgtytLFOORxnpNnTrunKaIJkFge2Xu4FjG0="; + hash = "sha256-RiKFSKHnyeiIcSaOltr4qv0pEBX5wctfztZ+8yrHjnE="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = fetchurl { - url = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/937b275341191552a08757c9b4e5eb7802d54945/yarn.lock"; - hash = "sha256-IqhgDMthwEAd/rzat119Ajaf8p8LgTDEj/KrS2xVFuQ="; - }; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-VWl6YqTiBRz85GICFKGwDZRBcITGQdWE7EUzW58wHdY="; }; @@ -43,13 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # Make the launcher find java from PATH, instead of downloading its own, which is not going to work on NixOS. ./java-from-path.patch - - # The version of tauri in Cargo.toml and in package.json aren't matching, causing the build to fail. Upstream PR is https://github.com/NoRiskClient/noriskclient-launcher/pull/222. - (fetchpatch { - name = "fix-tauri-version-mismatch"; - url = "https://github.com/NoRiskClient/noriskclient-launcher/commit/937b275341191552a08757c9b4e5eb7802d54945.patch"; - hash = "sha256-jI0KnvUpSJU739BfZeYFMhtZKjno1UrWWGwMLS3I6ag="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/nq/nqptp/package.nix b/pkgs/by-name/nq/nqptp/package.nix index 932300f87e46..596775f8d33c 100644 --- a/pkgs/by-name/nq/nqptp/package.nix +++ b/pkgs/by-name/nq/nqptp/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.2.7"; + version = "1.2.8"; pname = "nqptp"; src = fetchFromGitHub { owner = "mikebrady"; repo = "nqptp"; tag = finalAttrs.version; - hash = "sha256-A87sIwn8NgfUGiCsCq/iiwcqnkfZtLbE9LrjLiWiiWc="; + hash = "sha256-f8k1MKNVMqt8Nym1+CWLC5bAKUkmPaBZYTer+EoPAgk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index f397f6026a72..a373c22a23d3 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2026-04-27"; + version = "0-unstable-2026-05-13"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "32cd1d53649bc024edd65326a5b988cd7bcf4810"; - hash = "sha256-t8OCSDI7MqA9Q9Tv4mjd/yRac2SZvhX2x8rfcbIUT9o="; + rev = "018fe3c3134d49504be652a7ace5512291545317"; + hash = "sha256-JUsFHsacED+7eTLAlfBnF9vasIHWIL/POJMCPbC9Baw="; }; installPhase = '' diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index bbffdfba295e..272dd33bec11 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -3,7 +3,7 @@ fetchurl, lib, makeWrapper, - electron_39, # as in upstream bundle, see https://github.com/NixOS/nixpkgs/pull/510075 + electron_40, # see https://github.com/NixOS/nixpkgs/pull/521495 makeDesktopItem, imagemagick, autoPatchelfHook, @@ -91,7 +91,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_39}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron_40}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix index 02b7bda379ee..5d648be6b44f 100644 --- a/pkgs/by-name/oc/ocsp-server/package.nix +++ b/pkgs/by-name/oc/ocsp-server/package.nix @@ -16,16 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ocsp-server"; - version = "0.6.1"; + version = "0.7.0"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "DorianCoding"; repo = "OCSP-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-7JYefylOs+Chqejt+hpB1AD4FTdbIhfKS1He4xAFMLo="; + hash = "sha256-Ut8z1mlPCJQjxw9hesle30OH/LDhGtZgmCyqTJ8ZzIo="; }; - cargoHash = "sha256-2wtQO6Mp4rkeklpCDKFRre5WGao7dQd+Mmma80QRo00="; + cargoHash = "sha256-cWmabU49p8Fl5xwZ8FQvlg9rySriYav5Zo/bwIdGgX4="; checkFlags = [ # Requires database access diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 0149f028048e..bd5941f7c637 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "omnictl"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-3nqyhJnJgOyegLtJchqoo6BtGbvvRaGxwo28Ef1gb4k="; + hash = "sha256-c2dYVXYH12YAvfxiCA1Rl/9y/FD7fMBEBQvvc4TmBYA="; }; - vendorHash = "sha256-6Yy/qEcZb4nheCplXmYo65NUJzImEQpRW/+g0rA3VW4="; + vendorHash = "sha256-QstTh4deaanljpFm6zEkm6ykGhUeTjK3Az9w8JROiWY="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 5182077189b4..13e3b8758f3b 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZpD0hkrm74HzIVM+xcp55nADi/+oOiJ9/WPIyWsmAg="; + hash = "sha256-f9t/BB0ldSUTaApjM75W9nw7jRC8Hp1t/KFRM/ky67s="; }; vendorHash = "sha256-m+Mb2Llny7O9cfn8Js7MEaeYM9zC/CwWBAuliWE7G1E="; diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix index d69e992e0064..2da4c9641eba 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.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "open62541pp"; repo = "open62541pp"; tag = "v${finalAttrs.version}"; - hash = "sha256-mxrAJjOwRZ85zy6zE0P4z+ToTK3goRZv0xKimUjA69M="; + hash = "sha256-BYRPHkRG2b/k1vVyOIRK1UH7MRxEpui5YTPfdO3Wx+Y="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix index 494e1f1c06dd..817dfca67bce 100644 --- a/pkgs/by-name/op/openapi-generator-cli/package.nix +++ b/pkgs/by-name/op/openapi-generator-cli/package.nix @@ -30,7 +30,7 @@ let "jdk.unsupported" ]; }; - version = "7.21.0"; + version = "7.22.0"; mainProgram = "openapi-generator-cli"; this = maven.buildMavenPackage { inherit version; @@ -41,7 +41,7 @@ let owner = "OpenAPITools"; repo = "openapi-generator"; tag = "v${version}"; - hash = "sha256-3e2JrZ+k88t3CyrkBzwkijs0yZGGwB9Se2CeSB02x6c="; + hash = "sha256-G3MuOJFXVpKNG9Y3JEVMJFxt2wWv1I1dSGuxni4JYdc="; }; patches = [ diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 8f2efe9ed76a..2af9b61a87bb 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -67,6 +67,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { # isn't patched for Nix. Disable it at source. substituteInPlace packages/desktop/src/main/constants.ts \ --replace-fail 'app.isPackaged && CHANNEL !== "dev"' 'false' + + # Relax Bun version check to be a warning instead of an error + substituteInPlace packages/script/src/index.ts \ + --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \ + 'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}' ''; configurePhase = '' diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 6a128e88368f..398cba81522d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.15.3"; + version = "1.15.5"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-OKQR76q7trKQTvlMxH8tG2jNnRtBe3YeFfvNw8c3+8I="; + hash = "sha256-HZiqia9QzkJMfRQ6bzFBsiGXNHv1WFLUdwhekE+rXM8="; }; node_modules = stdenvNoCC.mkDerivation { @@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-O6czNd9n6b0TTIsPseZn9qOlxsPzRTrePu3L6gM13oM="; + outputHash = "sha256-lxwxaFTgonMPIe2GweEVZhCMSUN/quBgV1wvV05U5wc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix index 53013299c158..cdf70ae31af8 100644 --- a/pkgs/by-name/op/opengothic/package.nix +++ b/pkgs/by-name/op/opengothic/package.nix @@ -4,12 +4,11 @@ fetchFromGitHub, glslang, lib, + libglvnd, libx11, libxcursor, - libglvnd, makeWrapper, ninja, - nix-update-script, stdenv, vulkan-headers, vulkan-loader, @@ -17,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opengothic"; - version = "1.0.3549"; + version = "1.0.3756"; src = fetchFromGitHub { owner = "Try"; repo = "OpenGothic"; - tag = "opengothic-v${finalAttrs.version}"; + rev = "refs/tags/v0.92"; fetchSubmodules = true; - hash = "sha256-dXKZPfV434HHVPgulZZEKhypR6q+uACgmoNWvNQv92w="; + hash = "sha256-6HCBmSjzV3nVDuD/7im6NtWLkDu+V+in2lUloEhp3Cc="; }; nativeBuildInputs = [ @@ -36,24 +35,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib + libglvnd libx11 libxcursor - libglvnd vulkan-headers vulkan-loader vulkan-validation-layers ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "-Werror" "" - ''; - installPhase = '' runHook preInstall install -Dm755 -t $out/bin opengothic/Gothic2Notr - install -Dm755 -t $out/lib opengothic/libTempest.so runHook postInstall ''; @@ -63,15 +56,13 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_PRELOAD : "${lib.getLib alsa-lib}/lib/libasound.so.2" ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex=^opengothic-v(.*)$" ]; - }; + passthru.updateScript = ./update.sh; meta = { description = "Open source re-implementation of Gothic 2: Night of the Raven"; homepage = "https://github.com/Try/OpenGothic"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ azahi ]; + maintainers = [ lib.maintainers.azahi ]; platforms = lib.platforms.linux; mainProgram = "Gothic2Notr"; }; diff --git a/pkgs/by-name/op/opengothic/update.sh b/pkgs/by-name/op/opengothic/update.sh new file mode 100755 index 000000000000..2b60036e784e --- /dev/null +++ b/pkgs/by-name/op/opengothic/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p curl jq common-updater-scripts +#! nix-shell -i bash + +set -euo pipefail + +release="$( + curl -s -f \ + ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + "https://api.github.com/repos/Try/OpenGothic/releases?per_page=1" | + jq -r 'first | {version: .name, tag: .tag_name}' +)" +version="$(jq -r .version <<<"$release")" +tag="$(jq -r .tag <<<"$release")" + +update-source-version opengothic "${version//opengothic-v/}" \ + --file=pkgs/by-name/op/opengothic/package.nix \ + --rev="refs/tags/$tag" \ + --print-changes diff --git a/pkgs/by-name/op/openscreen/package.nix b/pkgs/by-name/op/openscreen/package.nix index 148efac3e616..87e810e0a033 100644 --- a/pkgs/by-name/op/openscreen/package.nix +++ b/pkgs/by-name/op/openscreen/package.nix @@ -6,33 +6,38 @@ copyDesktopItems, makeWrapper, makeDesktopItem, - electron_39, + xcbuild, + electron_41, nodejs_22, nix-update-script, - - nodejs ? nodejs_22, - electron ? electron_39, }: +let + electron = electron_41; + nodejs = nodejs_22; +in buildNpmPackage (finalAttrs: { inherit nodejs; pname = "openscreen"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "siddharthvaddem"; repo = "openscreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-0L+SGbhKNvSH5IpjHjS5G1uhnoWV5oIaSs2mRSAl/mM="; + hash = "sha256-ZBWDQVYDXJ/IQGhlmscmCOMjpl03kVIdMoJXOW8OjUI="; }; - npmDepsHash = "sha256-pKfOxRzVfMNVHxA9oM9naWz024api8jxiTJwy0+6W9A="; + npmDepsHash = "sha256-SMAYgOwlZg9+/KZBUhVviOxEdMeL3Z2YdC8Hx8Q/ioY="; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build` nativeBuildInputs = [ makeWrapper copyDesktopItems + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + xcbuild ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -60,7 +65,8 @@ buildNpmPackage (finalAttrs: { npm exec electron-builder -- \ --dir \ -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false ''} runHook postBuild diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 3274990fec7e..304ebdc75fa9 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxker"; - version = "0.13.1"; + version = "0.13.2"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-NY++HK2mDcf3bWMEqJBeJr6zKVtD4qlzY+z+l/ZgPR4="; + hash = "sha256-9kJ+oUwv3hAYANJ8RtVc1P3f15ImfeqXur1h8DT90Vg="; }; - cargoHash = "sha256-AC1E7NhES2SIp64JqSBEIWltulQztQz6NnQKAT4h+eA="; + cargoHash = "sha256-Tv1+M3Xupdj7ZHsLw5eObGbw1gmVhDDDd3faY4O6mqM="; # See https://github.com/mrjackwills/oxker/issues/73 checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/pa/pa-dlna/package.nix b/pkgs/by-name/pa/pa-dlna/package.nix new file mode 100644 index 000000000000..871f73d77572 --- /dev/null +++ b/pkgs/by-name/pa/pa-dlna/package.nix @@ -0,0 +1,69 @@ +{ + lib, + curl, + fetchFromGitLab, + flac, + ffmpeg-headless, + lame, + pulseaudio, + python3, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "pa-dlna"; + version = "1.2"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitLab { + owner = "xdegaye"; + repo = "pa-dlna"; + tag = finalAttrs.version; + hash = "sha256-f0JGJwenKH/4LQv40AhmpYmzAzqkSUhdTBeB4VzqTaQ="; + }; + + postPatch = '' + substituteInPlace pa_dlna/encoders.py \ + --replace-fail "shutil.which('ffmpeg')" "'${lib.getExe ffmpeg-headless}'" \ + --replace-fail "shutil.which('flac')" "'${lib.getExe flac}'" \ + --replace-fail "shutil.which('lame')" "'${lib.getExe lame}'" + substituteInPlace pa_dlna/pa_dlna.py \ + --replace-fail "shutil.which('parec')" "'${lib.getExe' pulseaudio "parec"}'" + substituteInPlace systemd/pa-dlna.service \ + --replace-fail "/usr/bin/pa-dlna" "$out/bin/pa-dlna" + ''; + + build-system = [ python3.pkgs.flit-core ]; + + dependencies = with python3.pkgs; [ + libpulse + psutil + systemd-python + ]; + + postInstall = '' + install systemd/pa-dlna.service -Dt $out/share/systemd/user/ + ''; + + nativeCheckInputs = [ + curl + ffmpeg-headless + python3.pkgs.pytestCheckHook + ]; + + disabledTests = [ + # path to parec is patched and which breaks the mocking + "test_no_parec" + ]; + + pythonImportsCheck = [ "pa_dlna" ]; + + meta = { + description = "UPnP control point forwarding PulseAudio streams to DLNA devices"; + homepage = "https://gitlab.com/xdegaye/pa-dlna"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + mainProgram = "pa-dlna"; + }; +}) diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix index 331835719e4e..b8765bd109c7 100644 --- a/pkgs/by-name/pa/pangolin-cli/package.nix +++ b/pkgs/by-name/pa/pangolin-cli/package.nix @@ -10,20 +10,20 @@ buildGoModule (finalAttrs: { pname = "pangolin-cli"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fosrl"; repo = "cli"; tag = finalAttrs.version; - hash = "sha256-3p2yazDYKORVanPOQNY0XDhj1RbvBcFztKa7oosFW98="; + hash = "sha256-LMLeJVYu2L1+FVOLNapEShj36zv8vCP9BVkU4Y/g0vc="; }; ldflags = [ "-X github.com/fosrl/cli/internal/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-J6dILAwneeUL/+c6505F24xjg6Nus8t4L3vUAMbaeHM="; + vendorHash = "sha256-r7Tbs05jRlIX1zLRMVqzvDth4+yaMUck2q6R3uPHAWs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pc/pcb2gcode/boost-1.89.patch b/pkgs/by-name/pc/pcb2gcode/boost-1.89.patch new file mode 100644 index 000000000000..42e070046374 --- /dev/null +++ b/pkgs/by-name/pc/pcb2gcode/boost-1.89.patch @@ -0,0 +1,20 @@ +--- a/src/units.hpp ++++ b/src/units.hpp +@@ -370,7 +370,7 @@ + } + + namespace BoardSide { +-enum BoardSide { ++enum BoardSide : int { + AUTO, + FRONT, + BACK +@@ -433,7 +433,7 @@ + } // namespace Software + + namespace MillFeedDirection { +-enum MillFeedDirection { ++enum MillFeedDirection : int { + ANY, + CLIMB, + CONVENTIONAL diff --git a/pkgs/by-name/pc/pcb2gcode/package.nix b/pkgs/by-name/pc/pcb2gcode/package.nix index 717c8a5543c1..2fb79f1b4be9 100644 --- a/pkgs/by-name/pc/pcb2gcode/package.nix +++ b/pkgs/by-name/pc/pcb2gcode/package.nix @@ -2,48 +2,53 @@ stdenv, lib, fetchFromGitHub, - autoreconfHook, + cmake, pkg-config, boost, glibmm, gtkmm2, gerbv, + geos, librsvg, }: stdenv.mkDerivation (finalAttrs: { pname = "pcb2gcode"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Vjv80QPrJyEYqHFbXR2n68csAWfCMMmi4NEZYe8/DcY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tuVEtynzC9VBBm5tNNkdSr8Rrj3Oy5QOI6jNTmsIXbs="; }; - configureFlags = [ - (lib.withFeatureAs true "boost" boost.dev) + patches = [ + ./boost-1.89.patch ]; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config ]; + cmakeFlags = [ + (lib.cmakeBool "PCB2GCODE_COMPILE_WARNING_AS_ERROR" false) + ]; + + preConfigure = lib.optionalString stdenv.isDarwin '' + export CXXFLAGS="$CXXFLAGS -fpermissive -Wno-error=c++20-extensions -Wno-error=invalid-constexpr" + ''; + buildInputs = [ boost glibmm gtkmm2 gerbv + geos librsvg ]; - postPatch = '' - substituteInPlace ./Makefile.am \ - --replace '`git describe --dirty --always --tags`' '${finalAttrs.version}' - ''; - meta = { description = "Command-line tool for isolation, routing and drilling of PCBs"; longDescription = '' diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 7b63b0d96d30..eb12eed318d7 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -22,6 +22,7 @@ fetchzip, lib, stdenv, + bashInteractive, # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the @@ -31,7 +32,7 @@ fuse, gsettings-desktop-schemas, gtk3, - libdbusmenu-gtk2, + libdbusmenu-gtk3, libgbm, libxdamage, nss, @@ -40,13 +41,13 @@ let pname = "pcloud"; - version = "2.0.4"; - code = "XZNttt5ZD5h5yXmbVPHHIIr4nEUwduLH837X"; + version = "2.1.0"; + code = "XZC8VU5ZEmdCknyJULblvtv3890nA80TSUiX"; # 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-VINx6xM8/unPC9xopV2ml64wqU0FdhZdGTnxLUpCiyY="; + hash = "sha256-vdQn1jIc44dGxUgK2xJMbVNObdF3hh8NvZi/YKpf+is="; }; in @@ -72,11 +73,12 @@ stdenv.mkDerivation { dbus-glib fuse gtk3 - libdbusmenu-gtk2 + libdbusmenu-gtk3 libgbm libxdamage nss udev + bashInteractive ]; installPhase = '' @@ -128,6 +130,7 @@ stdenv.mkDerivation { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; changelog = "https://www.pcloud.com/release-notes/linux.html"; + downloadPage = "https://www.pcloud.com/release-notes/linux.html"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ patryk27 ]; diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 7bea384b5bf8..468afa3b1c5b 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-OA9Wt8nkXaYRu2gE9jyL6CYGv3OQd5uFUZQ1jCxD0KE="; + hash = "sha256-lvgiVjNbXWKrEYe8kCgAi4hwdvawZysjGJiDSInKYsM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ph/phpantom-lsp/package.nix b/pkgs/by-name/ph/phpantom-lsp/package.nix new file mode 100644 index 000000000000..d3196b088358 --- /dev/null +++ b/pkgs/by-name/ph/phpantom-lsp/package.nix @@ -0,0 +1,67 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + _experimental-update-script-combinators, + nix-update-script, +}: + +let + stubsSrc = fetchFromGitHub { + owner = "JetBrains"; + repo = "phpstorm-stubs"; + rev = "3327932472f512d2eb9e122b19702b335083fd9d"; + hash = "sha256-WN5DAvaw4FfHBl2AqSo1OcEthUm3lOpikdB78qy3cyY="; + }; +in + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "phpantom-lsp"; + version = "0.7.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "AJenbo"; + repo = "phpantom_lsp"; + tag = finalAttrs.version; + hash = "sha256-ZmtOdoxXkwn2IDg7RyQ9KG0RNz5mrGDMcESfcOSR3Ig="; + }; + + postPatch = '' + mkdir -p stubs/jetbrains + cp -a ${finalAttrs.passthru.stubsSrc} stubs/jetbrains/phpstorm-stubs + chmod u+wx stubs/jetbrains/phpstorm-stubs + + echo "${finalAttrs.passthru.stubsSrc.rev}" \ + > stubs/jetbrains/phpstorm-stubs/.commit + ''; + + cargoHash = "sha256-pXP4qItYgmUXVx9XwMdS6WLVc5lP7P4VX9+0TbhYrUc="; + + checkFlags = [ + "--test" + "completion_inheritance" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru = { + inherit stubsSrc; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + ./update-php-stubs.sh + ]; + }; + + meta = { + changelog = "https://github.com/AJenbo/phpantom_lsp/releases/tag/${finalAttrs.src.tag}"; + description = "Fast, lightweight PHP language server written in Rust"; + homepage = "https://github.com/AJenbo/phpantom_lsp"; + license = lib.licenses.mit; + mainProgram = "phpantom_lsp"; + maintainers = with lib.maintainers; [ nanoyaki ]; + }; +}) diff --git a/pkgs/by-name/ph/phpantom-lsp/update-php-stubs.sh b/pkgs/by-name/ph/phpantom-lsp/update-php-stubs.sh new file mode 100755 index 000000000000..613aef6b972e --- /dev/null +++ b/pkgs/by-name/ph/phpantom-lsp/update-php-stubs.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p bash curl gnused gnugrep nix-prefetch-github jq + +file="./pkgs/by-name/ph/phpantom-lsp/package.nix" + +version="$(grep -oP 'version = "\K[\d\.]+' "$file")" +curl -O "https://raw.githubusercontent.com/AJenbo/phpantom_lsp/refs/tags/$version/stubs.lock" +stubsVersion="$(grep -oP 'commit = "\K[^"]+' ./stubs.lock)" +rm stubs.lock + +stubsHash="$( + nix-prefetch-github --rev "$stubsVersion" "JetBrains" "phpstorm-stubs" --json \ + 2> /dev/null \ + | jq -r '.hash' +)" + +sed -i 's/\(rev = "\)[^"]*/\1'"$stubsVersion"'/' "$file" +sed -i '/stubsSrc/,/}/ s#\(hash = "\)[^"]*#\1'"$stubsHash"'#' "$file" diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix index 1131c873a1da..e49ec666243e 100644 --- a/pkgs/by-name/ph/phpstan/package.nix +++ b/pkgs/by-name/ph/phpstan/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpstan"; - version = "2.1.54"; + version = "2.1.55"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan"; tag = finalAttrs.version; - hash = "sha256-N13KtgGnJKQoutu4X0mTYsma9c0WUpNH+xaUOBwRRPM="; + hash = "sha256-Mh0pHxn+SyQ5qQiesljBtiDycLuarLBLrKSu9gF7oaM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index cd15401c5004..a979e9e1ff07 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -11,16 +11,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.73.0"; + version = "0.75.3"; src = fetchFromGitHub { - owner = "badlogic"; - repo = "pi-mono"; + owner = "earendil-works"; + repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-oE4zMH5KEH185Vdp0CE221sa9rJJw35jFLlfhTa3Sg4="; + hash = "sha256-c/+cxkp/EZ2PLERxTENN5edXHEs7M2oqzNepjRA4TIE="; }; - npmDepsHash = "sha256-rBlAzAnP9aif1tZ984AO4HftIJsDgLQ+02J3td4jcRg="; + npmDepsHash = "sha256-/mWjrZFzRmtkbWYMJOXKnLPxFITFndq5hgdY0DnPfAg="; npmWorkspace = "packages/coding-agent"; @@ -53,9 +53,9 @@ buildNpmPackage (finalAttrs: { local nm="$out/lib/node_modules/pi-monorepo/node_modules" # Replace workspace deps needed at runtime with real copies - for ws in @mariozechner/pi-ai:packages/ai \ - @mariozechner/pi-agent-core:packages/agent \ - @mariozechner/pi-tui:packages/tui; do + for ws in @earendil-works/pi-ai:packages/ai \ + @earendil-works/pi-agent-core:packages/agent \ + @earendil-works/pi-tui:packages/tui; do IFS=: read -r pkg src <<< "$ws" rm "$nm/$pkg" cp -r "$src" "$nm/$pkg" @@ -93,8 +93,8 @@ buildNpmPackage (finalAttrs: { meta = { description = "Coding agent CLI with read, bash, edit, write tools and session management"; homepage = "https://pi.dev/"; - downloadPage = "https://www.npmjs.com/package/@mariozechner/pi-coding-agent"; - changelog = "https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md"; + downloadPage = "https://www.npmjs.com/package/@earendil-works/pi-coding-agent"; + changelog = "https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ munksgaard ]; mainProgram = "pi"; diff --git a/pkgs/by-name/pi/pigpio/package.nix b/pkgs/by-name/pi/pigpio/package.nix index 9bd2683c82ec..a3ea10b44875 100644 --- a/pkgs/by-name/pi/pigpio/package.nix +++ b/pkgs/by-name/pi/pigpio/package.nix @@ -26,7 +26,7 @@ mkDerivation rec { hash = "sha256-Z+SwUlBbtWtnbjTe0IghR3gIKS43ZziN0amYtmXy7HE="; }; - NIX_CFLAGS_COMPILE = "-std=gnu17"; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json index 81ee95e55a6f..dd907060b689 100644 --- a/pkgs/by-name/pi/piliplus/git-hashes.json +++ b/pkgs/by-name/pi/piliplus/git-hashes.json @@ -3,11 +3,13 @@ "chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=", "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=", "extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=", + "file_picker": "sha256-qbbO532AN54xpJSQhZ9F2yVN6fmKWcz3x8jPzMiIetE=", "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=", "flutter_smart_dialog": "sha256-sehrQraEWmYvUd9pdG4l3edbtR4yTcJOqPbuhzIrih4=", "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=", + "font_awesome_flutter": "sha256-EcrAmglNHxm16gWTi4nYbTfKx0CCprllIyvlvYlz8wY=", "get": "sha256-zQ2m29nKCEjGvresMaDBo1oYfQ6WrFVbMSitcGmxyhU=", - "material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=", + "material_design_icons_flutter": "sha256-t2ENlgb3ZRIc6jvufVwKGcty+3Te6/+XP10YDBrosYM=", "media_kit": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "media_kit_libs_android_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "media_kit_libs_ios_video": "sha256-mB3GN5Sc4oxUaW7xOgORaRzP9hKcRpcPxhmraKs/AMg=", @@ -16,8 +18,8 @@ "media_kit_native_event_loop": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "media_kit_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=", "native_device_orientation": "sha256-8abnUV7ZTAo0DAjekf353ey6xFvxfilTfbQOUWIahtk=", - "screen_brightness_android": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=", - "screen_brightness_platform_interface": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=", + "screen_brightness_android": "sha256-iKH0yi89HxEe+yNpFvMpL7jJ5X6AbfeSBz3adIGkFtY=", + "screen_brightness_platform_interface": "sha256-iKH0yi89HxEe+yNpFvMpL7jJ5X6AbfeSBz3adIGkFtY=", "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=", "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=", "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo=" diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix index 2b100ce4b535..a4d2b83478df 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -14,7 +14,7 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; - version = "2.0.7"; + version = "2.0.7.2"; in flutter341.buildFlutterApplication { pname = "piliplus"; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index cd591fe1d4d2..544c1c2ab446 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -442,16 +442,6 @@ "source": "hosted", "version": "1.0.2" }, - "cupertino_icons": { - "dependency": "direct main", - "description": { - "name": "cupertino_icons", - "sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.9" - }, "dart_style": { "dependency": "transitive", "description": { @@ -657,12 +647,13 @@ "file_picker": { "dependency": "direct main", "description": { - "name": "file_picker", - "sha256": "1d4afa261268e59863af47b9f9dd9a230502d4c702b9d9183353646fe6d5b6e1", - "url": "https://pub.dev" + "path": ".", + "ref": "dev", + "resolved-ref": "8cf6cfa7078aa69c2c7b08d9ad636a1040456852", + "url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git" }, - "source": "hosted", - "version": "12.0.0-beta.1" + "source": "git", + "version": "12.0.0-beta.3" }, "file_selector_linux": { "dependency": "transitive", @@ -943,11 +934,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9", + "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.4" + "version": "2.3.0" }, "flutter_test": { "dependency": "direct dev", @@ -984,11 +975,12 @@ "font_awesome_flutter": { "dependency": "direct main", "description": { - "name": "font_awesome_flutter", - "sha256": "f50ce90dbe26d977415b9540400d6778bef00894aced6358ae578abd92b14b10", - "url": "https://pub.dev" + "path": ".", + "ref": "v10.9.0", + "resolved-ref": "cf4a19ece5cb296d73d90f0d73106f779c85fa26", + "url": "https://github.com/bggRGjQaUbCoE/font_awesome_flutter.git" }, - "source": "hosted", + "source": "git", "version": "10.9.0" }, "get": { @@ -1036,11 +1028,11 @@ "dependency": "transitive", "description": { "name": "gtk", - "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "hive_ce": { "dependency": "direct main", @@ -1417,7 +1409,7 @@ "description": { "path": ".", "ref": "const", - "resolved-ref": "c11f18c031f1045900dc3e817f7519eb863c2550", + "resolved-ref": "2bb68d1de3c7bb8c6117fce54d43da65a2387163", "url": "https://github.com/bggRGjQaUbCoE/material_design_icons_flutter.git" }, "source": "git", @@ -1916,32 +1908,32 @@ "description": { "path": "screen_brightness_android", "ref": "dev", - "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9", + "resolved-ref": "9823a66d9a0af8d9f5d0d9e98f87bb17e399235e", "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git" }, "source": "git", - "version": "2.1.3" + "version": "2.1.4" }, "screen_brightness_ios": { "dependency": "direct overridden", "description": { "name": "screen_brightness_ios", - "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5", + "sha256": "0792d8f98852558f831b4b75241c46047b884598b3f4d982b37dc2dd43e2b2e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "screen_brightness_platform_interface": { "dependency": "direct main", "description": { "path": "screen_brightness_platform_interface", "ref": "dev", - "resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9", + "resolved-ref": "9823a66d9a0af8d9f5d0d9e98f87bb17e399235e", "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git" }, "source": "git", - "version": "2.1.0" + "version": "2.1.1" }, "screen_retriever": { "dependency": "direct main", @@ -1997,11 +1989,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "1f78300740739ff4b4920802687879231554350eab73eb229778f463aabda440", + "sha256": "f04095a25ff02b202a914174c73ec309570aa93d61098cb4a0a9e715b4aaa465", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.19.0" + "version": "9.20.0" }, "share_plus": { "dependency": "direct main", @@ -2163,11 +2155,11 @@ "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "5e8377564d95166761a968ed96104e0569b6b6cc611faac92a36ab8a169112c3", + "sha256": "f8a08a13fb8f0f8c590df89d745000bed44a673ed94bac846739e1a016875c21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.6+1" + "version": "2.5.7" }, "sqflite_darwin": { "dependency": "transitive", @@ -2384,11 +2376,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", + "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "url_launcher_windows": { "dependency": "transitive", @@ -2414,11 +2406,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "6409a25046024f0f8c5d8a59fec314081e81f9d436b66ca4015a8b49772bf445", + "sha256": "4d35a36400983c3457c289d4d553b5308f506ea84f7e51c7a564651b5525209a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.1" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2434,11 +2426,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74", + "sha256": "98e7e94de127b46a86ef46197fff84ff99f3d3b80a708390d717ad731efef598", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.2" }, "vector_math": { "dependency": "direct main", @@ -2484,11 +2476,11 @@ "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "14b2e5b9e35c2631e656913c47adecdd71633ae92896a27a64c8f1fcfabc21cc", + "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.5.1" }, "watcher": { "dependency": "transitive", @@ -2555,11 +2547,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "ba7d5750e3441caa1bbe31d9e516348fcf8dfcb32aa29ef87a844a59f4d1f1d0", + "sha256": "a1fc9eb9248baa05dfc12ed5b66e377b3e23f095eec078e0371622b9033810d9", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "6.2.0" }, "win32_registry": { "dependency": "transitive", diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index b9bda4a36985..8165c9470dd4 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,6 +1,6 @@ { - "rev": "b7b40c557e708ace77ed65098005193eb89b8208", - "revCount": 4940, - "commitDate": 1777948879, - "hash": "sha256-E0ezM87Ecw54XD/MccPhRjg4iQ8LJRewQKbH/bPV9MI=" + "rev": "ad6c0e0d157650a76d22c3634cd93f433ed6eeb0", + "revCount": 4956, + "commitDate": 1778812800, + "hash": "sha256-yLbivIJHYtRfmlAeR78GY6+9vKZtLePc0uID/JxgHng=" } diff --git a/pkgs/by-name/pi/pilot-link/configure-checks.patch b/pkgs/by-name/pi/pilot-link/configure-checks.patch deleted file mode 100644 index 4533d463cff8..000000000000 --- a/pkgs/by-name/pi/pilot-link/configure-checks.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- pilot-link/configure.ac -+++ pilot-link/configure.ac -@@ -63,8 +63,8 @@ - dnl Eat -Werror so configure will run properly, if the user provided it - enable_werror=no - save_CFLAGS="$CFLAGS" --CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g) --CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g) -+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g') -+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g') - if test "x$CFLAGS" != "x$save_CFLAGS"; then - dnl -Werror was set; treat it as implicit --enable-werror below - enable_werror="yes" -@@ -392,11 +392,8 @@ - dnl Determine if system popt is good enough - save_LIBS="$LIBS" - AC_CHECK_HEADER(popt.h, -- AC_CHECK_DECL(POPT_BIT_SET, -- AC_CHECK_LIB(popt, poptStrippedArgv,, -- [with_included_popt="yes"]), -- [with_included_popt="yes"], -- [#include ]), -+ AC_CHECK_LIB(popt, poptStrippedArgv,, -+ [with_included_popt="yes"]), - [with_included_popt="yes"] - ) - LIBS="$save_LIBS" diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index ea3f75aad9b9..dab17aea2417 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -19,20 +19,19 @@ stdenv.mkDerivation { pname = "pilot-link"; - version = "0.13.0-unstable-2022-09-26"; + version = "0.13.0-unstable-2026-04-25"; src = fetchFromGitHub { owner = "desrod"; repo = "pilot-link"; - rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf"; - hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I"; + rev = "fa3c832fb0aabd9465664309168abf278fd38f2a"; + hash = "sha256-EZwE2iO1QZCzv5uVYTpUaHS9tIlBASs5W8i9f3QV4Ks="; }; # Resolve build issues on modern systems. # https://github.com/desrod/pilot-link/issues/16 # https://aur.archlinux.org/packages/pilot-link-git patches = [ - ./configure-checks.patch ./incompatible-pointer-type.patch ] ++ lib.optionals enableConduits [ ./format-string-literals.patch ] diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index 7067c8e219de..010ab8d57272 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi-pack"; - version = "0.7.6"; + version = "0.7.8"; src = fetchFromGitHub { owner = "Quantco"; repo = "pixi-pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-j9b+wpVUvEU/0R3inMO12TUs65Avtn3NU11gEE4hxLM="; + hash = "sha256-/r1jiEH/6TKUA4WJBH+h7Ktn13Woqz36U+ARmWbCbrU="; }; - cargoHash = "sha256-22fE8XFTt10mUGl1jYb8UgoxD/rBlX4dNkjKEgtgAR8="; + cargoHash = "sha256-etcfU+KU8y7KeWXRUXe+lig+9BxnZf1cGfS8WHxlbn0="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/pl/plandex-server/package.nix b/pkgs/by-name/pl/plandex-server/package.nix deleted file mode 100644 index 06fb08e5248b..000000000000 --- a/pkgs/by-name/pl/plandex-server/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - makeWrapper, - git, -}: -buildGoModule (finalAttrs: { - pname = "plandex-server"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "plandex-ai"; - repo = "plandex"; - rev = "server/v${finalAttrs.version}"; - hash = "sha256-RVvgnQtb/asOjVpSZ3WndimsJ6foERMWS/YD20sghVE="; - }; - - postPatch = '' - substituteInPlace db/db.go \ - --replace-fail "file://migrations" "file://$out/migrations" - ''; - - postInstall = '' - cp -r migrations $out/migrations - ''; - - postFixup = '' - wrapProgram $out/bin/plandex-server \ - --prefix PATH : ${lib.makeBinPath [ git ]} - ''; - - nativeBuildInputs = [ makeWrapper ]; - - nativeCheckInputs = [ git ]; - - sourceRoot = "${finalAttrs.src.name}/app/server"; - - vendorHash = "sha256-uarTWteOoAjzEHSnbZo+fEPELerpuL7UNA5pdGP5CMY="; - - meta = { - mainProgram = "plandex-server"; - description = "AI driven development in your terminal. Designed for large, real-world tasks. The server part"; - homepage = "https://plandex.ai/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ viraptor ]; - }; -}) diff --git a/pkgs/by-name/pl/plandex/package.nix b/pkgs/by-name/pl/plandex/package.nix deleted file mode 100644 index 693b0c2d6120..000000000000 --- a/pkgs/by-name/pl/plandex/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule (finalAttrs: { - pname = "plandex"; - version = "2.1.2"; - - src = fetchFromGitHub { - owner = "plandex-ai"; - repo = "plandex"; - rev = "cli/v${finalAttrs.version}"; - hash = "sha256-mNNL1K+gNhYDuKpGt3FP/L4JxO/bHyebhABOpFjLLLI="; - }; - - ldflags = [ - "-X plandex-cli/version.Version=${finalAttrs.version}" - ]; - - sourceRoot = "${finalAttrs.src.name}/app/cli"; - - vendorHash = "sha256-0wYlCxg0CPPizdhJ1VfZEEcauy2rJeeTqPiiqsExBu8="; - - meta = { - mainProgram = "plandex"; - description = "AI driven development in your terminal. Designed for large, real-world tasks. The cli part"; - homepage = "https://plandex.ai/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ viraptor ]; - }; -}) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index e0828ef3143c..0c7fb926911b 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -24,17 +24,18 @@ libsoup_3, libspelling, sqlite, + icu, }: stdenv.mkDerivation (finalAttrs: { pname = "planify"; - version = "4.19.0"; + version = "4.19.3"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; tag = "v${finalAttrs.version}"; - hash = "sha256-swZ8kpfDLxe48PqHLiCjxYbsS7RILCPTPHybtrJi0rA="; + hash = "sha256-811T28jvPTHwNDlR03Ym2f6RPq0N3FLZFqnThBIW1CU="; }; nativeBuildInputs = [ @@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 libspelling sqlite + icu ]; meta = { diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 8831fbdb1773..8d64ba3b4ae7 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 = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-T2LodP2E5R1NtuTNPxzUNenbs6P3Ur1kbEIHGRbzah0="; + hash = "sha256-OyOFQZzsWRbsvv0jAFRXWo4AMeu4t1KMtubg3R/jb50="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/pleroma/mix.nix b/pkgs/by-name/pl/pleroma/mix.nix index 391703350132..14f404c78941 100644 --- a/pkgs/by-name/pl/pleroma/mix.nix +++ b/pkgs/by-name/pl/pleroma/mix.nix @@ -46,12 +46,12 @@ let bandit = buildMix rec { name = "bandit"; - version = "1.5.7"; + version = "1.10.4"; src = fetchHex { pkg = "bandit"; version = "${version}"; - sha256 = "f2dd92ae87d2cbea2fa9aa1652db157b6cba6c405cb44d4f6dd87abba41371cd"; + sha256 = "a5faf501042ac1f31d736d9d4a813b3db4ef812e634583b6a457b0928798a51d"; }; beamDeps = [ @@ -853,12 +853,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.2"; + version = "1.20.1"; src = fetchHex { pkg = "hackney"; version = "${version}"; - sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ @@ -1139,12 +1139,12 @@ let mimerl = buildRebar3 rec { name = "mimerl"; - version = "1.4.0"; + version = "1.5.0"; src = fetchHex { pkg = "mimerl"; version = "${version}"; - sha256 = "13af15f9f68c65884ecca3a3891d50a7b57d82152792f3e19d88650aa126b144"; + sha256 = "db648ce065bae14ea84ca8b5dd123f42f49417cef693541110bf6f9e9be9ecc4"; }; beamDeps = [ ]; @@ -1330,6 +1330,40 @@ let ]; }; + oban_met = buildMix rec { + name = "oban_met"; + version = "1.0.5"; + + src = fetchHex { + pkg = "oban_met"; + version = "${version}"; + sha256 = "64664d50805bbfd3903aeada1f3c39634652a87844797ee400b0bcc95a28f5ea"; + }; + + beamDeps = [ oban ]; + }; + + oban_web = buildMix rec { + name = "oban_web"; + version = "2.11.6"; + + src = fetchHex { + pkg = "oban_web"; + version = "${version}"; + sha256 = "576d94b705688c313694c2c114ca21aa0f8f2ad1b9ca45c052c5ba316d3e8d10"; + }; + + beamDeps = [ + jason + oban + oban_met + phoenix + phoenix_html + phoenix_live_view + phoenix_pubsub + ]; + }; + octo_fetch = buildMix rec { name = "octo_fetch"; version = "0.4.0"; @@ -1458,12 +1492,14 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.19.5"; + version = "1.1.19"; + builInputs = [ + ]; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; + sha256 = "sha256-1a01fWshVipbQx8K0J3+dtuc5WSMaUnxqsM0yMRFXTI="; }; beamDeps = [ @@ -1472,8 +1508,10 @@ let phoenix_html phoenix_template phoenix_view + plug telemetry ]; + }; phoenix_pubsub = buildMix rec { @@ -1540,12 +1578,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.18.1"; + version = "1.19.1"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "57a57db70df2b422b564437d2d33cf8d33cd16339c1edb190cd11b1a3a546cc2"; + sha256 = "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"; }; beamDeps = [ @@ -1740,6 +1778,19 @@ let beamDeps = [ ]; }; + quic = buildRebar3 rec { + name = "quic"; + version = "0.10.2"; + + src = fetchHex { + pkg = "quic"; + version = "${version}"; + sha256 = "7c196a66973c877a59768a5687f0a0610ff11817254d0a4e45cc4e3a16b1d00b"; + }; + + beamDeps = [ ]; + }; + ranch = buildRebar3 rec { name = "ranch"; version = "2.2.0"; @@ -1969,12 +2020,12 @@ let thousand_island = buildMix rec { name = "thousand_island"; - version = "1.3.14"; + version = "1.4.3"; src = fetchHex { pkg = "thousand_island"; version = "${version}"; - sha256 = "d0d24a929d31cdd1d7903a4fe7f2409afeedff092d277be604966cd6aa4307ef"; + sha256 = "6e4ce09b0fd761a58594d02814d40f77daff460c48a7354a15ab353bb998ea0b"; }; beamDeps = [ telemetry ]; @@ -2077,16 +2128,15 @@ let vix = buildMix rec { name = "vix"; - version = "0.26.0"; + version = "0.36.0"; src = fetchHex { pkg = "vix"; version = "${version}"; - sha256 = "71b0a79ae7f199cacfc8e679b0e4ba25ee47dc02e182c5b9097efb29fbe14efd"; + sha256 = "92f912b4e90c453f92942742105bcdb367ad53406759da251bd2e587e33f4134"; }; beamDeps = [ - castore cc_precompiler elixir_make ]; diff --git a/pkgs/by-name/pl/pleroma/package.nix b/pkgs/by-name/pl/pleroma/package.nix index ffe434bf14f9..f2459737c136 100644 --- a/pkgs/by-name/pl/pleroma/package.nix +++ b/pkgs/by-name/pl/pleroma/package.nix @@ -2,7 +2,7 @@ beam, lib, fetchFromGitHub, - fetchFromGitLab, + fetchFromForgejo, fetchHex, file, cmake, @@ -19,14 +19,14 @@ let in beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.10.0"; + version = "2.10.2"; - src = fetchFromGitLab { + src = fetchFromForgejo { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-kW4AcOYHtm8lVXRroDCUM7jY7o39JHx/J/mfy2XfBgs="; + sha256 = "sha256-5BFzV2alNDjO/bS08+V4idzFaXQLr+4pNlLLXayBqIE="; }; patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ]; @@ -72,7 +72,7 @@ beamPackages.mixRelease rec { name = "captcha"; version = "0.1.0"; - src = fetchFromGitLab { + src = fetchFromForgejo { domain = "git.pleroma.social"; owner = "pleroma/elixir-libraries"; repo = "elixir-captcha"; @@ -96,7 +96,7 @@ beamPackages.mixRelease rec { oban_plugins_lazarus = beamPackages.buildMix { name = "oban_plugins_lazarus"; version = "0.1.0"; - src = fetchFromGitLab { + src = fetchFromForgejo { domain = "git.pleroma.social"; owner = "pleroma/elixir-libraries"; repo = "oban_plugins_lazarus"; @@ -109,7 +109,7 @@ beamPackages.mixRelease rec { name = "remote_ip"; version = "0.1.5"; - src = fetchFromGitLab { + src = fetchFromForgejo { domain = "git.pleroma.social"; owner = "pleroma/elixir-libraries"; repo = "remote_ip"; @@ -136,15 +136,23 @@ beamPackages.mixRelease rec { syslog = prev.syslog.override { buildPlugins = with beamPackages; [ pc ]; }; + phoenix_live_view = prev.phoenix_live_view.override { + # This listener breaks with elixir 1.18. + # It's only using for dev, let's remove it. + postPatch = '' + sed -i '/listeners: \[Phoenix.CodeReloader\]/d' mix.exs + ''; + }; + + oban_web = prev.oban_web.override { + # This listener breaks with elixir 1.18. + # It's only using for dev, let's remove it. + postPatch = '' + sed -i '/listeners: \[Phoenix.CodeReloader\]/d' mix.exs + ''; + }; + vix = prev.vix.override { - # TOREMOVE override when upstream bumps the dependency. See - # https://git.pleroma.social/pleroma/pleroma/-/issues/3393 - src = fetchFromGitHub { - owner = "akash-akya"; - repo = "vix"; - tag = "v0.36.0"; - hash = "sha256-14gqzu5TBbgrqCU4+qz0jWCK6Ar5JvmKKLcfgz5BHtw="; - }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ vips diff --git a/pkgs/by-name/pl/plutosvg/package.nix b/pkgs/by-name/pl/plutosvg/package.nix index b2f9bd0f5aab..06646aa52a16 100644 --- a/pkgs/by-name/pl/plutosvg/package.nix +++ b/pkgs/by-name/pl/plutosvg/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, validatePkgConfig, testers, @@ -14,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutosvg"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutosvg"; tag = "v${finalAttrs.version}"; - hash = "sha256-4JLk4+O9Tf8CGxMP0aDN70ak/8teZH3GWBWlrIkPQm4="; + hash = "sha256-+Fo1B9jH/jjcSkrW5Hm6giIYm7zYh7puFFhC6er7XIM="; }; outputs = [ @@ -31,11 +30,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # https://github.com/sammycage/plutosvg/pull/29 ./0001-Emit-correct-pkg-config-file-if-paths-are-absolute.patch - # https://github.com/sammycage/plutosvg/pull/31 - (fetchpatch { - url = "https://github.com/sammycage/plutosvg/commit/17d60020e0b24299fae0e7df37637448b3b51488.patch"; - hash = "sha256-hY25ttsLQwvtQmDeOGSoCVDy34GUA0tNai/L3wpmPUo="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix index 68fce8f15a4e..e4c2cdb7f16e 100644 --- a/pkgs/by-name/pl/plutovg/package.nix +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutovg"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutovg"; tag = "v${finalAttrs.version}"; - hash = "sha256-4TvbNsElDL7WX3yXLDM5nwHFCHQdUclk6HQ5MbPUEZE="; + hash = "sha256-JP/nNHszTABIat79vcUqFdtv+/Z13D28aYKEt7BALCw="; }; cmakeFlags = [ diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index 73c15366fd25..d310814f1cc7 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "plymouth"; - version = "24.004.60"; + version = "26.134.222"; outputs = [ "out" @@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = finalAttrs.version; - hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM="; + tag = finalAttrs.version; + hash = "sha256-TarN9NLWzYmE9GS/rtaa0w8SVOES86sUMZWbnsgRDHY="; }; patches = [ @@ -49,13 +49,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./fix-paths.patch { fcmatch = "${fontconfig}/bin/fc-match"; }) - - # fix build without udev, see https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/382 - drop on next release - (fetchpatch { - name = "fix-build-without-udev.patch"; - url = "https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/f1ce78764482699b28f60c89af1a071ea0ae13ca.patch"; - hash = "sha256-t5xt/scO8mVwESU8pFPTSXILd0FhmG/XRZ8O/4baQB8="; - }) ]; strictDeps = true; diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index 6e9ad66cb18c..24c1f88ab5c1 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -18,12 +18,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.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-Rv6JCHsqu5rRvihGaUFcRk/NUT90bnIUM01QxUUkxh4="; + hash = "sha256-i9EucMsoX8Z0iyhNDVYaczv1CSY/KaZpMjn/FGzIJU4="; }; }); } diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index b8ef0e1c4d86..c56b56b66d23 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "poetry"; - version = "2.3.4"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-2qREmUJpoOPh8QHQErLwn9M5TuEzjoruHJ8qmwlEjyI="; + hash = "sha256-Mb1etVmBm542q7FrcMU6pzXdMUDQSpI8DFg/gbOiG4U="; }; build-system = [ diff --git a/pkgs/by-name/po/polychromatic/package.nix b/pkgs/by-name/po/polychromatic/package.nix index ddf6499988ad..5e5f7c11dacf 100644 --- a/pkgs/by-name/po/polychromatic/package.nix +++ b/pkgs/by-name/po/polychromatic/package.nix @@ -4,7 +4,6 @@ gettext, ninja, meson, - sassc, python3Packages, gobject-introspection, wrapGAppsHook3, @@ -18,35 +17,27 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "polychromatic"; - version = "0.9.3"; + version = "0.9.7"; pyproject = false; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; tag = "v${finalAttrs.version}"; - hash = "sha256-fw4XLaivf8kRkNaemHvd9zcVKn87ZZhP+ZDJsCJHv/4="; + hash = "sha256-2Uo6/74o+cSQQsYsE+7nVDsetnaYjQzL8xkJhUN3E2o="; }; postPatch = '' patchShebangs scripts - substituteInPlace scripts/build-styles.sh \ - --replace-fail '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ - --replace-fail '$(which sass 2>/dev/null)' '${sassc}/bin/sass' substituteInPlace polychromatic/paths.py \ --replace-fail "/usr/share/polychromatic" "$out/share/polychromatic" ''; - preConfigure = '' - scripts/build-styles.sh - ''; - nativeBuildInputs = [ gettext gobject-introspection meson ninja - sassc wrapGAppsHook3 qt6.wrapQtAppsHook qt6.qtbase @@ -89,9 +80,13 @@ python3Packages.buildPythonApplication (finalAttrs: { Polychromatic is a frontend for OpenRazer that enables Razer devices to control lighting effects and more on GNU/Linux. ''; + changelog = "https://github.com/polychromatic/polychromatic/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ evanjs ]; + maintainers = with lib.maintainers; [ + evanjs + nadir-ishiguro + ]; mainProgram = "polychromatic-controller"; }; }) diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix index 08b7ec07aef5..ba55025ba4a5 100644 --- a/pkgs/by-name/po/pomsky/package.nix +++ b/pkgs/by-name/po/pomsky/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, pkg-config, oniguruma, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -32,9 +34,17 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTONIG_SYSTEM_LIBONIG = true; }; - # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads'' + # Compatibility tests run against different regex implementations. + # Some can be run by providing `jdk*_headless` and `python3` `nativeCheckInputs`, + # while some cannot, i.e. `deno`-based requires network access and `dotnet-script` is not packaged, + # and they cannot be disabled partially. doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Portable, modern regular expression language"; mainProgram = "pomsky"; @@ -44,6 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mit # or asl20 ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) diff --git a/pkgs/by-name/pr/professor/package.nix b/pkgs/by-name/pr/professor/package.nix index 63221b12a055..69c2852ff8f2 100644 --- a/pkgs/by-name/pr/professor/package.nix +++ b/pkgs/by-name/pr/professor/package.nix @@ -7,15 +7,15 @@ python3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "professor"; - version = "2.4.2"; + version = "2.5.8"; src = fetchFromGitLab { owner = "hepcedar"; repo = "professor"; - tag = "professor-2.4.2"; - hash = "sha256-z2Ub7SUTz4Hj3ajnzOV/QXZ+cH2v6zJv9UZM2M2y1Hg="; + tag = "professor-${finalAttrs.version}"; + hash = "sha256-q1OxYnsr4xE7NSZekQq9AeMFPv1B+/VMu6ZttKPQsBs="; # workaround unpacking to case-sensitive filesystems postFetch = '' rm -rf $out/[Dd]ocker @@ -23,15 +23,24 @@ stdenv.mkDerivation { }; postPatch = '' + substituteInPlace configure \ + --replace-fail '$(which $PYTHON 2> /dev/null)' '$(command -v $PYTHON)' \ + --replace-fail '$(which $CYTHON 2> /dev/null)' '$(command -v $CYTHON)' \ + --replace-fail '$(which $ROOTCONFIG 2> /dev/null)' '$(command -v $ROOTCONFIG)' substituteInPlace Makefile \ - --replace-fail 'pip install ' 'pip install --prefix $(out) ' + --replace-fail 'pip wheel' 'pip wheel --no-build-isolation' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o' ''; + configureFlags = [ "--with-eigen=${eigen}" ]; + + env.PYTHON = "python3"; + nativeBuildInputs = [ + python3 python3.pkgs.cython python3.pkgs.pip python3.pkgs.setuptools @@ -49,11 +58,6 @@ stdenv.mkDerivation { yoda ]; - env = { - CPPFLAGS = toString [ "-I${eigen}/include/eigen3" ]; - PREFIX = placeholder "out"; - }; - postInstall = '' for prog in "$out"/bin/*; do wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" @@ -70,4 +74,4 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.veprbl ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index f14a2b027987..77d9837240d9 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "psitransfer"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; tag = "v${finalAttrs.version}"; - hash = "sha256-AOWtKfg7qdZhoUk6G1FphIu+7Uwaqq9dSGlV2NX+sX4="; + hash = "sha256-lULgdzObjPXe+SmAY+s1MmuTnQpKEKlWPLsy1HMUKiw="; }; - npmDepsHash = "sha256-L4VdKymQuoGXen50PW/ewsvhaQIkUuBOsjYA0HfhTYc="; + npmDepsHash = "sha256-hKthHajNO6PK7KHwNwZ9ZEHkaXqi73zP+7colV3TyVs="; app = buildNpmPackage { pname = "psitransfer-app"; @@ -55,7 +55,7 @@ buildNpmPackage (finalAttrs: { homepage = "https://github.com/psi-4ward/psitransfer"; changelog = "https://github.com/psi-4ward/psitransfer/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ hyshka ]; + maintainers = [ ]; mainProgram = "psitransfer"; }; }) diff --git a/pkgs/by-name/qb/qbit-manage/package.nix b/pkgs/by-name/qb/qbit-manage/package.nix index 13cf1324639e..ed704cd2985d 100644 --- a/pkgs/by-name/qb/qbit-manage/package.nix +++ b/pkgs/by-name/qb/qbit-manage/package.nix @@ -8,13 +8,13 @@ }: python3Packages.buildPythonApplication rec { pname = "qbit-manage"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "StuffAnThings"; repo = "qbit_manage"; tag = "v${version}"; - hash = "sha256-cPN4GhB7TuhiGau8Nb9hVNubF6fppyS2tuFGJ+spPaI="; + hash = "sha256-+W28F8vI5OLqFd0S6nlqMW/IxJXB4Vl+bCOZAyLGNXY="; }; pyproject = true; @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "croniter" "fastapi" + "gitpython" "requests" "uvicorn" ]; diff --git a/pkgs/by-name/qb/qbz/package.nix b/pkgs/by-name/qb/qbz/package.nix index 4ec68643b5ba..48be10207e6d 100644 --- a/pkgs/by-name/qb/qbz/package.nix +++ b/pkgs/by-name/qb/qbz/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qbz"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "vicrodh"; repo = "qbz"; tag = "v${finalAttrs.version}"; - hash = "sha256-SuEmBxwwEkINmH/cswV9Ed6FtBKP6IRrjQ7sIYMPOTg="; + hash = "sha256-LlpMCO8RHbC+MNCcsaUqAGNuaK2CSk4GEpVtmfKtsFo="; }; - cargoHash = "sha256-bOm2W7lQag87dDRqcCCFPp2c+qVuOAoLpPH7Pihz1BU="; + cargoHash = "sha256-X5YJb1Pu+phAHOLUX9YnKDL0lJQqUXxK4J3S4PVt1YY="; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { name = "qbz-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-WjZg3xaJFOdCA0XaIFwWhd4kglUjkWei6Cw3+NiP6zs="; + hash = "sha256-HfdYKnjXf6/LqdTy7RCPfVfh8NdXuGHYrqDWAT3ozk4="; }; env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index a624c8695243..d8ca9b34961d 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.34.3"; + version = "3.35.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-JMPETdr/c50EqHTF/PMH5AReMdLP+7HbCz/FhLJiMS0="; + hash = "sha256-fxwAYpQimDmctRCfPqi11RzK2/95DeSh+ULaC9jrHQo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index fd4d1d4f2a43..e676aeba5b12 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Photo and video importer for cameras, phones, and memory cards"; mainProgram = "rapid-photo-downloader"; - homepage = "https://www.damonlynch.net/rapid/"; + homepage = "https://damonlynch.net/rapid/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ philipdb ]; diff --git a/pkgs/by-name/ra/rapidcsv/package.nix b/pkgs/by-name/ra/rapidcsv/package.nix index 56d60570119b..f2b3b85c5111 100644 --- a/pkgs/by-name/ra/rapidcsv/package.nix +++ b/pkgs/by-name/ra/rapidcsv/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rapidcsv"; - version = "8.92"; + version = "8.97"; src = fetchFromGitHub { owner = "d99kris"; repo = "rapidcsv"; rev = "v${finalAttrs.version}"; - hash = "sha256-8g96mgTArtpAYHqfGCBaG4WB0ho3l8nygAS8yLVq0XE="; + hash = "sha256-A0YYstmJH2lit/odHfVXWmxGDHRKyGL5v7gHtEUJGqk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 9b4c39372831..378092a82707 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rathole-org"; repo = "rathole"; rev = "5a9dd6d939744859af322aeff7fd60f7483a68bc"; - hash = "sha256-C0/G4JOZ4pTAvcKZhRHsGvlLlwAyWBQ0rMScLvaLSuA="; + hash = "sha256-jSwqEJcRv2PwBEY7dV20x9d0GjPb/eZ0w7j1e4YlYH8="; }; # Get rid of git dependency on vergen. No reason to require libgit2-sys as diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 853f678f4057..95659d90a9dd 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, rustPlatform, cmake, pkg-config, @@ -14,16 +15,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebels-in-the-sky"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ricott1"; repo = "rebels-in-the-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-P0GPdMTOomqNQ6WLfZnASO1FiD7DJTHj/a8eoYzAvAY="; + hash = "sha256-alXqHtaGtv2zPt1OpNyEwHpQ+GKhS8xqOQFa5PvCsqc="; }; - cargoHash = "sha256-Ldy/1Gv1qguWQ2lLk0jiiq7nM9r85LY7pXkXf2nCUA0="; + cargoHash = "sha256-PvSOjuK1cObDuZeAKYEEqwezCuv7RM1W/aimrc4QV28="; + + cargoPatches = [ + (fetchpatch { + # The lock file was updated after the release + url = "https://github.com/ricott1/rebels-in-the-sky/commit/4cd33144b7e2e6297c5e0d6a6a0e46bc976279d0.patch"; + hash = "sha256-HUzABNtpBgts7rtuPB/OCtCTQk+XsLGEOyRRgy3uIdI="; + }) + ]; patches = lib.optionals (!withRadio) [ ./disable-radio.patch diff --git a/pkgs/by-name/re/redstore/package.nix b/pkgs/by-name/re/redstore/package.nix index f78fa7e98365..c4acda5f493b 100644 --- a/pkgs/by-name/re/redstore/package.nix +++ b/pkgs/by-name/re/redstore/package.nix @@ -8,17 +8,28 @@ zlib, librdf_raptor2, librdf_rasqal, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "redstore"; version = "0.5.4"; + __structuredAttrs = true; + strictDeps = true; + src = fetchurl { url = "https://www.aelius.com/njh/redstore/redstore-${finalAttrs.version}.tar.gz"; - sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; + hash = "sha256-WL1l/aOIq0Aeatw2ctepxRHkOdlHdPzFoe9tt5x0gUE="; }; + # source code tries to use `true` as a variable + # despite it being a reserved keyword + postPatch = '' + substituteInPlace ./src/redhttp/server.c --replace-fail \ + 'true' 'opt' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp @@ -35,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "HTTP interface to Redland RDF store"; mainProgram = "redstore"; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 62016011a4c6..b7adaba06ebb 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.26.8"; + version = "1.26.11"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-enFTy+RIYrvq9ScLPExSaKDGQy+MLSbKAQTREIkJB28="; + hash = "sha256-3F1lC/3ek6k3x6qZ4WswJRe/QYEy3iTNMhMmLtR6i0U="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index ddf0fb45e802..a151c215d5c8 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-2026-05-05"; + version = "0-unstable-2026-05-19"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "3137db4ec2c85749cfc57bf05b460529d4e52a94"; - hash = "sha256-PHtt31DGvOWgutgqbBcOr2vjdvnjaJmCTpRbHtx8MJw="; + rev = "2e62d9b087daac8aa6e56c22ad0eaef72aaa8bf8"; + hash = "sha256-+Pwk85cei9f7mvQKnZMIY1N7gjOc8UxicyTNQP3MPPI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renoise/package.nix b/pkgs/by-name/re/renoise/package.nix index 7121f1e8d676..513edb13dfa4 100644 --- a/pkgs/by-name/re/renoise/package.nix +++ b/pkgs/by-name/re/renoise/package.nix @@ -25,18 +25,18 @@ let platforms = { x86_64-linux = { archSuffix = "x86_64"; - hash = "sha256-UxhGe22W50cqjNMoAdxHnyFmTmiysYd8EkASRFrpuYs="; + hash = "sha256-RfOhcllmwX3Cy6ywIYjIC+kUX6rXkd+PM9wKj+fCuts="; }; aarch64-linux = { archSuffix = "arm64"; - hash = "sha256-itWnH1JiG+AhYZtNtrJtW9p7LlRF/ab5+npFODiKznY="; + hash = "sha256-1bo7/srdQ5M5mzXpL76Bkt1Gt9EhbW8ktLLPvOcFu5U="; }; }; in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.5.1"; + version = "3.5.4"; src = if releasePath != null then diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index fda9a021c9d6..5fda9477704c 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "reqable"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb"; - hash = "sha256-lJby2hewmjGpq2MwED/ZJbbGg7qt0aDwwqRVhoo/uys="; + hash = "sha256-AGOooC4H4NQ4CsuRsIg3oHh9LEfZL9KRdQGETe7uJm4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/reredirect/package.nix b/pkgs/by-name/re/reredirect/package.nix index 9e3555dba73a..ee98ea6962a0 100644 --- a/pkgs/by-name/re/reredirect/package.nix +++ b/pkgs/by-name/re/reredirect/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "reredirect"; - version = "0.3"; + version = "unstable-2026-02-15"; src = fetchFromGitHub { owner = "jerome-pouiller"; repo = "reredirect"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0="; + rev = "b85df395e18d09b54e1fb73dfe344f8f04224a83"; + sha256 = "sha256-lLhF8taK6PqWo4u6pMZDN2PZavnWwsz4NbEUT7EtULo="; }; patches = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace ${placeholder "out"}/bin/relink \ - --replace "reredirect" "${placeholder "out"}/bin/reredirect" + --replace-fail "reredirect" "${placeholder "out"}/bin/reredirect" ''; meta = { diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 3dd835194f7a..92b7cfea5331 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.31.4"; + version = "0.32.1"; __structuredAttrs = true; strictDeps = true; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-gbN9aplPw+U4liGDU7Z0x+ySfxr+RlyriEkDsIA8gHA="; + hash = "sha256-WedZ5RZiin6jGx2aCe5obkkWJSnwzMoP4s+qQIyeq8Y="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-N5JeZMbGy9FSiluE1MAtvg97dUq3ZoUZdABwORUlWlA="; + cargoHash = "sha256-LkZA3wcDGIGSjRkjPY7YhjlfVqlGWAMc+qIfDLFZUTE="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/re/restman/package.nix b/pkgs/by-name/re/restman/package.nix index 7512dbe64165..fc45cf744e9f 100644 --- a/pkgs/by-name/re/restman/package.nix +++ b/pkgs/by-name/re/restman/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildGoModule, testers, restman, @@ -8,16 +9,24 @@ buildGoModule (finalAttrs: { pname = "restman"; - version = "0.3.0"; + version = "0.4.9"; src = fetchFromGitHub { repo = "restman"; owner = "jackMort"; rev = "v${finalAttrs.version}"; - hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA="; + hash = "sha256-advp7w9SbMKcuvQhR7pF95VV4J6hUl8rV+9Uu4EaGpc="; }; - vendorHash = "sha256-hXd7E6yowuY3+ZpGyCzlcqwFqFrQzXBWYRMjsrxBlwI="; + patches = [ + (fetchpatch { + # fix for tests committed shortly after 0.4.9 + url = "https://github.com/jackMort/Restman/commit/2d5edd4e4faa0499bf93741fed250f8f13efa9c3.patch"; + hash = "sha256-Mv7+eAKczR4YZDdevK60I1WZrmEumqsXhXMQVwu1zLo="; + }) + ]; + + vendorHash = "sha256-+qjJhDQvZi+SstE2uo+2hsoG2MTRdI6d79Vga3/7gTY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 45f838507e00..d252431056a9 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -9,35 +9,27 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "rich-cli"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; + hash = "sha256-z1Ea8f8QNgy2CWGyQWgY2Y/tpg269R5n9Qrs1YhCHa8="; }; - patches = [ - # Update dependencies, https://github.com/Textualize/rich-cli/pull/94 - (fetchpatch { - name = "update-dependencies.patch"; - url = "https://github.com/Textualize/rich-cli/pull/94/commits/1e9a11af7c1c78a5a44a207b1e0dce4c4b3c39f0.patch"; - hash = "sha256-cU+s/LK2GDVWXLZob0n5J6sLjflCr8w10hRLgeWN5Vg="; - }) - (fetchpatch { - name = "markdown.patch"; - url = "https://github.com/Textualize/rich-cli/pull/94/commits/0a8e77d724ace88ce88ee9d68a46b1dc8464fe0b.patch"; - hash = "sha256-KXvRG36Qj5kCj1RiAJsNkoJY7t41zUfJFgHeCtc0O4w="; - }) - ]; - pythonRelaxDeps = [ "rich" "textual" + "rich-rst" ]; + postPatch = '' + substituteInPlace src/rich_cli/__main__.py \ + --replace-fail 'VERSION = "1.8.0"' 'VERSION = "1.8.1"' + ''; + build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index a7a0cdecc061..4396be5b2c42 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -33,6 +33,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + # click 8.3.x regression breaks `--list` / `--generate-config` optional-value flags (pallets/click#3130) + disabledTestPaths = [ + "tests/utest/test_cli.py::TestCli::test_list_transformers[4---list]" + "tests/utest/test_cli.py::TestCli::test_list_transformers[4--l]" + "tests/utest/test_cli.py::TestCli::test_list_transformers[5---list]" + "tests/utest/test_cli.py::TestCli::test_list_transformers[5--l]" + "tests/utest/test_cli.py::TestCli::test_list_transformers[None---list]" + "tests/utest/test_cli.py::TestCli::test_list_transformers[None--l]" + "tests/utest/test_cli.py::TestCli::test_list_no_config" + "tests/utest/test_cli.py::TestGenerateConfig::test_generate_default_config" + "tests/utest/test_cli.py::TestGenerateConfig::test_generate_config_ignore_existing_config" + "tests/utest/test_cli.py::TestGenerateConfig::test_generate_config_with_cli_config" + "tests/utest/test_cli.py::TestGenerateConfig::test_missing_dependency" + ]; + meta = { description = "Code autoformatter for Robot Framework"; homepage = "https://robotidy.readthedocs.io"; diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix index 687ab74c78d6..bbefbb44107b 100644 --- a/pkgs/by-name/ro/routedns/package.nix +++ b/pkgs/by-name/ro/routedns/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "routedns"; - version = "0.1.169"; + version = "0.1.170"; src = fetchFromGitHub { owner = "folbricht"; repo = "routedns"; rev = "v${finalAttrs.version}"; - hash = "sha256-VQ+8wGv46YZbCYedU1gYTNqd54+kjbuPKbaYRV3IHYc="; + hash = "sha256-hCjsyBnCHewMopnLue70ibKfTt+xUmg0/Kk+eKU/+JQ="; }; vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs="; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 83bfa9fc21ea..e83195e4022a 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2026-05-05"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "1410f03e6dc98f0135cad0b458381179bdddec59"; - hash = "sha256-l+GPfi6u2wYEWLtTowdjG3hRLM1QSDpRaw/BL74S6I8="; + rev = "9d3790f73cc0a0131fe38378157f5e464d2e08ee"; + hash = "sha256-G3Lnmjzeqfwe6rmo+2PQ2NKYeKcTu/L+RTqft7UdCrg="; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-jRfY9w84DdGkuUXAxcdKOhNEjJU5o0t8qJqtr7FXmZw="; + hash = "sha256-IRqBTLdl2XC+dql7CqOfYxy+ej1UXItY932L3tWHd/s="; pnpm = pnpm_10; }; diff --git a/pkgs/by-name/rs/rstudio/electron-41.patch b/pkgs/by-name/rs/rstudio/electron-41.patch new file mode 100644 index 000000000000..76c951b7f2fa --- /dev/null +++ b/pkgs/by-name/rs/rstudio/electron-41.patch @@ -0,0 +1,525 @@ +diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json +index c78746a..4186648 100644 +--- a/src/node/desktop/package-lock.json ++++ b/src/node/desktop/package-lock.json +@@ -10,7 +10,7 @@ + "hasInstallScript": true, + "license": "AGPL-3.0-only", + "dependencies": { +- "@electron/fuses": "2.0.0", ++ "@electron/fuses": "2.1.1", + "@vueuse/core": "13.6.0", + "crc": "4.3.2", + "electron-store": "11.0.2", +@@ -30,7 +30,7 @@ + "devDependencies": { + "@electron-forge/cli": "7.11.1", + "@electron-forge/plugin-webpack": "7.11.1", +- "@electron/packager": "19.0.5", ++ "@electron/packager": "20.0.0", + "@eslint/eslintrc": "3.3.4", + "@eslint/js": "10.0.1", + "@types/chai": "5.2.3", +@@ -48,7 +48,7 @@ + "chai": "6.2.2", + "copy-webpack-plugin": "14.0.0", + "css-loader": "7.1.4", +- "electron": "39.8.7", ++ "electron": "41.3.0", + "electron-mocha": "13.1.0", + "eslint": "10.0.0", + "fork-ts-checker-webpack-plugin": "9.1.0", +@@ -57,7 +57,7 @@ + "json-schema-to-typescript": "15.0.4", + "lint-staged": "16.2.7", + "mocha": "11.7.5", +- "nan": "2.25.0", ++ "nan": "2.26.2", + "node-loader": "2.1.0", + "prettier": "3.8.1", + "process": "0.11.10", +@@ -1220,9 +1220,9 @@ + } + }, + "node_modules/@electron/fuses": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-2.0.0.tgz", +- "integrity": "sha512-lyb1zK3YHeWUjaz7yiK0GnxSPduwASKMyiDbCtbn3spP6EEt+UWtktggWehG0icFrXAk3GwvcJ4nCrJO0N9IhQ==", ++ "version": "2.1.1", ++ "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-2.1.1.tgz", ++ "integrity": "sha512-38ho27/mtUV/LpsZ1LCDJUomKBBSUZDk/qBH4FNNtoN5fmnkmWDcIp5pm1Kv3InqhRjKZKs7Jzx+wWZNMArHrA==", + "license": "MIT", + "bin": { + "electron-fuses": "dist/bin.js" +@@ -1409,14 +1409,14 @@ + } + }, + "node_modules/@electron/packager": { +- "version": "19.0.5", +- "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-19.0.5.tgz", +- "integrity": "sha512-HSWJp5ZTYkavzoLViPBK8sUaINrHbhHMueMrYpQea5DkzOplxYCgAKmy+FKsBk7WUm6iYZZ0gJe8f8nIEScqJQ==", ++ "version": "20.0.0", ++ "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-20.0.0.tgz", ++ "integrity": "sha512-kl4c4LcsrQflg0wAi3mqpmmZFRdTYoZFLZPBP9YeEIvWwQR1NmkZphwT7558UeLOdhr6Ac5l83r8W69KaJBedg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@electron/asar": "^4.0.1", +- "@electron/get": "^4.0.2", ++ "@electron/get": "^5.0.0", + "@electron/notarize": "^3.1.0", + "@electron/osx-sign": "^2.2.0", + "@electron/universal": "^3.0.1", +@@ -1426,13 +1426,11 @@ + "extract-zip": "^2.0.1", + "filenamify": "^6.0.0", + "galactus": "^2.0.2", +- "get-package-info": "^1.0.0", + "graceful-fs": "^4.2.11", + "junk": "^4.0.1", + "parse-author": "^2.0.0", + "plist": "^3.1.0", + "resedit": "^2.0.3", +- "resolve": "^1.22.10", + "semver": "^7.7.2", + "yargs-parser": "^22.0.0" + }, +@@ -1447,15 +1445,14 @@ + } + }, + "node_modules/@electron/packager/node_modules/@electron/get": { +- "version": "4.0.2", +- "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.2.tgz", +- "integrity": "sha512-n9fRt/nzzOOZdDtTP3kT6GVdo0ro9FgMKCoS520kQMIiKBhpGmPny6yK/lER3tOCKr+wLYW1O25D9oI6ZinwCA==", ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.0.0.tgz", ++ "integrity": "sha512-pjoBpru1KdEtcExBnuHAP1cAc/5faoedw0hzJkL3o4/IJp7HNF1+fbrdxT3gMYRX2oJfvnA/WXeCTVQpYYxyJA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", + "env-paths": "^3.0.0", +- "got": "^14.4.5", + "graceful-fs": "^4.2.11", + "progress": "^2.0.3", + "semver": "^7.6.3", +@@ -1465,65 +1462,7 @@ + "node": ">=22.12.0" + }, + "optionalDependencies": { +- "global-agent": "^3.0.0" +- } +- }, +- "node_modules/@electron/packager/node_modules/@sindresorhus/is": { +- "version": "7.2.0", +- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz", +- "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=18" +- }, +- "funding": { +- "url": "https://github.com/sindresorhus/is?sponsor=1" +- } +- }, +- "node_modules/@electron/packager/node_modules/cacheable-lookup": { +- "version": "7.0.0", +- "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", +- "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=14.16" +- } +- }, +- "node_modules/@electron/packager/node_modules/cacheable-request": { +- "version": "13.0.18", +- "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.18.tgz", +- "integrity": "sha512-rFWadDRKJs3s2eYdXlGggnBZKG7MTblkFBB0YllFds+UYnfogDp2wcR6JN97FhRkHTvq59n2vhNoHNZn29dh/Q==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "@types/http-cache-semantics": "^4.0.4", +- "get-stream": "^9.0.1", +- "http-cache-semantics": "^4.2.0", +- "keyv": "^5.5.5", +- "mimic-response": "^4.0.0", +- "normalize-url": "^8.1.1", +- "responselike": "^4.0.2" +- }, +- "engines": { +- "node": ">=18" +- } +- }, +- "node_modules/@electron/packager/node_modules/decompress-response": { +- "version": "10.0.0", +- "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz", +- "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "mimic-response": "^4.0.0" +- }, +- "engines": { +- "node": ">=20" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" ++ "undici": "^7.24.4" + } + }, + "node_modules/@electron/packager/node_modules/env-paths": { +@@ -1568,165 +1507,6 @@ + "url": "https://github.com/sponsors/sindresorhus" + } + }, +- "node_modules/@electron/packager/node_modules/get-stream": { +- "version": "9.0.1", +- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", +- "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "@sec-ant/readable-stream": "^0.4.1", +- "is-stream": "^4.0.1" +- }, +- "engines": { +- "node": ">=18" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/got": { +- "version": "14.6.6", +- "resolved": "https://registry.npmjs.org/got/-/got-14.6.6.tgz", +- "integrity": "sha512-QLV1qeYSo5l13mQzWgP/y0LbMr5Plr5fJilgAIwgnwseproEbtNym8xpLsDzeZ6MWXgNE6kdWGBjdh3zT/Qerg==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "@sindresorhus/is": "^7.0.1", +- "byte-counter": "^0.1.0", +- "cacheable-lookup": "^7.0.0", +- "cacheable-request": "^13.0.12", +- "decompress-response": "^10.0.0", +- "form-data-encoder": "^4.0.2", +- "http2-wrapper": "^2.2.1", +- "keyv": "^5.5.3", +- "lowercase-keys": "^3.0.0", +- "p-cancelable": "^4.0.1", +- "responselike": "^4.0.2", +- "type-fest": "^4.26.1" +- }, +- "engines": { +- "node": ">=20" +- }, +- "funding": { +- "url": "https://github.com/sindresorhus/got?sponsor=1" +- } +- }, +- "node_modules/@electron/packager/node_modules/http2-wrapper": { +- "version": "2.2.1", +- "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", +- "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "quick-lru": "^5.1.1", +- "resolve-alpn": "^1.2.0" +- }, +- "engines": { +- "node": ">=10.19.0" +- } +- }, +- "node_modules/@electron/packager/node_modules/is-stream": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz", +- "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=18" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/keyv": { +- "version": "5.6.0", +- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz", +- "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "@keyv/serialize": "^1.1.1" +- } +- }, +- "node_modules/@electron/packager/node_modules/lowercase-keys": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", +- "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/mimic-response": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", +- "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": "^12.20.0 || ^14.13.1 || >=16.0.0" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/normalize-url": { +- "version": "8.1.1", +- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz", +- "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=14.16" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/p-cancelable": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-4.0.1.tgz", +- "integrity": "sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=14.16" +- } +- }, +- "node_modules/@electron/packager/node_modules/responselike": { +- "version": "4.0.2", +- "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz", +- "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "lowercase-keys": "^3.0.0" +- }, +- "engines": { +- "node": ">=20" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "node_modules/@electron/packager/node_modules/type-fest": { +- "version": "4.41.0", +- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", +- "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", +- "dev": true, +- "license": "(MIT OR CC0-1.0)", +- "engines": { +- "node": ">=16" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, + "node_modules/@electron/rebuild": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.2.tgz", +@@ -2384,13 +2164,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/@keyv/serialize": { +- "version": "1.1.1", +- "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz", +- "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==", +- "dev": true, +- "license": "MIT" +- }, + "node_modules/@leichtgewicht/ip-codec": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", +@@ -2606,13 +2379,6 @@ + "node": ">=14" + } + }, +- "node_modules/@sec-ant/readable-stream": { +- "version": "0.4.1", +- "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz", +- "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==", +- "dev": true, +- "license": "MIT" +- }, + "node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", +@@ -4389,19 +4155,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/byte-counter": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz", +- "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">=20" +- }, +- "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", +@@ -5797,15 +5550,15 @@ + "license": "MIT" + }, + "node_modules/electron": { +- "version": "39.8.7", +- "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.7.tgz", +- "integrity": "sha512-B3TmzbUEeIvrhJ0QcoFp8/tgnVA3vsm0wkdYWzC22hsk9zTVqkzyrrz40cjd0nMTTIrGWxxfDO2tdQTCMe9Bjw==", ++ "version": "41.3.0", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-41.3.0.tgz", ++ "integrity": "sha512-2Q5aeocmFdeheZGDUTrAvSR3t+n0c3d104AJWWEnt7syJU0tE4VdibMYaPtQ47QuXSoUf0/xSsfUUvu/uSXIfg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@electron/get": "^2.0.0", +- "@types/node": "^22.7.7", ++ "@types/node": "^24.9.0", + "extract-zip": "^2.0.1" + }, + "bin": { +@@ -5932,13 +5685,13 @@ + } + }, + "node_modules/electron/node_modules/@types/node": { +- "version": "22.19.11", +- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.11.tgz", +- "integrity": "sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==", ++ "version": "24.12.4", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.4.tgz", ++ "integrity": "sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==", + "dev": true, + "license": "MIT", + "dependencies": { +- "undici-types": "~6.21.0" ++ "undici-types": "~7.16.0" + } + }, + "node_modules/electron/node_modules/fs-extra": { +@@ -5977,9 +5730,9 @@ + } + }, + "node_modules/electron/node_modules/undici-types": { +- "version": "6.21.0", +- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", +- "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", ++ "version": "7.16.0", ++ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", ++ "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "dev": true, + "license": "MIT" + }, +@@ -7073,16 +6826,6 @@ + "url": "https://opencollective.com/webpack" + } + }, +- "node_modules/form-data-encoder": { +- "version": "4.1.0", +- "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.1.0.tgz", +- "integrity": "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": ">= 18" +- } +- }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", +@@ -9948,9 +9691,9 @@ + } + }, + "node_modules/nan": { +- "version": "2.25.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.25.0.tgz", +- "integrity": "sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==", ++ "version": "2.26.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz", ++ "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==", + "devOptional": true, + "license": "MIT" + }, +@@ -13055,6 +12798,17 @@ + "url": "https://github.com/sponsors/sindresorhus" + } + }, ++ "node_modules/undici": { ++ "version": "7.25.0", ++ "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz", ++ "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==", ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=20.18.1" ++ } ++ }, + "node_modules/undici-types": { + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", +diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json +index 613361f..b75506a 100644 +--- a/src/node/desktop/package.json ++++ b/src/node/desktop/package.json +@@ -29,7 +29,7 @@ + "devDependencies": { + "@electron-forge/cli": "7.11.1", + "@electron-forge/plugin-webpack": "7.11.1", +- "@electron/packager": "19.0.5", ++ "@electron/packager": "20.0.0", + "@eslint/eslintrc": "3.3.4", + "@eslint/js": "10.0.1", + "@types/chai": "5.2.3", +@@ -47,7 +47,7 @@ + "chai": "6.2.2", + "copy-webpack-plugin": "14.0.0", + "css-loader": "7.1.4", +- "electron": "39.8.7", ++ "electron": "41.3.0", + "electron-mocha": "13.1.0", + "eslint": "10.0.0", + "fork-ts-checker-webpack-plugin": "9.1.0", +@@ -56,7 +56,7 @@ + "json-schema-to-typescript": "15.0.4", + "lint-staged": "16.2.7", + "mocha": "11.7.5", +- "nan": "2.25.0", ++ "nan": "2.26.2", + "node-loader": "2.1.0", + "prettier": "3.8.1", + "process": "0.11.10", +@@ -69,7 +69,7 @@ + "webpack": "5.105.4" + }, + "dependencies": { +- "@electron/fuses": "2.0.0", ++ "@electron/fuses": "2.1.1", + "@vueuse/core": "13.6.0", + "crc": "4.3.2", + "electron-store": "11.0.2", diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 58d2d4ebbeda..d59a7cd926fb 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -26,7 +26,7 @@ zip, boost190, - electron_39, + electron_41, fontconfig, gnumake, hunspellDicts, @@ -45,7 +45,7 @@ }: let - electron = electron_39; + electron = electron_41; boost = boost190; mathJaxSrc = fetchzip { @@ -201,6 +201,9 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Partly taken from https://github.com/rstudio/rstudio/pull/17470 + ./electron-41.patch + # Hack RStudio to only use the input R and provided libclang. (replaceVars ./r-location.patch { R = lib.getBin R; @@ -249,9 +252,9 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { name = "rstudio-${finalAttrs.version}-npm-deps"; - inherit (finalAttrs) src; + inherit (finalAttrs) src patches; postPatch = "cd ${finalAttrs.npmRoot}"; - hash = "sha256-lO+wJk0HWYrKO1Rqz8laVpZK5RUfA9ijYvtPEtVf1r4="; + hash = "sha256-MuTY+vjtbgbk73dm6bsCUmi34z/HCDnB5/RLkZ/rrVo="; }; preConfigure = '' diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 2947decb1614..41b3b9329ae4 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.1.91"; + version = "0.1.94"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-hn9YHFG8wbU8cY96MUT1fsRTzMqkCdJKnQsBgRNRVjo="; + hash = "sha256-Q5Dbw1BaDrNcg+xtCog7rWwweZi6qtDsjtq19vJWZck="; }; - cargoHash = "sha256-OUzZ2CLda5VqNLFX6hzd4+MPXcUPsTWerWravZDJJfU="; + cargoHash = "sha256-s2/8z/v+bQISwaQdl6nOocMK0M173eSVw1yC3mCzp9k="; cargoBuildFlags = [ "--bin=rumdl" diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index daed6eaab0fd..cb7aa7b0ceff 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-parallel"; - version = "1.22.0"; + version = "1.23.0"; __structuredAttrs = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "aaronriekenberg"; repo = "rust-parallel"; rev = "v${finalAttrs.version}"; - hash = "sha256-6SDWYIJDoDKANYZvYM2hdFzXTyqbfRA2uKQDFn+6erg="; + hash = "sha256-quLvYnYhu8ZkUT/7v/WjwMLxDlvYcj3hlIYPkv1xogg="; }; - cargoHash = "sha256-uFx0Sli6uwmhHKQoT1aX0S5NwuWLu3M6g5pQYYpAsEI="; + cargoHash = "sha256-m2Galjkr7iFO+s0vYaYAeM5Xrvls6vNVReTbLUUo44I="; checkInputs = [ bashNonInteractive ]; diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix index b463d9baa418..8c1c00dd141d 100644 --- a/pkgs/by-name/sa/sandbox-runtime/package.nix +++ b/pkgs/by-name/sa/sandbox-runtime/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { pname = "sandbox-runtime"; - version = "0.0.51"; + version = "0.0.52"; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { owner = "anthropic-experimental"; repo = "sandbox-runtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-/bvSbkW3cEopq6YHPS36uHEN53dVO5rhUoXt/nWdsRs="; + hash = "sha256-EcRnx4j8YdBvhCNgWdfzvgP6SgvXQfqu8aNBjeM1YQM="; }; postPatch = @@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: { strictDeps = true; - npmDepsHash = "sha256-L/BJ0KCBYHAA6BaYZbzNFVPHJZHGnDnpZFo9XepKc4s="; + npmDepsHash = "sha256-IFf65G1v3JtjjH7o8gS68VongLIP3WuKmD/om41yRts="; postFixup = let diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix index 4ce080ac11b4..64a10fa4a3a6 100644 --- a/pkgs/by-name/sa/sandhole/package.nix +++ b/pkgs/by-name/sa/sandhole/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sandhole"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "EpicEric"; repo = "sandhole"; tag = "v${finalAttrs.version}"; - hash = "sha256-NyRj00+2RjfcwAPD4h34bWy5g+GnWYkkNQ936mKZzw0="; + hash = "sha256-nACjMd1GGfopXTqkkJP3zOnFGqB4TeuJCoQWZXSnBiA="; }; - cargoHash = "sha256-rNLtRNVL6JLoUUZTev4Mktha8nAgIgTYl+0k44J3hPg="; + cargoHash = "sha256-n3VoLQP6jmYJvo/6GRXaB/u9XfewlOOt/zKD9YbCQzU="; # All integration tests require networking. postPatch = '' diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index 2fc07069632d..f94a2f1a39ae 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.18.1"; + version = "0.19.0"; in buildGoModule { pname = "sbom-utility"; @@ -19,7 +19,7 @@ buildGoModule { owner = "CycloneDX"; repo = "sbom-utility"; tag = "v${version}"; - hash = "sha256-LIyr9qu4FQ85EBWzNncztURy1U02VnLMCwEjHwCJvUM="; + hash = "sha256-G+0gQrQIWAgYsojFuvXU1IhMS2p3fHCejJLjZNaAU1I="; }; vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM="; diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index 1e552714139d..3c81a170ee1d 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.11.0"; + version = "3.11.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-oCfwYvyyMZqJh+N6rnzIIWiP9ufWApRUDUOuJ3eXyB4="; + outputHash = "sha256-EgkXDCbgn7OmH1e/us6lyNiei/qZMzFn/1Qh4LiraBo="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index b3f2324fb0b9..63dc3cecd667 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -10,16 +10,20 @@ buildGo125Module (finalAttrs: { pname = "scip"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; tag = "v${finalAttrs.version}"; - hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU="; + hash = "sha256-lpzGrTvWUXUFfmyn5z4rsqJEcAOA8D1qfN1assRAdn4="; }; - vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A="; + vendorHash = "sha256-ARfsSW/d2bb4Lp6hedSmMerr3LrkuTfUCi569hI6eYY="; + + subPackages = [ "cmd/scip" ]; + + env.GOWORK = "off"; ldflags = [ "-s" @@ -28,15 +32,6 @@ buildGo125Module (finalAttrs: { nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; - checkFlags = - let - skippedTests = [ - "TestParseCompat" # could not locate sample indexes directory starting from parents of working directory - "TestParseSymbol_ZeroAllocationsIfMemoryAvailable" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - __darwinAllowLocalNetworking = true; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix index 3996031f72aa..a5af969f15ba 100644 --- a/pkgs/by-name/se/seanime/package.nix +++ b/pkgs/by-name/se/seanime/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "seanime"; - version = "3.6.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "5rahim"; repo = "seanime"; tag = "v${finalAttrs.version}"; - hash = "sha256-utKOewhtuivkp0mtns2ysp+q0nwou7tojZ6VjrPhEMw="; + hash = "sha256-7wOmvOrs4/YiIjOGdp6pleUcUjNaXhZFvtwBTSn5BQI="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { npmRoot = "seanime-web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/seanime-web"; - hash = "sha256-4ItF0+Bmc+75oeNHjQP4RsbcRWgeG9Wq/27wDiQ4KVM="; + hash = "sha256-LtRiwmrWSu4Zc0+/AywEEGpcxElIrp0A+x+8jWMfKig="; }; }; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { rm -rf .github ''; - vendorHash = "sha256-9RCVIL+h5L20156BuD8GGbC98QUchB8JCWId8b/Sfy8="; + vendorHash = "sha256-BPOLDqa9qt/nISJ6Ja6ZSDGf8oXwKgZ6sbMee6hFLfs="; subPackages = [ "." ]; diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 03830fcc199a..17883d931a48 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2026-04-11"; + version = "0-unstable-2026-05-16"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "9e08a6771f196a2d47803e9fcdc6994fa6457509"; - hash = "sha256-I9ghd2mWlujfldeh5LXLSSh5X6CsHu5zlzL8JCcREqk="; + rev = "dce3bb69bb45519bde01c610e09e45cd42fd896c"; + hash = "sha256-QU0LyK9avVT67soPDRpjpYAX0oWoC3zl7PnvHk/w8No="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; diff --git a/pkgs/by-name/se/selfci/Cargo.toml.patch b/pkgs/by-name/se/selfci/Cargo.toml.patch deleted file mode 100644 index ab385872ce7a..000000000000 --- a/pkgs/by-name/se/selfci/Cargo.toml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 8f7a1e2..e2062c4 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,7 +10,7 @@ readme = "README.md" - keywords = ["ci"] - categories = ["development-tools"] - authors = ["dpc "] --rust-version = "1.92" -+rust-version = "1.91" - - [[bin]] - name = "selfci" diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix index 05a17777fded..2ebeebb79f19 100644 --- a/pkgs/by-name/se/selfci/package.nix +++ b/pkgs/by-name/se/selfci/package.nix @@ -1,6 +1,6 @@ { lib, - fetchgit, + fetchFromRadicle, nix-update-script, rustPlatform, git, @@ -9,24 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "selfci"; - version = "0-unstable-2026-01-17"; + version = "0.5.0"; - src = fetchgit { - url = "https://radicle.dpc.pw/z2tDzYbAXxTQEKTGFVwiJPajkbeDU.git"; - rev = "83e693dada851ce0da32713869d3da02c52ed257"; - hash = "sha256-f0BfHvIQnhhiPie3a+9MeEGzZ+/KcgrbKBneu8Jo+xs="; + src = fetchFromRadicle { + seed = "radicle.dpc.pw"; + repo = "z2tDzYbAXxTQEKTGFVwiJPajkbeDU"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6Q9Enq02uJbcpr7pohh+uiGNus++TkUxCvO4KwX8fkk="; }; - cargoHash = "sha256-Z3f35HIZiNeKeDNFPUVkFvL2OpMWzqRvxOL5/hUEzJw="; + cargoHash = "sha256-zgDbf0po0YJCRo4GyVce2YSzoFjBTWsKX86/aH3uZlY="; nativeBuildInputs = [ makeWrapper ]; - patches = [ - ./Cargo.toml.patch - ]; - doCheck = false; postInstall = '' diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 8bd7d1369f58..9a0d4bd53935 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -11,12 +11,12 @@ buildGoModule (finalAttrs: { pname = "shopware-cli"; - version = "0.6.22"; + version = "0.14.8"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; tag = finalAttrs.version; - hash = "sha256-u5hFjDLGBXVvAp4WYWBb3HCzGDjkg9jj251LaV1zA8I="; + hash = "sha256-yN6yuGnZv6BsXoERUdA3aBGEmri1hqmPsbIYsX7HE5Q="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { dart-sass ]; - vendorHash = "sha256-Ckn6+DzHPX+UG5YxYqvkdaio/elRQssbDSR+zAfxzdE="; + vendorHash = "sha256-itrSY18wZnY0j4wq2mJ+2ugM0A2SKORENJ0iwWg+s+U="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd shopware-cli \ diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index b2ddfa6af0ff..e08b664a902a 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -5,15 +5,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-M4YvPsiCimbxHZoPO4+aIdwmYa4o5By+qnSl7FeAD5k="; + hash = "sha256-1FDqbV+t9JF93aTgy7Hnwe4lCJZHooHw0J3zOsCZWDA="; }; - npmDepsHash = "sha256-BE8B7yALOi5WLWHAvSPC2lUCgAFjUCOUMc4Ru2RBdJM="; + npmDepsHash = "sha256-jDySPn354gh1gFI8I2apGmXDxOz4d4STfJX+iFVFhdg="; dontNpmBuild = true; @@ -36,6 +36,6 @@ buildNpmPackage (finalAttrs: { homepage = "https://docs.sillytavern.app/"; mainProgram = "sillytavern"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.wrvsrx ]; + maintainers = [ lib.maintainers.Notarin ]; }; }) diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index be803484f427..5ceb3439cd7d 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "skaffold"; - version = "2.18.3"; + version = "2.19.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${finalAttrs.version}"; - hash = "sha256-5/Ty3YqDEqHwJ/ghGOasmDiVgXzQ/fhpgqqkyjb8ID4="; + hash = "sha256-Ltndb5IekV6NQ6PRmMf0/uPRN0x4LsbFYdzdebrMPf0="; }; vendorHash = null; diff --git a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch b/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch deleted file mode 100644 index b62f655618d9..000000000000 --- a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 0194c34ed2..0d58655f70 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1419,14 +1419,14 @@ dependencies = [ - - [[package]] - name = "crossbeam-epoch" --version = "0.9.5" --source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" -+version = "0.9.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" - dependencies = [ -+ "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", -- "lazy_static", -- "memoffset 0.6.4", -- "scopeguard", -+ "memoffset 0.9.0", - ] - - [[package]] -@@ -3118,15 +3118,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "memoffset" --version = "0.6.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" --dependencies = [ -- "autocfg", --] -- - [[package]] - name = "memoffset" - version = "0.7.1" -diff --git a/Cargo.toml b/Cargo.toml -index 2ff2094d67..a3ace4459a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -665,4 +665,4 @@ - [patch.crates-io] - # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf --crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } -+# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } diff --git a/pkgs/by-name/so/solana-agave/package.nix b/pkgs/by-name/so/solana-agave/package.nix index 7e22eda533c2..d3eb6798699a 100644 --- a/pkgs/by-name/so/solana-agave/package.nix +++ b/pkgs/by-name/so/solana-agave/package.nix @@ -22,23 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "solana-agave"; - version = "2.3.12"; + version = "3.1.14"; src = fetchFromGitHub { owner = "anza-xyz"; repo = "agave"; tag = "v${finalAttrs.version}"; - hash = "sha256-25UgiC5jAnlNE8Z7WrQRIviCuFp4zg57ddYA4h0qJ6U="; + hash = "sha256-yi71jUtFJhv6gvWQC9YrEqhe4cB6QU+hokn3hTLww30="; }; - cargoHash = "sha256-SVngabz9mrYNn7DlL7Rh7llvO4GmJdt5vpXVcjwqtNg="; - - # For the same reason as discussed in solana-cli derivation (crossbeam softlink), the no_atomic file is missing - # and either must somehow be rendered unneeded (using an upstream package) or replaced. A cleaner, non-behavior-changing, - # solution would be to commit the file to the repo fork (replacing the softlink). - cargoPatches = [ - ./crossbeam-epoch.patch - ]; + cargoHash = "sha256-klcpQRrPvCVgfbhnK/MsZB3m4u2rg7qIq7YeBL3+ajw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 5d60ac9bf611..14f9ec6ec2a6 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "sops"; - version = "3.13.0"; + version = "3.13.1"; __structuredAttrs = true; @@ -20,10 +20,10 @@ buildGoModule (finalAttrs: { owner = "getsops"; repo = finalAttrs.pname; tag = "v${finalAttrs.version}"; - hash = "sha256-sJAK7iCVmjGAjQ0CBVsJI7L/GwHB9bvm354Cq3WQI1M="; + hash = "sha256-df3CwJv+sROmikvWZbFGB1OrcSL1svuvFr6WJKYWhDc="; }; - vendorHash = "sha256-aBHZPh5ib2BOxoHQH6q8GD/EJOb2x1OBBePicwoI6Gc="; + vendorHash = "sha256-cdaxcNCCHK2Rve96KvmO9lc9gZtgqu6rDeYb2vRvdHw="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/sp/spamassassin/package.nix b/pkgs/by-name/sp/spamassassin/package.nix index e4f44f650320..0a2031455183 100644 --- a/pkgs/by-name/sp/spamassassin/package.nix +++ b/pkgs/by-name/sp/spamassassin/package.nix @@ -97,6 +97,9 @@ perlPackages.buildPerlPackage rec { mkdir -p $HOME mkdir t/log # pre-create to avoid race conditions + #401737: Sometimes we get: Failed tests: 2, 4-5, 7-9 + rm t/spamd_ssl.t + # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8068 checkFlagsArray+=(TEST_FILES='$(shell find t -name *.t -not -name spamd_ssl_accept_fail.t)') ''; diff --git a/pkgs/by-name/sq/sqsh/package.nix b/pkgs/by-name/sq/sqsh/package.nix index f587483d8214..85c7ebe3e58b 100644 --- a/pkgs/by-name/sq/sqsh/package.nix +++ b/pkgs/by-name/sq/sqsh/package.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace configure --replace "libct.so" "libct.dylib" ''; + # 'bool' used as identifier rejected by gcc 15's C23 default. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + enableParallelBuilding = true; buildInputs = [ diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix index acbc8615f3eb..f05db0512451 100644 --- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix +++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix @@ -42,7 +42,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "stable-diffusion-cpp"; - version = "master-558-8afbeb6"; + version = "master-625-f683c88"; outputs = [ "out" @@ -52,8 +52,8 @@ effectiveStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "leejet"; repo = "stable-diffusion.cpp"; - rev = "master-558-8afbeb6"; - hash = "sha256-YRgOBvTk/+AfXeZIzkhCBNsLTzoLZ35+0eqtw7TP5ME="; + rev = "master-625-f683c88"; + hash = "sha256-eqVPgETCIwxvmpVwRUGx8hwqX9wV6ynER5uWxoctUw4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 19aaa773b7a3..c179f20a9503 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.62.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-vgG2F2fI8whwAoHKU5f+LEeI+mmJ2oPzObwtmKSrsoo="; + hash = "sha256-oow47NY+kVoReIXwfkhdLDY5zSPaBJhty9mjdjXmQuU="; }; vendorHash = "sha256-7Zxxom+RJJ4cjQ8Knl/96MUMRrQp3P4wQjSNUccLTYw="; diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 92b10f2647f1..ea7986f959b6 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0-unstable-2026-05-09"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "f61bc82c0c90569de508f0c71a6ba7f4aba9cca7"; - hash = "sha256-4LtWT+BFSPaq5DXQPlZ+xVrW/osS9yhG5T0tEfSdczs="; + rev = "f0d256d60d9b9736b274a0edc0492be472318166"; + hash = "sha256-dylteN19qQ/MclInQ+x4vf+rBGNIsaKWJ+WgiS0ZBjI="; }; cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ="; diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index d84f3fa255b0..95c12b74233c 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -10,6 +10,8 @@ libtool, libunwind, perl, + postgresql, + postgresqlTestHook, pkg-config, ripgrep, rustc, @@ -48,13 +50,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "26.0.1"; + version = "26.1.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-u9sipDwTBhhvcyEcdBUZjtg70a76g2e4ub+vPKzOKg8="; + hash = "sha256-0bdomxjx+Qwvxu6NWUTYbLvoKwCvM0e5I3qwhKLEecM="; fetchSubmodules = true; }; @@ -113,6 +115,11 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook ]; + nativeCheckInputs = [ + postgresql + postgresqlTestHook + ]; + buildInputs = [ libpq libunwind @@ -120,6 +127,16 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + doCheck = true; + + postgresqlTestUserOptions = "LOGIN CREATEDB"; + + postgresqlTestSetupPost = '' + for database in $(seq 0 15); do + createdb "test$database" + done + ''; + preConfigure = '' # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on # having the .git directory present, so directly provide the version @@ -142,6 +159,19 @@ stdenv.mkDerivation (finalAttrs: { ./autogen.sh ''; + checkPhase = '' + runHook preCheck + + # The full upstream test suite is too heavy for a default package check: it + # includes long-running integration scenarios and Soroban tests across all + # p21-p26 protocol crates. Keep this focused on a basic consensus smoke test + # plus a PostgreSQL-backed persistence test. + ./src/stellar-core test --ll fatal -w NoTests -a -r simple --disable-dots "standalone" + ./src/stellar-core test --ll fatal -w NoTests -a -r simple --disable-dots "SCP State" + + runHook postCheck + ''; + meta = { description = "Reference peer-to-peer agent that manages the Stellar network"; longDescription = '' diff --git a/pkgs/by-name/st/storm/package.nix b/pkgs/by-name/st/storm/package.nix index d22eabbbb159..4036b8eca772 100644 --- a/pkgs/by-name/st/storm/package.nix +++ b/pkgs/by-name/st/storm/package.nix @@ -79,9 +79,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Distributed realtime computation system"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - vizanto - ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/su/supernovas/package.nix b/pkgs/by-name/su/supernovas/package.nix index 2131b42e4c9f..cf0cd272c6a5 100644 --- a/pkgs/by-name/su/supernovas/package.nix +++ b/pkgs/by-name/su/supernovas/package.nix @@ -5,16 +5,17 @@ cmake, calceph, withCalceph ? true, + cppSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "supernovas"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { - owner = "smithsonian"; + owner = "Sigmyne"; repo = "supernovas"; tag = "v${finalAttrs.version}"; - hash = "sha256-2M5gBtjCPdVpLU5YsUWVJoRH1YWMZ48ADHwwc3ZJRPk="; + hash = "sha256-sLGl9Lh7bpvxhQ568kmwOMgVxFhH2lDRY/ftX6Oqm2w="; }; nativeBuildInputs = [ @@ -27,8 +28,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_CALCEPH" withCalceph) (lib.cmakeBool "BUILD_EXAMPLES" false) + (lib.cmakeBool "ENABLE_CPP" cppSupport) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; + doCheck = true; + meta = { description = "High-performance astrometry library for C/C++"; homepage = "https://smithsonian.github.io/SuperNOVAS/"; diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix index 08a57e6cdd4c..2d44cd06482a 100644 --- a/pkgs/by-name/sw/swiftformat/package.nix +++ b/pkgs/by-name/sw/swiftformat/package.nix @@ -1,20 +1,21 @@ { lib, fetchFromGitHub, + runCommand, swift, swiftpm, versionCheckHook, nix-update-script, }: -swift.stdenv.mkDerivation rec { +swift.stdenv.mkDerivation (finalAttrs: { pname = "swiftformat"; version = "0.61.1"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-h0d/vdoKZuYJkMO+TmFFgomaSVA94P+MKclSlBlIleE="; }; @@ -34,6 +35,37 @@ swift.stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + + tests.format = + runCommand "swiftformat-test-format" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } + '' + export CACHE_DIR=$(mktemp -d) + printf "class Test{\nvar a:Int=1;;\n}" > test.swift + swiftformat --cache $CACHE_DIR --swiftversion 5.8 --indent 2 test.swift 2> stderr.txt + + grep -Fxq "Running SwiftFormat..." stderr.txt + grep -Fxq "1/1 files formatted." stderr.txt + + cat > expected.swift <<'EOF' + class Test { + var a: Int = 1 + } + EOF + + cmp expected.swift test.swift + + swiftformat --cache $CACHE_DIR --swiftversion 5.8 --indent 2 test.swift 2> stderr.txt + + grep -Fxq "Running SwiftFormat..." stderr.txt + grep -Fxq "0/1 files formatted." stderr.txt + + cmp expected.swift test.swift + + touch $out + ''; }; meta = { @@ -46,4 +78,4 @@ swift.stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index a6879cece260..d9568c7b5464 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -1627,7 +1627,6 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { let distro_id = required_env("DISTRO_ID")?; let pre_switch_check = required_env("PRE_SWITCH_CHECK")?; let install_bootloader = required_env("INSTALL_BOOTLOADER")?; - let locale_archive = required_env("LOCALE_ARCHIVE")?; let new_systemd = PathBuf::from(required_env("SYSTEMD")?); let log_level = if std::env::var("STC_DEBUG").is_ok() { LevelFilter::Debug @@ -1642,11 +1641,6 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { // environment variable from now on std::env::set_var("NIXOS_ACTION", Into::<&'static str>::into(action)); - // Expose the locale archive as an environment variable for systemctl and the activation script - if !locale_archive.is_empty() { - std::env::set_var("LOCALE_ARCHIVE", locale_archive); - } - let os_release = parse_os_release().context("Failed to parse os-release")?; let distro_id_re = Regex::new(format!("^\"?{distro_id}\"?$").as_str()) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 765b3ab7dae0..1023938f1168 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.2.4"; + version = "4.3.0"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-ky9wRSBSg/Syb5pMPwJ5WFJr9bzIV3p+LxgALh61FF4="; - aarch64-linux = "sha256-MPpa2NJuj1qut+UA2mAVVDxbu/t9fXdbg/vD+5zV73w="; - x86_64-darwin = "sha256-T8u/TmgORiNlpB/qr0QU+Swl9bzAp3KaYkMsBegXNzM="; - x86_64-linux = "sha256-yr7vBJzeq2Gl+mtl6iij6OU7ioXliIOUeGjHMPxIvew="; + aarch64-darwin = "sha256-VrS7xi29xGFKeJMNnGmGQjouxj5OZAFEpZpdlckUMi4="; + aarch64-linux = "sha256-j0jctyvjs1HBBWPFMptGOLqFFoINw7OhYJYloWbofL0="; + x86_64-darwin = "sha256-K6JS93CBcJHm0NEqhODdUxvMKarRv9nZdqOv8aBxtno="; + x86_64-linux = "sha256-c/DlRZBU5c+qirbzuUDz++DxPMf9g7wk58ZVAzwgNAA="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/ta/taskopen/package.nix b/pkgs/by-name/ta/taskopen/package.nix index b46f3d98ec35..9df6743135f3 100644 --- a/pkgs/by-name/ta/taskopen/package.nix +++ b/pkgs/by-name/ta/taskopen/package.nix @@ -6,49 +6,36 @@ which, perl, perlPackages, + buildNimPackage, + git, }: -stdenv.mkDerivation (finalAttrs: { +buildNimPackage (finalAttrs: { pname = "taskopen"; - version = "1.1.5"; + version = "2.0.3"; src = fetchFromGitHub { - owner = "ValiValpas"; + owner = "jschlatow"; repo = "taskopen"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg="; + sha256 = "sha256-0SAiSaN9V1JYnyJsWda6unqUlyXRL8y8JHXP4VNAFhM="; }; - postPatch = '' - # We don't need a DESTDIR and an empty string results in an absolute path - # (due to the trailing slash) which breaks the build. - sed 's|$(DESTDIR)/||' -i Makefile - ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - which - ] - ++ (with perlPackages; [ - JSON - perl - ]); + + buildPhase = '' + export HOME=$(pwd) + ''; installPhase = '' - make PREFIX=$out make PREFIX=$out install ''; - postFixup = '' - wrapProgram $out/bin/taskopen \ - --set PERL5LIB "$PERL5LIB" - ''; - meta = { description = "Script for taking notes and open urls with taskwarrior"; mainProgram = "taskopen"; homepage = "https://github.com/ValiValpas/taskopen"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.winpat ]; }; diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix index df7f5210a381..8930a708170e 100644 --- a/pkgs/by-name/te/telemt/package.nix +++ b/pkgs/by-name/te/telemt/package.nix @@ -16,10 +16,18 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw="; + checkFlags = [ + # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths + "--skip=proxy::middle_relay::middle_relay_atomic_quota_invariant_tests::me_writer_data_write_obeys_flow_cancellation" + # flaky: timing-coupling assertion fires on slower hardware + "--skip=proxy::masking::masking_timing_budget_coupling_security_tests::adversarial_delayed_interface_lookup_does_not_consume_outcome_floor_budget" + ]; + meta = { mainProgram = "telemt"; description = "MTProxy for Telegram on Rust + Tokio"; homepage = "https://github.com/telemt/telemt"; maintainers = with lib.maintainers; [ r4v3n6101 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch b/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch deleted file mode 100644 index b390d492467c..000000000000 --- a/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -@@ -696,7 +696,7 @@ func init() { - // Load protocols - data, err := ioutil.ReadFile("/etc/protocols") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - -@@ -732,7 +732,7 @@ func init() { - // Load services - data, err = ioutil.ReadFile("/etc/services") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 6faef182017f..5e5ce315161a 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -10,23 +10,16 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tTPm/2ftCz0G6ytkzsyzQiJDWp48f9nzzY/J2Z1TZjo="; + hash = "sha256-P/wfvKRAvqRgUJabVE9RvT4o3fNZ52JX48hXm3C3orI="; }; - vendorHash = "sha256-/3c1J0i0hr309G7iEmtnc24reqH17Q9E5dxOPufmYQc="; - - overrideModAttrs = old: { - # https://gitlab.com/cznic/libc/-/merge_requests/10 - postBuild = '' - patch -p0 < ${./darwin-sandbox-fix.patch} - ''; - }; + vendorHash = "sha256-dD21m6tlwkZkclYOcYUNlsPXxYmLggjrFTv9XctCIt0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index bebf509a1f60..0f664e99dc09 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "tenv"; - version = "4.12.0"; + version = "4.12.2"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ph44Iy/yUdtSi3zkCeDZyWeSa+0l6nr34Co1JupD2eY="; + hash = "sha256-gWXBxw0dvaPCB9zCODFx5QM/6duVDuZgjI3l9VCPBtQ="; }; - vendorHash = "sha256-CBAjiUMnyA7yq08Z1fOSOAeSy/8uSCra6l63C8fn6tU="; + vendorHash = "sha256-8RHWpJ6cxnaIMeX9aL1144lOFmuKf74EB8cbT1yCXJc="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/te/termirs/package.nix b/pkgs/by-name/te/termirs/package.nix index 6f5a16d78df1..3fd1b6324c62 100644 --- a/pkgs/by-name/te/termirs/package.nix +++ b/pkgs/by-name/te/termirs/package.nix @@ -8,16 +8,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "termirs"; - version = "0.2.5"; + version = "0.3.2"; src = fetchFromGitHub { owner = "caelansar"; repo = "termirs"; tag = "v${finalAttrs.version}"; - hash = "sha256-n9/rtPDf7wNAjumOetiLRPVHWLReAYHhntJ+BgJ7f10="; + hash = "sha256-Ae295u1qJLWrtWSYK+c9wMgjW6m3rvTJzVsm25BeXZo="; }; - cargoHash = "sha256-Kkf20ljB2hm6e4hZXEGIg2l83ugxNlHUPpwxKEyBpdY="; + cargoHash = "sha256-klSZDK3s5X7qRopXVy3Qec3Dnuu9ov0bfuhwc6DwpIM="; + + postPatch = '' + substituteInPlace ../termirs-0.3.2-vendor/source-git-0/wezterm-term-0.1.0/src/terminalstate/mod.rs \ + --replace-fail 'include_bytes!("../../../termwiz/data/wezterm")' 'include_bytes!("../../../termwiz-0.24.0/data/wezterm")' + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/terser/package.nix b/pkgs/by-name/te/terser/package.nix index 3addfd8bbbce..14ad0e9f2929 100644 --- a/pkgs/by-name/te/terser/package.nix +++ b/pkgs/by-name/te/terser/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.46.1"; + version = "5.47.1"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-Ob3bzaUrHfDaRy25eWmE3YEtZxhZGYp6TEMtDWbzgQs="; + hash = "sha256-IgbYZ8Ox1SR+USrtFMqkt8C1bEqzHLJLrdAgYc/JBSg="; }; - npmDepsHash = "sha256-24z5w43ciXydl14XwC0XZ5kZX9HoXFQyWHYntQXMHy0="; + npmDepsHash = "sha256-Bg91btVnpZKTKu9lrPlPtFcnHmpM0PU+QVxCPdkCeFI="; meta = { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index f85fa46b8650..68e553eb4c28 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.16"; + version = "1.2.18"; 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-dyCK64IxHbuW7Ciwpv4dz6pksSXp4rJlx76isUCm3tY="; + hash = "sha256-+TXQWaZ6+ahXcy8Kibh7VuqaclLglI3FJnW5qMjmuAg="; }; "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-C6A+FE+M1T8FNNvA7qzwUWuNxnHwFaS5vUp9avQoFQ0="; + hash = "sha256-9/WBa6qzIc+yulPFVC6tpfdrhxCda23iLmu+Vy99HvQ="; }; "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-dFscQSdRBiT6giSGx+ASPKS+6/WcqtrlvEuqhblCFTE="; + hash = "sha256-5s9FTA3lI6mrt34di80nrP/5oTH2lqz1BwFo2Pd8ErY="; }; "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-v3h2IdET0SACeTzXZyuq0SFqBDU+oDNMn7im8hBqWaU="; + hash = "sha256-3dwFFYk2WIqQf6sFVc4Jq1Zhgb4Tvvlj0IhQlnyJ6KA="; }; }; diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index f3dd3a8a1107..740be70f3db1 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-1Zn/JeRCwLH1kC+sZGNdez2Um6VZgEvCf4BwbWTfMSs="; - "x86_64-linux" = "sha256-T2CjzbpxfOPYgJpAqOqcID1pvGW7FJFpRk6/hdgKiOk="; - "aarch64-linux" = "sha256-Y4UsPOno5bfWGHYh2BwV2L9xLiFjv/wuVAW+FSevuV8="; + "universal-macos" = "sha256-MyTSCp5bf24Z6VnwYL3tkj7HNUcQ0S5m5fmzYjKmg08="; + "x86_64-linux" = "sha256-tkg7SP3ln5cw7rs7qM+yd8l/FICC98argrkMZPjrkKk="; + "aarch64-linux" = "sha256-SLw2mFQWylfwNbxYQi0wCje1A4foPqxZn9GxkQEu6Zs="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.17.3"; + version = "0.17.4"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index db2b370e041c..34adb01efa47 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-J/jPKi2R3itM6NbizFVhyaRbjpoKRI1e0BO5n7y9B18="; + hash = "sha256-GK+RZWwfsRaQU0x2ror9d7XBV1bq/FaXS6Ugbbr9eeg="; }; vendorHash = "sha256-b6UmayV913SVyV5+1BMZiRM7SV/Asau6xkx87DWTf9k="; diff --git a/pkgs/by-name/ti/ting/package.nix b/pkgs/by-name/ti/ting/package.nix index 189320e4a6e2..b1b6e62d3b45 100644 --- a/pkgs/by-name/ti/ting/package.nix +++ b/pkgs/by-name/ti/ting/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ting"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "dhth"; repo = "ting"; tag = "v${finalAttrs.version}"; - hash = "sha256-k6TJ9/YtsjNNYPj8YUGCfaQaVwXHoUQG4muOvrkN34A="; + hash = "sha256-D5u/zRjUu+fku6MdtBuwjYQqCkaQbI4sN0UR5NLFN8c="; }; - cargoHash = "sha256-yDSOXvRRBIDYhggj1SwAHxI3jv+xAs2LTUmUqPxCk00="; + cargoHash = "sha256-17hmYsbOOJcrepwI4Q6VuB42SF7ec+BJYTlGKmxkL5w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix index 6ea3a0ba875e..92d90ac3d9c2 100644 --- a/pkgs/by-name/ti/tinygltf/package.nix +++ b/pkgs/by-name/ti/tinygltf/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinygltf"; - version = "2.9.7"; + version = "3.0.0"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; tag = "v${finalAttrs.version}"; - hash = "sha256-tG9hrR2rsfgS8zCBNdcplig2vyiIcNspSVKop03Zx9A="; + hash = "sha256-qs/7O/nPXpMbn31smMfdd3V9zRbyhAnDyjZwlduseKU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/translatelocally/gcc15_compat_vnd_marian_missing_include.patch b/pkgs/by-name/tr/translatelocally/gcc15_compat_vnd_marian_missing_include.patch new file mode 100644 index 000000000000..615d0a5e22a0 --- /dev/null +++ b/pkgs/by-name/tr/translatelocally/gcc15_compat_vnd_marian_missing_include.patch @@ -0,0 +1,12 @@ +diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/microsoft/quicksand.h b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/microsoft/quicksand.h +index 87de194..85e85a1 100755 +--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/microsoft/quicksand.h ++++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/microsoft/quicksand.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + namespace marian { + diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix index 14725b44a0e2..46cc3969873c 100644 --- a/pkgs/by-name/tr/translatelocally/package.nix +++ b/pkgs/by-name/tr/translatelocally/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./version_without_git.patch + ./gcc15_compat_vnd_marian_missing_include.patch ]; postPatch = '' diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index c3667820f8c3..b1bb4e071fd1 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.92.19"; + version = "2.99.1"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-XqpLEJ/jmAzw+m2LEhP+oNCNGVRLkDCgNuYkEeZgf8Q="; + hash = "sha256-pe6X4TCMB0V1U7tiTUF5cGMcaX9HOeI4Ubpc6TddJ6c="; }; postPatch = '' diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index 47ad1919995a..4b7f4f25a6b8 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -8,13 +8,13 @@ buildGo126Module (finalAttrs: { pname = "tsgolint"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-v6gSUeBcjSx/3/hjBST3ba6N366GQvryVTeAjV5+zEc="; + hash = "sha256-lwOjdc+q7u1zVHynYpnyUXMDQxlfSxey/Jnry02VWYM="; fetchSubmodules = true; }; @@ -41,7 +41,7 @@ buildGo126Module (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-sdGpBrDie+VSOX4jhobipEN9BY6JjdM7fdmdYKXkb44="; + vendorHash = "sha256-k16zfFZNCGMg9n8btdWAy11wzg7CVntKgsSPujIJRtE="; subPackages = [ "cmd/tsgolint" ]; diff --git a/pkgs/by-name/ts/tsshd/package.nix b/pkgs/by-name/ts/tsshd/package.nix index 7f584dca4c3c..e583e912644c 100644 --- a/pkgs/by-name/ts/tsshd/package.nix +++ b/pkgs/by-name/ts/tsshd/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "tsshd"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "trzsz"; repo = finalAttrs.pname; tag = "v${finalAttrs.version}"; - hash = "sha256-9llfXzAAQgAOeaD+o3AVyhP0uL88uQsCNlqAPNfzDVw="; + hash = "sha256-YqSSJA/jP8WRbfwC5fxFE4su01ZEPQNmiNRr96pDE1g="; }; - vendorHash = "sha256-btTWkuLkT2e58TYqe0e/cE/0Try/g8XoahiABSSFaGU="; + vendorHash = "sha256-HJWxphZuBh3gXPoEqL/EVGtwdWyW+cMSQhKyfSymKG0="; ldflags = [ "-s" diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 46ac449b10d6..9e20702b11ac 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ueberzugpp"; - version = "2.9.8"; + version = "2.9.10"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU="; + hash = "sha256-YrMFSbNQLamqT7asVxDz8JYgjYNdbdbR7axeopgWTMk="; }; strictDeps = true; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index af6967c337d5..0a8c427d0947 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -130,6 +130,9 @@ python3.pkgs.buildPythonApplication rec { "test_all_handlers[filesystem.extfs]" # regression in erofs-utils 1.9 https://github.com/onekey-sec/unblob/commit/c7c9f20dd871a5694d41a95ca3041eb0c98e257a "test_all_handlers[filesystem.android.erofs]" + # unblob's landlock sandbox denies hardlinks within the extract dir (EXDEV). https://github.com/onekey-sec/unblob/issues/1210 + "test_all_handlers[filesystem.romfs]" + "test_all_handlers[filesystem.yaffs]" ]; passthru = { diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix index 22c065c33a60..bf1133275743 100644 --- a/pkgs/by-name/un/unvanquished/package.nix +++ b/pkgs/by-name/un/unvanquished/package.nix @@ -34,7 +34,7 @@ }: let - version = "0.56.1"; + version = "0.56.2"; binary-deps-version = "11"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "Unvanquished"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-MIsHW56RYkh5xtidHpBOEwQQSsvGMEdAdGt5fQvqXxQ="; + hash = "sha256-+3y9UJAMfMDIO4feHTyb5IWIelRSsH6KF6WAtx7rric="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -121,7 +121,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-HnWdOvi7fcKmktLVbdUfMnB8v3iHb1t7jEERUcYcxNg="; + outputHash = "sha256-lXhzrA30wiNtCvpl4xxrIyl5Vcd4TvSQAuBK73vZXHs="; outputHashMode = "recursive"; nativeBuildInputs = [ diff --git a/pkgs/by-name/vc/vcs2l/package.nix b/pkgs/by-name/vc/vcs2l/package.nix index 745bb39ac07f..06158152bc62 100644 --- a/pkgs/by-name/vc/vcs2l/package.nix +++ b/pkgs/by-name/vc/vcs2l/package.nix @@ -5,6 +5,7 @@ git, breezy, subversion, + installShellFiles, }: with python3Packages; @@ -26,6 +27,8 @@ buildPythonApplication (finalAttrs: { setuptools # pkg_resources is imported during runtime ]; + nativeBuildInputs = [ installShellFiles ]; + makeWrapperArgs = [ "--prefix" "PATH" @@ -41,6 +44,11 @@ buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "vcs2l" ]; + postInstall = '' + installShellCompletion $out/share/vcs2l-completion/vcs.{bash,fish,zsh} + rm -rf $out/share/vcs2l-completion + ''; + meta = { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/ros-infrastructure/vcs2l"; @@ -49,5 +57,6 @@ buildPythonApplication (finalAttrs: { esteve sivteck ]; + mainProgram = "vcs"; }; }) diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index 7a023ef9bb95..8aea543c4af3 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "vhdl-ls"; - version = "0.86.0"; + version = "0.87.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-H8s4YZPpe7Z3IafY4lt4Gn/jjeULJFSA/6kMb9IrV50="; + hash = "sha256-tQdBiUoPRmPBNDutgCTkaUq022blrujT6G562KdQPqE="; }; - cargoHash = "sha256-ULJpmT8DXSr6hqBxn6weWJUmplCboxhSekxaWmu4aHE="; + cargoHash = "sha256-m/wYku+RRoZ2zULb/guVswG7SWoWjhp04R0sNI6HXgs="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/by-name/vi/virglrenderer/1001-virglrenderer-amdgpu-Use-inttypes-format-defines.patch b/pkgs/by-name/vi/virglrenderer/1001-virglrenderer-amdgpu-Use-inttypes-format-defines.patch new file mode 100644 index 000000000000..6286d9cf8827 --- /dev/null +++ b/pkgs/by-name/vi/virglrenderer/1001-virglrenderer-amdgpu-Use-inttypes-format-defines.patch @@ -0,0 +1,225 @@ +From 53ff47b465808d581087f8ef657378e28e6170d4 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Wed, 13 May 2026 13:30:14 +0200 +Subject: [PATCH] drm/amdgpu: Use inttypes.h format defines for *64_t types + +--- + src/drm/amdgpu/amdgpu_renderer.c | 56 ++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 24 deletions(-) + +diff --git a/src/drm/amdgpu/amdgpu_renderer.c b/src/drm/amdgpu/amdgpu_renderer.c +index e7f47c34..80baf960 100644 +--- a/src/drm/amdgpu/amdgpu_renderer.c ++++ b/src/drm/amdgpu/amdgpu_renderer.c +@@ -259,7 +259,7 @@ amdgpu_renderer_attach_resource(struct virgl_context *vctx, struct virgl_resourc + obj->bo = import.buf_handle; + amdgpu_bo_export(obj->bo, amdgpu_bo_handle_type_kms, &obj->base.handle); + amdgpu_object_set_res_id(ctx, obj, res->res_id); +- print(1, "imported dmabuf -> res_id=%u" PRIx64, res->res_id); ++ print(1, "imported dmabuf -> res_id=%u", res->res_id); + } else { + print(2, "Ignored res_id: %d (fd_type = %d)", res->res_id, fd_type); + if (fd_type != VIRGL_RESOURCE_FD_INVALID) +@@ -411,7 +411,7 @@ amdgpu_renderer_get_blob(struct virgl_context *vctx, uint32_t res_id, uint64_t b + + /* If GEM_NEW fails, we can end up here without a backing obj or if it's a dumb buffer. */ + if (!obj) { +- print(0, "No object with blob_id=%ld", blob_id); ++ print(0, "No object with blob_id=%" PRIu64, blob_id); + return -ENOENT; + } + +@@ -424,7 +424,7 @@ amdgpu_renderer_get_blob(struct virgl_context *vctx, uint32_t res_id, uint64_t b + * to the same storage. + */ + if (obj->exported) { +- print(0, "Already exported! blob_id:%ld", blob_id); ++ print(0, "Already exported! blob_id:%" PRIu64, blob_id); + return -EINVAL; + } + +@@ -436,7 +436,7 @@ amdgpu_renderer_get_blob(struct virgl_context *vctx, uint32_t res_id, uint64_t b + ret = amdgpu_bo_export(obj->bo, amdgpu_bo_handle_type_dma_buf_fd, (uint32_t *)&fd); + + if (ret) { +- print(0, "Export to fd failed for blob_id:%ld r=%d (%s)", blob_id, ret, strerror(errno)); ++ print(0, "Export to fd failed for blob_id:%" PRIu64 " r=%d (%s)", blob_id, ret, strerror(errno)); + return ret; + } + +@@ -470,7 +470,7 @@ amdgpu_ccmd_query_info(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + struct amdgpu_ccmd_query_info_rsp *rsp; + unsigned rsp_len; + if (__builtin_add_overflow(sizeof(*rsp), req->info.return_size, &rsp_len)) { +- print(1, "%s: Request size overflow: %zu + %" PRIu32 " > %u", ++ print(1, "%s: Request size overflow: %zu + %u > %u", + __FUNCTION__, sizeof(*rsp), req->info.return_size, UINT_MAX); + return -EINVAL; + } +@@ -510,12 +510,12 @@ amdgpu_ccmd_gem_new(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + + if (req->r.__pad) { + print(0, "Invalid value for struct %s_req::r::__pad: " +- "0x%" PRIx32, __FUNCTION__, req->r.__pad); ++ "0x%x", __FUNCTION__, req->r.__pad); + ret = -EINVAL; + goto alloc_failed; + } + if (!drm_context_blob_id_valid(dctx, req->blob_id)) { +- print(0, "Invalid blob_id %ld", req->blob_id); ++ print(0, "Invalid blob_id %" PRIu64, req->blob_id); + ret = -EINVAL; + goto alloc_failed; + } +@@ -553,7 +553,7 @@ amdgpu_ccmd_gem_new(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + + drm_context_object_set_blob_id(dctx, &obj->base, req->blob_id); + +- print(2, "new object blob_id: %ld heap: %08x flags: %lx size: %ld", ++ print(2, "new object blob_id: %" PRIu64 " heap: %08x flags: %" PRIx64" size: %" PRIu64, + req->blob_id, req->r.preferred_heap, req->r.flags, req->r.alloc_size); + + return 0; +@@ -562,7 +562,7 @@ va_map_failed: + amdgpu_bo_free(bo_handle); + + alloc_failed: +- print(2, "ERROR blob_id: %ld heap: %08x flags: %lx", ++ print(2, "ERROR blob_id: %" PRIu64 " heap: %08x flags: %" PRIx64, + req->blob_id, req->r.preferred_heap, req->r.flags); + if (ctx->shmem) + ctx->shmem->async_error++; +@@ -593,7 +593,10 @@ amdgpu_ccmd_bo_va_op(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + } else { + obj = amdgpu_get_object_from_res_id(ctx, req->res_id, __FUNCTION__); + if (!obj) { +- print(0, "amdgpu_bo_va_op_raw failed: op: %d res_id: %d offset: 0x%lx size: 0x%lx va: %" PRIx64 " r=%d", ++ print(0, ++ "amdgpu_bo_va_op_raw failed: " ++ "op: %d res_id: %d offset: 0x%" PRIx64 " " ++ "size: 0x%" PRIx64 " va: %" PRIx64 " r=%d", + req->op, obj->base.res_id, req->offset, req->vm_map_size, req->va, rsp->ret); + + /* This is ok. This means the guest closed the GEM already. */ +@@ -609,11 +612,16 @@ amdgpu_ccmd_bo_va_op(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + if (ctx->shmem) + ctx->shmem->async_error++; + +- print(0, "amdgpu_bo_va_op_raw failed: op: %d res_id: %d offset: 0x%lx size: 0x%lx va: %" PRIx64 " r=%d", ++ print(0, ++ "amdgpu_bo_va_op_raw failed: " ++ "op: %d res_id: %d offset: 0x%" PRIx64 " " ++ "size: 0x%" PRIx64 " va: %" PRIx64 " r=%d", + req->op, req->res_id, req->offset, req->vm_map_size, req->va, rsp->ret); + } else { +- print(2, "va_op %d res_id: %u va: [0x%" PRIx64 ", 0x%" PRIx64 "] @offset 0x%" PRIx64, +- req->op, req->res_id, req->va, req->va + req->vm_map_size - 1, req->offset); ++ print(2, ++ "va_op %d res_id: %u " ++ "va: [0x%" PRIx64 ", 0x%" PRIx64 "] @offset 0x%" PRIx64, ++ req->op, req->res_id, req->va, req->va + req->vm_map_size - 1, req->offset); + } + + return 0; +@@ -646,7 +654,7 @@ amdgpu_ccmd_set_metadata(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + metadata.size_metadata = req->size_metadata; + if (req->size_metadata) { + if (req->size_metadata > sizeof(metadata.umd_metadata)) { +- print(0, "Metadata size is too large for target buffer: %" PRIu32 " > %zu", ++ print(0, "Metadata size is too large for target buffer: %u > %zu", + req->size_metadata, sizeof(metadata.umd_metadata)); + rsp->ret = -EINVAL; + return -1; +@@ -655,7 +663,7 @@ amdgpu_ccmd_set_metadata(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + offsetof(struct amdgpu_ccmd_set_metadata_req, + umd_metadata)); + if (requested_size > hdr->len) { +- print(0, "Metadata size is too large for source buffer: %zu > %" PRIu32, ++ print(0, "Metadata size is too large for source buffer: %zu > %u", + requested_size, hdr->len); + rsp->ret = -EINVAL; + return -1; +@@ -736,7 +744,7 @@ amdgpu_ccmd_create_ctx(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + } + + if (req->flags & ~AMDGPU_CCMD_CREATE_CTX_DESTROY) { +- print(0, "Invalid flags 0x%" PRIu32, req->flags); ++ print(0, "Invalid flags 0x%u", req->flags); + rsp->hdr.ret = -EINVAL; + return -1; + } +@@ -827,7 +835,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + } + /* Do not allocate arbitrarily large buffer. */ + if (req->num_chunks > AMDGPU_CCMD_CS_SUBMIT_MAX_NUM_CHUNKS) { +- print(1, "%s: Invalid num_chunks: %" PRIu32 " > %d", ++ print(1, "%s: Invalid num_chunks: %u > %d", + __FUNCTION__, req->num_chunks, AMDGPU_CCMD_CS_SUBMIT_MAX_NUM_CHUNKS); + rsp->ret = -EINVAL; + return -1; +@@ -842,7 +850,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + chunks = malloc((req->num_chunks + 1 /* syncobj_in */ + 1 /* syncobj_out */) * + sizeof(*chunks)); + if (chunks == NULL) { +- print(0, "Failed to allocate %" PRIu32 " chunks", req->num_chunks + 2); ++ print(0, "Failed to allocate %u chunks", req->num_chunks + 2); + r = -EINVAL; + goto end; + } +@@ -858,7 +866,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + size_t descriptors_len = size_add(offsetof(struct amdgpu_ccmd_cs_submit_req, payload), + size_mul(req->num_chunks, sizeof(struct desc))); + if (descriptors_len > hdr->len) { +- print(0, "Descriptors are out of bounds: %zu + %zu * %" PRIu32 " > %" PRIu32, ++ print(0, "Descriptors are out of bounds: %zu + %zu * %u > %u", + offsetof(struct amdgpu_ccmd_cs_submit_req, payload), + sizeof(struct desc), req->num_chunks, hdr->len); + r = -EINVAL; +@@ -875,7 +883,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + chunks[num_chunks].chunk_id = chunk_id; + /* Validate input. */ + if (end > hdr->len) { +- print(0, "Descriptors are out of bounds: %zu > %" PRIu32, end, hdr->len); ++ print(0, "Descriptors are out of bounds: %zu > %u", end, hdr->len); + r = -EINVAL; + goto end; + } +@@ -936,7 +944,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + } + in = input; + if (in->offset % sizeof(uint64_t)) { +- print(0, "Invalid chunk offset %" PRIu32 " (not multiple of 8)", in->offset); ++ print(0, "Invalid chunk offset %u (not multiple of 8)", in->offset); + r = -EINVAL; + goto end; + } +@@ -1043,7 +1051,7 @@ amdgpu_ccmd_cs_submit(struct drm_context *dctx, struct vdrm_ccmd_req *hdr) + + drmSyncobjDestroy(amdgpu_device_get_fd(ctx->dev), syncobj_out.handle); + +- print(3, "ctx: %d -> seqno={v=%d a=%ld} r=%d", req->ctx_id, hdr->seqno, seqno, r); ++ print(3, "ctx: %d -> seqno={v=%d a=%" PRIu64 "} r=%d", req->ctx_id, hdr->seqno, seqno, r); + + end: + if (bo_list) +@@ -1158,7 +1166,7 @@ amdgpu_renderer_submit_fence(struct virgl_context *vctx, uint32_t flags, + + /* timeline is ring_idx-1 (because ring_idx 0 is host CPU timeline) */ + if (ring_idx > AMDGPU_HW_IP_NUM) { +- print(0, "invalid ring_idx: %" PRIu32, ring_idx); ++ print(0, "invalid ring_idx: %u", ring_idx); + return -EINVAL; + } + /* ring_idx zero is used for the guest to synchronize with host CPU, +@@ -1170,7 +1178,7 @@ amdgpu_renderer_submit_fence(struct virgl_context *vctx, uint32_t flags, + return 0; + } + +- print(3, "ring_idx: %d fence_id: %lu", ring_idx, fence_id); ++ print(3, "ring_idx: %d fence_id: %" PRIu64, ring_idx, fence_id); + return drm_timeline_submit_fence(&ctx->timelines[ring_idx - 1], flags, fence_id); + } + +-- +2.51.2 + diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index f717cf2ccbdc..7e804b13d16e 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2RoKIjtxShJCaezbkCrtW+lSaWKnOoUZzpSEPCJHSC8="; }; + patches = [ + # https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1624 + ./1001-virglrenderer-amdgpu-Use-inttypes-format-defines.patch + ]; + separateDebugInfo = true; nativeBuildInputs = [ @@ -65,11 +70,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "venus" vulkanSupport) (lib.mesonOption "drm-renderers" ( lib.optionalString nativeContextSupport ( - lib.concatStringsSep "," [ - "amdgpu-experimental" - "asahi" - "msm" - ] + lib.concatStringsSep "," ( + [ + "amdgpu-experimental" + "asahi" + ] + # "MSM renderer doesn't support 32bit ARM target" + # https://gitlab.freedesktop.org/virgl/virglrenderer/-/blob/ea7db39433c40e9799f2dfdbf63e0b4754a0dd3d/meson.build#L338-340 + ++ lib.optionals (!stdenv.hostPlatform.isAarch32) [ + "msm" + ] + ) ) )) ]; diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index 0e6a6aba443c..79872f60b116 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.9.3970.64"; + version = "7.9.3970.67"; suffix = { @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-51Lsbs1Vv8Qy9aBUxPzfadpKia+PHnBjptHY4LSN1Mo="; - x86_64-linux = "sha256-WJn7vmIPJ7/e0UG2uoNedji/Vd0QTY2LNJMBNqTF9Po="; + aarch64-linux = "sha256-GXG1e5d+wxmrzryDQdGplJlAnxAl6kGWzopgE4qH8Zw="; + x86_64-linux = "sha256-fvw2FajFP5Aspwdb+C0XUJLWABrZ7/clD4OX8FLtIKI="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/vk/vkdt/package.nix b/pkgs/by-name/vk/vkdt/package.nix index 22ab9fb1b9e7..a5a541521d9d 100644 --- a/pkgs/by-name/vk/vkdt/package.nix +++ b/pkgs/by-name/vk/vkdt/package.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "prefix=" + "VKDT_USE_RAWINPUT=2" "VKDT_USE_MCRAW=false" # TODO: support mcraw ]; diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix index b28df4f4a5ac..c6eefd51c52f 100644 --- a/pkgs/by-name/vo/voxtype/package.nix +++ b/pkgs/by-name/vo/voxtype/package.nix @@ -21,6 +21,7 @@ pciutils, wl-clipboard, wtype, + which, xclip, xdotool, @@ -51,16 +52,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "voxtype"; - version = "0.6.6"; + version = "0.7.2"; src = fetchFromGitHub { owner = "peteonrails"; repo = "voxtype"; tag = "v${finalAttrs.version}"; - hash = "sha256-D0CgT0Avb7il6/GU8CtxWUGlMHhYZIPbHX952L4orDM="; + hash = "sha256-CpG/5ws9VX8ZQjwtJMxyUF0L90u+j0veHHLHGqTvoIw="; }; - cargoHash = "sha256-h0b3H+79v8G28XNBDdCOZ+Vo+6wpfzckPCsDbRzp1m4="; + cargoHash = "sha256-gHnYssFZixWt7F8oa1yYyfqThCrRsv0U7ezgZUcq1nk="; buildFeatures = [ ] @@ -131,6 +132,7 @@ rustPlatform.buildRustPackage (finalAttrs: { (lib.makeBinPath ( [ libnotify + which ] ++ lib.optionals vulkanSupport [ pciutils diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 0a09412135f4..79588684cd9f 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -14,20 +14,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.2.6"; + version = "3.2.9"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-Igy7Tc2rWbLX7jeuQm8MYbgeKfPYA1a92E8B11CrUyo="; + hash = "sha256-q/5erEPVtXdpsyGnxuq+QySsZKibvKLvniDI1glIP0s="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw="; + hash = "sha256-qm2hDQbOoC04c47w8KSwkdigND6UrkRUGp7YfkRu4as="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index c292251f1bdd..e80e0a1026cf 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 (finalAttrs: { pname = "wasm-tools"; - version = "1.248.0"; + version = "1.249.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-B0G+k5RI7j1J0G4l2lcpA6iTTNUmjQOOwi3zij0Ww+c="; + hash = "sha256-8YIFzaJ10ll4ESVsQWf3hRPBNpgBGFvEdDbwbJ7PsI4="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-yMp8AWcWfxTXq4eIekuPhgOdMbuoscck+r0O01cC+AA="; + cargoHash = "sha256-CuSLE6AwslD0SWQALAY3TTuDCKAbl6w6l5x6CwXaqcM="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer/package.nix b/pkgs/by-name/wa/wasmer/package.nix index e3bcc19b4a47..32404cf6be01 100644 --- a/pkgs/by-name/wa/wasmer/package.nix +++ b/pkgs/by-name/wa/wasmer/package.nix @@ -1,61 +1,165 @@ { lib, - rustPlatform, + stdenv, fetchFromGitHub, - llvmPackages_18, + fetchurl, + rustPlatform, + cargo, + rustc, + nix-update, + curl, + writeShellApplication, + llvmPackages_21, libffi, libxml2, - withLLVM ? true, - withSinglepass ? true, + fixDarwinDylibNames, + withLLVM ? + stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64), + withV8 ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64), }: -rustPlatform.buildRustPackage (finalAttrs: { +let + v8Version = "11.9.2"; + + # Prebuilt V8 from wasmerio's custom builds, only evaluated when withV8 = true. + + # Per-platform hashes, auto-updated via the general updateScript + v8Hashes = { + "v8-linux-amd64.tar.xz" = "sha256-nTCVdBKtyVMb7lE+Db4RDsShKkLbG/0r980ejd+EAvo="; + "v8-linux-musl-amd64.tar.xz" = "sha256-XgRs3I46B2PG7Jrv5E+KSeuNfXLhgB7R66cAkA/Bvv8="; + "v8-darwin-arm64.tar.xz" = "sha256-xAG1PcAGw8a0A9k8d78/whTUXnqdfRZBz8yrg/+iz0M="; + }; + + v8Prebuilt = + let + assetName = + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl then + "v8-linux-musl-amd64.tar.xz" + else if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then + "v8-linux-amd64.tar.xz" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then + "v8-darwin-arm64.tar.xz" + else + throw "withV8 = true is not supported on ${stdenv.hostPlatform.system}"; + in + stdenv.mkDerivation { + name = "wasmer-v8-prebuilt-${v8Version}"; + src = fetchurl { + url = "https://github.com/wasmerio/v8-custom-builds/releases/download/${v8Version}/${assetName}"; + hash = v8Hashes.${assetName}; + }; + sourceRoot = "."; + dontBuild = true; + installPhase = '' + cp -r . $out + ''; + + meta.sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +in + +stdenv.mkDerivation (finalAttrs: { pname = "wasmer"; - version = "5.0.4"; + version = "7.1.0"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "wasmerio"; repo = "wasmer"; tag = "v${finalAttrs.version}"; - hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8="; + hash = "sha256-A1SkZY+iSR9xlu6R1p9uZYsGFPAOifuYTHtEXaEgves="; + fetchSubmodules = true; }; - cargoHash = "sha256-Fympp2A04viibo4U79FiBSJIeGDUWS34OOwebCks6S0="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-wBEwGKjj9DdZESFlXS8T7B0Xdp7yMe08DYTGr4wnTVI="; + }; nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook rustPlatform.bindgenHook - ]; + ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optionals withLLVM [ - llvmPackages_18.llvm + llvmPackages_21.llvm libffi libxml2 ]; - # check references to `compiler_features` in Makefile on update - buildFeatures = [ - "cranelift" - "wasmer-artifact-create" - "static-artifact-create" - "wasmer-artifact-load" - "static-artifact-load" - ] - ++ lib.optional withLLVM "llvm" - ++ lib.optional withSinglepass "singlepass"; + postPatch = + # In 7.1.0 there is no nice flag to toggle napi/v8 on or off, + # so we manually delete the Makefile entry when we don't want v8 + # TODO: v7.2.0 pre-release has a flag, when updating to 7.2.0 + # add "ENABLE_NAPI_V8=${if withV8 then "1" else "0"}" to makeFlags + lib.optionalString (!withV8) '' + substituteInPlace Makefile \ + --replace-fail ' build_wasmer_extra_features += napi-v8' "" + '' + + + lib.optionalString stdenv.hostPlatform.isDarwin + # `install -Dm644 /dev/stdin DEST` fails on darwin with + # "skipping file '/dev/stdin', as it was replaced while being copied". + ( + '' + substituteInPlace Makefile \ + --replace-fail 'echo "$$pc" | install -Dm644 /dev/stdin "$(DESTDIR)"/lib/pkgconfig/wasmer.pc;' \ + 'mkdir -p "$(DESTDIR)/lib/pkgconfig" && printf "%s\n" "$$pc" > "$(DESTDIR)/lib/pkgconfig/wasmer.pc";' + '' + # install-capi-lib hardcodes libwasmer.so and a Linux SONAME symlink chain + # (also marked Linux only in the Makefile) + + '' + substituteInPlace Makefile \ + --replace-fail 'install-capi-lib ' "" + '' + ); - cargoBuildFlags = [ - "--manifest-path" - "lib/cli/Cargo.toml" - "--bin" - "wasmer" + makeFlags = [ + "WASMER_INSTALL_PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + "ENABLE_LLVM=${if withLLVM then "1" else "0"}" ]; - env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages_18.llvm.dev; + # Default all target includes headless C API which doesn't get installed + # by their Makefile and is quite niche to include, so we opt out + buildFlags = [ + "build-wasmer" + "build-capi" + ]; + + env = + lib.optionalAttrs withLLVM { + LLVM_SYS_211_PREFIX = llvmPackages_21.llvm.dev; + } + // lib.optionalAttrs withV8 { + # build.rs skips the download when these are set; see resolve_explicit_v8 in lib/napi/build.rs + NAPI_V8_INCLUDE_DIR = "${v8Prebuilt}/include"; + V8_LIB_DIR = "${v8Prebuilt}/lib"; + }; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm755 target/release/libwasmer.dylib $out/lib/libwasmer.dylib + ''; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "update-wasmer"; + runtimeInputs = [ + nix-update + curl + ]; + text = builtins.readFile ./update.sh; + }); # Tests are failing due to `Cannot allocate memory` and other reasons doCheck = false; meta = { + sourceProvenance = with lib.sourceTypes; [ fromSource ] ++ lib.optional withV8 binaryNativeCode; description = "Universal WebAssembly Runtime"; mainProgram = "wasmer"; longDescription = '' diff --git a/pkgs/by-name/wa/wasmer/update.sh b/pkgs/by-name/wa/wasmer/update.sh new file mode 100644 index 000000000000..7729a17c0a4b --- /dev/null +++ b/pkgs/by-name/wa/wasmer/update.sh @@ -0,0 +1,49 @@ +old_version=$(grep -oP '^ version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix) +echo "Current wasmer version: $old_version" + +nix-update wasmer "$@" + +new_version=$(grep -oP '^ version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix) +if [ "$old_version" = "$new_version" ]; then + echo "Already at $old_version, nothing to do" + exit 0 +fi +echo "Updated wasmer $old_version -> $new_version" + +# v8Version is pinned in package.nix to match PREBUILT_V8_VERSION in lib/napi/build.rs. +# lib/napi is a submodule, so resolve its pinned SHA first, then fetch build.rs from that repo. +echo "Fetching PREBUILT_V8_VERSION from lib/napi/build.rs..." +napi_sha=$(curl -fsSL "https://api.github.com/repos/wasmerio/wasmer/contents/lib/napi?ref=v${new_version}" \ + | grep -oP '"sha":\s*"\K[^"]+' | head -1) +new_v8=$(curl -fsSL "https://raw.githubusercontent.com/wasmerio/napi/${napi_sha}/build.rs" \ + | grep -oP 'PREBUILT_V8_VERSION\s*:\s*&str\s*=\s*"\K[^"]+') +cur_v8=$(grep -oP '^ v8Version = "\K[^"]+(?=";)' pkgs/by-name/wa/wasmer/package.nix) +echo "V8: current=$cur_v8, required=$new_v8" + +if [ "$new_v8" = "$cur_v8" ]; then + echo "V8 version unchanged, done" + exit 0 +fi + +echo "V8 bumped $cur_v8 -> $new_v8, fetching hashes for all platforms..." +sed -i "s|^ v8Version = \"[^\"]*\";$| v8Version = \"$new_v8\";|" \ + pkgs/by-name/wa/wasmer/package.nix + +base="https://github.com/wasmerio/v8-custom-builds/releases/download/$new_v8" +declare -A assets=( + ["v8-linux-amd64.tar.xz"]="$base/v8-linux-amd64.tar.xz" + ["v8-linux-musl-amd64.tar.xz"]="$base/v8-linux-musl-amd64.tar.xz" + ["v8-darwin-arm64.tar.xz"]="$base/v8-darwin-arm64.tar.xz" +) + +for asset in "${!assets[@]}"; do + url="${assets[$asset]}" + echo " Fetching hash for $asset..." + hash=$(nix-prefetch-url --type sha256 "$url" 2>/dev/null \ + | xargs nix hash convert --hash-algo sha256 --to sri) + echo " $asset -> $hash" + sed -i "s|\"$asset\" = \"[^\"]*\"|\"$asset\" = \"$hash\"|" \ + pkgs/by-name/wa/wasmer/package.nix +done + +echo "Done" diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index c112bc5a59ff..cc74de7dcc75 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,28 +7,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmi"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { - owner = "paritytech"; + owner = "wasmi-labs"; repo = "wasmi"; tag = "v${finalAttrs.version}"; - hash = "sha256-+hzvJ0Jq2tFxbCBSSjnUHgZDRb7q0+OGEzMtjZU20Fg="; + hash = "sha256-eFQ0dBOFE/vpRXfAYYZNncAVKMlaGf8jHvBT/a5UQRo="; fetchSubmodules = true; }; - cargoHash = "sha256-8RVKZYMB5ieAnwHpjFloEmswUT8BbSRaSmduaoOa+io="; + cargoHash = "sha256-Vo5MGp3I/8sMDchNQORzlXS8z9Bp6cILnK4aYot9/FE="; passthru.updateScript = nix-update-script { }; meta = { - description = "Efficient WebAssembly interpreter"; - homepage = "https://github.com/paritytech/wasmi"; - changelog = "https://github.com/paritytech/wasmi/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "Efficient and versatile WebAssembly interpreter for embedded systems"; + homepage = "https://github.com/wasmi-labs/wasmi"; + changelog = "https://github.com/wasmi-labs/wasmi/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "wasmi_cli"; - maintainers = [ ]; }; }) diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 6badec6a8e10..7f385a5b9c74 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "watchlog"; - version = "1.257.0"; + version = "1.259.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${finalAttrs.version}"; - hash = "sha256-KesYMimT6GMo5HK7rsasgfylM0F98bZcqCEsJdNPgaM="; + hash = "sha256-MjuQ1k38ZS1d6kJitEH9DTCUWzvUNhm3mto/QAWxE5k="; }; - cargoHash = "sha256-y0U+AQ8a7SEyUl6LtGzD61ArJUx3GU19dnk6KHVaXxM="; + cargoHash = "sha256-Mukw9DLIaPI0/CQws7AQwHmGmX/T4KuoX/2KTAUZXx4="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix index 4d550e035c24..266cd09b3ee8 100644 --- a/pkgs/by-name/wa/wayle/package.nix +++ b/pkgs/by-name/wa/wayle/package.nix @@ -21,7 +21,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wayle"; - version = "0.2.3"; + version = "0.3.0"; __structuredAttrs = true; strictDeps = true; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "wayle-rs"; repo = "wayle"; tag = "v${finalAttrs.version}"; - hash = "sha256-K4ItGV7kTZrm3uqHeN/hSZjKzkQpSn+nan3509FYUQw="; + hash = "sha256-4hnbv31BWu6KbdSHphHnpl80R0ByxS0RxsM5uqtNnCU="; }; - cargoHash = "sha256-omCcKXYouS9qPdhVINJC2mAjI7uG0M9MH14BN/4Zegs="; + cargoHash = "sha256-sXoqNF7hzE97PkRMBnxVFNPa92CgD5gYeMd0RmzPJzY="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix index 4ddfa8db0296..e879d843d13c 100644 --- a/pkgs/by-name/wa/wayscriber/package.nix +++ b/pkgs/by-name/wa/wayscriber/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wayscriber"; - version = "0.9.17"; + version = "0.9.19"; src = fetchFromGitHub { owner = "devmobasa"; repo = "wayscriber"; tag = "v${finalAttrs.version}"; - hash = "sha256-ylvZ+U8et9McvZrHsJFLoWWAtruQnKMk/5lg4uCw/rg="; + hash = "sha256-QvIE4A6i5tz1Emsd1p3vHkQAsm+msSEUsTIM5hEKUi4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango libxkbcommon ]; - cargoHash = "sha256-/q4ux2MXDfrqbUfO1M2lykpDl03MTnVS4ottxSgDFEQ="; + cargoHash = "sha256-ysInAJhjO9nC4O/Q2mffby33faOO0ooJXdrjWmka2kg="; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/wc/wcslib/package.nix b/pkgs/by-name/wc/wcslib/package.nix index 83e0a53bb5cb..a56265119a1f 100644 --- a/pkgs/by-name/wc/wcslib/package.nix +++ b/pkgs/by-name/wc/wcslib/package.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-eS/gXAlURDOppOpUgPrNvsLabSgFgnW16QBqHyjFZGU="; }; + # error: call to undeclared library function 'snprintf' + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include stdio.h"; + nativeBuildInputs = [ flex ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 4a3fe94ce668..f1a058129fb1 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -19,20 +19,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-33gThDw8crrgW5zn9+N8bx6zyuXC2oXu6Slu0WtYrDE="; + hash = "sha256-SYI0LosdR82rUubxl0pNi1huEDcR6bxcaHbjCVT/T/0="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src pname version; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-PnKQthd36HiomYIsjB+TQqVNUX5Wocgnrz0SeHfhEyY="; + hash = "sha256-LXPQpQFXwPEHxktLoRiWTi8NbtzrS5ItUmoKJki3zcs"; }; cargoRoot = "."; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-ZsUHCNiOoCYUDXs6zdtkI+xYPNJbThGhUhgA4erBy4Q="; + hash = "sha256-cCaZ5X57WAaO9F2lP2/wdilXc0Al0Vr3ntyV1/Q5sj8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index 36575f71fc1d..4232683213ec 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - stdenvNoCC, fetchFromGitHub, cmake, pkg-config, @@ -9,6 +8,7 @@ SDL2_image, SDL2_mixer, SDL2_net, + makeBinaryWrapper, SDL2_ttf, pango, gettext, @@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; buildInputs = [ SDL2 @@ -78,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_SYSTEM_LUA=ON" + (lib.cmakeBool "ENABLE_SYSTEM_LUA" true) "-DBINARY_SUFFIX=${suffix}" ]; @@ -110,25 +111,24 @@ stdenv.mkDerivation (finalAttrs: { echo "APPL????" > "$app_contents/PkgInfo" mv $out/bin "$app_contents/MacOS" mv $out/share/wesnoth "$app_contents/Resources" + pushd ../projectfiles/Xcode - substitute Info.plist "$app_contents/Info.plist" \ - --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \ - --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \ - --replace-fail ''\'''${PRODUCT_NAME}' "$app_name" - cp -r Resources/SDLMain.nib "$app_contents/Resources/" - install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources" + substitute Info.plist "$app_contents/Info.plist" \ + --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \ + --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \ + --replace-fail ''\'''${PRODUCT_NAME}' "$app_name" + + cp -r Resources/SDLMain.nib "$app_contents/Resources/" + install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources" popd # Make the game and dedicated server binary available for shell users mkdir -p "$out/bin" ln -s "$app_contents/MacOS/wesnothd${suffix}" "$out/bin/wesnothd${suffix}" + # Symlinking the game binary is unsifficient as it would be unable to # find the bundle resources - cat << EOF > "$out/bin/wesnoth${suffix}" - #!${stdenvNoCC.shell} - open -na "$app_bundle" --args "\$@" - EOF - chmod +x "$out/bin/wesnoth${suffix}" + makeBinaryWrapper "$app_bundle/Contents/MacOS/wesnoth${suffix}" "$out/bin/wesnoth${suffix}" ''; passthru.updateScript = nix-update-script { @@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: { reclaim the throne of Wesnoth, or take hand in any number of other adventures. ''; - homepage = "https://www.wesnoth.org/"; changelog = "https://github.com/wesnoth/wesnoth/blob/${finalAttrs.version}/changelog.md"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 08a8e1f7c79d..52ac71b50298 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "2.2.17", + "version": "2.3.9", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-darwin-arm64-2.2.17.zip", - "sha256": "af7b195ab35e88a34be38edebabd8adedc6fa53cb67955571d86f338ba47f6bc" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a5d3f1ff990cabc0e8001cce6642bdb7ad429e73/Windsurf-darwin-arm64-2.3.9.zip", + "sha256": "35b11cd7307588fa11d4ec4690c2a5da8639e37659d68939e3a1dd46d9a105e3" }, "x86_64-darwin": { - "version": "2.2.17", + "version": "2.3.9", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-darwin-x64-2.2.17.zip", - "sha256": "6799fa251e55c0860b61867835b0258cb0bf8f7e47f5804893734571380f7740" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a5d3f1ff990cabc0e8001cce6642bdb7ad429e73/Windsurf-darwin-x64-2.3.9.zip", + "sha256": "63a515c68f322653b901f1472184ca688102f9b8c0b598dec590eb648ead4211" }, "x86_64-linux": { - "version": "2.2.17", + "version": "2.3.9", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a65d6c4e1fd335336d7a0b601099811667e184ca/Windsurf-linux-x64-2.2.17.tar.gz", - "sha256": "9593de6b22e85190788185b033d1f4f1ad013c36e1cc737c3696f430fbbeeb54" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a5d3f1ff990cabc0e8001cce6642bdb7ad429e73/Windsurf-linux-x64-2.3.9.tar.gz", + "sha256": "874024744cd853b7c350fe514be19b0060fac39586253c3b7602d6869473eadc" } } diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix index 63f40d5d400d..553ef65033c1 100644 --- a/pkgs/by-name/wo/worker-build/package.nix +++ b/pkgs/by-name/wo/worker-build/package.nix @@ -2,21 +2,25 @@ lib, fetchFromGitHub, rustPlatform, + pkg-config, + openssl, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "worker-build"; - version = "0.7.4"; + version = "0.8.3"; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-LeW0CHYBaib81AqftYpW38FFR3P7q7OJE2NmrK9oi9Q="; + hash = "sha256-sRKQALNYUmzxaqYJCWR8b3yvqg8e4EHe1Cm7vqRx8hU="; fetchSubmodules = true; }; - cargoHash = "sha256-W1m7W7LepgZ3WPjmZ7qXlu3WnvZkpGO35sHryOFqhfk="; + cargoHash = "sha256-enePrsTLpiTDxqnFFD38N4amOKY5oHHctPl9RFj2eRo="; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/by-name/wp/wpcleaner/package.nix b/pkgs/by-name/wp/wpcleaner/package.nix index 7e32272a2dd9..bdaeb79b0eb3 100644 --- a/pkgs/by-name/wp/wpcleaner/package.nix +++ b/pkgs/by-name/wp/wpcleaner/package.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation { pname = "wpcleaner"; - version = "2.0.5-unstable-2025-04-25"; + version = "2.0.5-unstable-2026-05-11"; src = fetchFromGitHub { owner = "WPCleaner"; repo = "wpcleaner"; - rev = "7fd357cf26349658183517658139870dd45eaedc"; - hash = "sha256-iaAP/5Z+ghvMAn4ke7lhRqKov/3jXr0LMwbPDZ052j0="; + rev = "5d94f34e8aeb1d8353ec1981083acbc50eca10ee"; + hash = "sha256-sUtaDGxoNF3EBvnDSRmFeGhceqLZxboQzU3H7MYOxP4"; }; dontConfigure = true; diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 4601ddacc909..0dddb9344de1 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xcp"; - version = "0.24.2"; + version = "0.24.8"; src = fetchFromGitHub { owner = "tarka"; repo = "xcp"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ojk2khNLKhnAbWlBG2QEhcVrXz5wuC92IOEG3o58E3A="; + tag = "xcp-v${finalAttrs.version}"; + hash = "sha256-OuwzgtMQMQcWhQnwD1Ow2fsT0yhl+DVGkqoebe2osf8="; }; - cargoHash = "sha256-uJVm9nxXXfn4ZEIYoX2XMhZN7Oduwi1D8wZmv64mx60="; + cargoHash = "sha256-8WRiHHMvYwwx7AxuovGjnn83AxIAJK0T86b2WCOtGuw="; nativeBuildInputs = [ installShellFiles ]; @@ -57,6 +57,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # thread 'test_sockets_dir::test_with_parallel_file_driver' panicked at tests/common.rs:1178:5: # assertion failed: to.exists() "--skip=test_sockets_dir::test_with_parallel_file_driver" + + # failing in sandbox + "--skip=dir_copy_deref_symlinks::test_with_parallel_file_driver" ]; postInstall = '' diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch deleted file mode 100644 index 881a22dbcf82..000000000000 --- a/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/subprojects/pfs/Cargo.lock b/subprojects/pfs/Cargo.lock -index efe74be..9b5f48e 100644 ---- a/subprojects/pfs/Cargo.lock -+++ b/subprojects/pfs/Cargo.lock -@@ -458,9 +458,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", -diff --git a/subprojects/pfs/Cargo.toml b/subprojects/pfs/Cargo.toml -index ae3b519..6cf25dd 100644 ---- a/subprojects/pfs/Cargo.toml -+++ b/subprojects/pfs/Cargo.toml -@@ -18,7 +18,7 @@ path = "src/examples/open/pfs_open.rs" - - [dependencies] - gettext-rs = { version = "0.7", features = ["gettext-system"] } --glib-macros = "0.20.5" -+glib-macros = "0.20.12" - gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] } - - [dependencies.adw] - diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix index d417e6517488..dad0df845565 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix @@ -11,6 +11,8 @@ rustc, desktop-file-utils, cargo, + docutils, + glib, rustPlatform, gettext, }: @@ -18,27 +20,29 @@ let # Derived from subprojects/pfs.wrap pfs = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "guidog"; + group = "World"; + owner = "Phosh"; repo = "pfs"; - tag = "v0.0.4"; - hash = "sha256-b0S/jNE03h26bGA76fb/qlyJ8/MifZeltTc16UX2h9w="; + tag = "v0.1.0"; + hash = "sha256-u0Ac3DJ0FaawlRNQwPp6tVKJkUaFHH/r1T0QRa4bIaU="; }; in stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-phosh"; - version = "0.49.0"; + version = "0.55.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "guidog"; + group = "World"; + owner = "Phosh"; repo = "xdg-desktop-portal-phosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-VF+ZNUP5Y2xm2nlNN3QsLJh8yNRJH7d3k+kLJ+4eu9s="; + hash = "sha256-oHjBuQ9kD1RnBKSi+w3xxYBPrByzqsmKVOMIoHepoyQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-h+VQqtirReLIHlVByKSb6DpqR1FtCxSwQpjowHX1mcg="; + hash = "sha256-cPuyI0PtdbAgbZ3ZCTRIBcjNROVi0wCHSfST+kzJSd4="; }; nativeBuildInputs = [ @@ -48,8 +52,10 @@ stdenv.mkDerivation (finalAttrs: { rustc desktop-file-utils cargo + docutils rustPlatform.cargoSetupHook gettext + glib ]; buildInputs = [ @@ -63,19 +69,15 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' cp -r ${pfs} subprojects/pfs chmod +w -R subprojects/pfs # Allow patches for subprojects to work + # xdg-desktop-portal-phosh's Cargo.lock closes over pfs and its dependencies, + # making pfs's own lockfile extraneous. + rm subprojects/pfs/Cargo.lock ''; - patches = [ - # Patch that fixes the issue with two Rust package versions. - # For reasons that I don't understand, rustPlatform.fetchCargoVendor seems to not fetch the version inside the Cargo.lock file. - # Like with libadwaita, fetchCargoVendor download the version 0.7.2 but in the lock file specified 0.7.1 and in the toml file specified 0.7. - ./cargo_lock_deps_version.patch - ]; - meta = { description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal"; - homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh"; - changelog = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh/-/blob/main/NEWS"; + homepage = "https://gitlab.gnome.org/World/Phosh/xdg-desktop-portal-phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/xdg-desktop-portal-phosh/-/blob/main/NEWS"; maintainers = with lib.maintainers; [ armelclo ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix index 0fd909f2b978..05a371c6fcd8 100644 --- a/pkgs/by-name/xf/xfr/package.nix +++ b/pkgs/by-name/xf/xfr/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xfr"; - version = "0.9.11"; + version = "0.9.14"; src = fetchFromGitHub { owner = "lance0"; repo = "xfr"; tag = "v${finalAttrs.version}"; - hash = "sha256-m41hICpbx8aZprKrjdAdvoDEzCi8gLoLia6TTi/AThY="; + hash = "sha256-6+kjpa6zgCXjXK1s3VrOksXFyLAbnqkNOhD50r5zyMA="; }; - cargoHash = "sha256-uUKAjq8jj/NPpi5DHktNGBLWvecSPUwYdMQF/4o7JnM="; + cargoHash = "sha256-U/XOlUo/zHsZCPW6lG87BKaM7xSQgineO2rH+JBx6x4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index a0cfb45c08cc..295aacbde031 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xreader"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xreader"; rev = finalAttrs.version; - hash = "sha256-lVJFNOiayAai/Lg4tl8lNaK5fdTlZ0ptzstUzciH1mA="; + hash = "sha256-upX2+Hwdss7OfIWFg5MALoF9LIw5mk6+NYR+NEbcDX4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff index 977eaa538302..082975d721f9 100644 --- a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff +++ b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff @@ -1,25 +1,22 @@ -diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile ---- ytree-2.06-old/Makefile 2023-11-26 06:15:34.000000000 -0300 -+++ ytree-2.06-new/Makefile 2023-12-01 12:25:36.641958285 -0300 -@@ -11,13 +11,13 @@ - # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys - # - --DESTDIR = /usr -+PREFIX = /usr - +diff -Naur ytree-2.12-old/Makefile ytree-2.12-new/Makefile +--- ytree-2.12-old/Makefile 2026-04-20 18:00:22.000000000 +0000 ++++ ytree-2.12-new/Makefile 2026-05-17 12:00:00.000000000 +0000 +@@ -14,10 +14,11 @@ + ADD_CFLAGS = # -DVI_KEYS - + +-DESTDIR = /usr -BINDIR = $(DESTDIR)/bin -MANDIR = $(DESTDIR)/share/man/man1 --MANESDIR = $(DESTDIR)/share/man/es/man1 ++PREFIX = /usr + +BINDIR = $(DESTDIR)$(PREFIX)/bin +MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 +MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1 - - + # Uncomment the lines for your system (default is linux) -@@ -221,7 +221,7 @@ + +@@ -218,7 +219,7 @@ install: $(MAIN) if [ ! -e $(BINDIR) ]; then mkdir -p $(BINDIR); fi install $(MAIN) $(BINDIR) diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix index 965e5f2fc358..cdb953a46a03 100644 --- a/pkgs/by-name/yt/ytree/package.nix +++ b/pkgs/by-name/yt/ytree/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ytree"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz"; - hash = "sha256-O7u9MvVoza4+A/xzWxeD2MumBaLKYFbRuXEUPX3dUX0="; + hash = "sha256-I2bS1fwfZERgMjhj5b6ZdFhLybLWbXJHFlqP8aCZERQ="; }; patches = [ diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index a2b647083d4d..7bf903354831 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zensical"; - version = "0.0.41"; + version = "0.0.43"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-bDyQMBEjdJ38JqIQ1sCA8GkSU8fHZa0wihC0UYNppv4="; + hash = "sha256-3C04BP9WJ5XBAkEw4MPOeXNkZ5MHKd2jFPCW0ONbmMg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-pfDqqtD0kKGVKkv7DvEUKpdDYk9xvRs5gmLCafFHrhs="; + hash = "sha256-clm+y56i2RN0FxicGpZ/JWdGxjkSo6xFf0sGE6LdSaQ="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix index 40f58d68e1c6..e7a946ab4da1 100644 --- a/pkgs/by-name/zs/zsign/package.nix +++ b/pkgs/by-name/zs/zsign/package.nix @@ -4,9 +4,7 @@ stdenv, openssl, pkg-config, - minizip, nix-update-script, - zlib, versionCheckHook, }: let @@ -14,33 +12,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zsign"; - version = "0.9.6"; + version = "1.0.4"; src = fetchFromGitHub { owner = "zhlynn"; repo = "zsign"; tag = "v${finalAttrs.version}"; - hash = "sha256-e4k3W+FkdydqPy3DuhH6MbC+IilLZfqOb7FAbIiv/kM="; + hash = "sha256-NuwV8s+rzsXBha/vqnemvUo6Etm70ZVYL/CZKBJ1szA="; }; - postPatch = '' - substituteInPlace ../../src/common/archive.cpp \ - --replace-fail "#include " "#include " \ - --replace-fail "#include " "#include " - ''; - sourceRoot = "${finalAttrs.src.name}/build/${platformName}"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - minizip - zlib - ]; + buildInputs = [ openssl ]; makeFlags = [ "BINDIR=bin/" "CXX=${stdenv.cc.targetPrefix}c++" + "VERSION=${finalAttrs.version}" ]; installPhase = '' diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 60b534a38e1d..2c3c99413f41 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.17.0"; + version = "11.18.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-plN7FJfPkEu/479JUrCWqpvTmm8CEqRWNurqeOPJUKA="; + hash = "sha256-qQdfU4jOPaHVA9ropmLapS17ng1PDZpAZdhfBTsOPec="; }; - npmDepsHash = "sha256-8rFmFr7IXRbi2LW4diXDOka4nPJGr+DcrB8+JPBxzQA="; + npmDepsHash = "sha256-i9qb/QwqgYfIUh2Nn5yYLRqq0ioVE+g+vt7sSNvnws8="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 17d8b9590ead..5be64c16ce84 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -58,6 +58,16 @@ optionals noSysDirs ( ] ++ ( { + "16" = [ + # Do not try looking for binaries and libraries in /lib and /usr/lib + ./13/no-sys-dirs-riscv.patch + # Mangle the nix store hash in __FILE__ to prevent unneeded runtime references + # + # TODO: Remove these and the `useMacroPrefixMap` conditional + # in `cc-wrapper` once + # is fixed. + ./13/mangle-NIX_STORE-in-__FILE__.patch + ]; "15" = [ # Do not try looking for binaries and libraries in /lib and /usr/lib ./13/no-sys-dirs-riscv.patch diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 521d129bbb37..ca6b2c91033d 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -1,5 +1,6 @@ let majorMinorToVersionMap = { + "16" = "16.1.0"; "15" = "15.2.0"; "14" = "14.3.0"; "13" = "13.4.0"; @@ -13,6 +14,7 @@ let { # 3 digits: releases (14.2.0) # 4 digits: snapshots (14.2.1.20250322) + "16.1.0" = "sha256-UO+02Uwzl6/zsNYaWr10i03THZ0/Kre+BbFx02pRD3k="; "15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4="; "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo="; "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU="; diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 0ab8e8ae5d92..a51e07ce9bc2 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -31,6 +31,8 @@ let cp -r ${monorepoSrc}/third-party "$out" '' ); + + needHdrGen = isFullBuild || lib.versionAtLeast release_version "22"; in stdenv.mkDerivation (finalAttrs: { inherit pname version patches; @@ -44,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: { python3 ninja ] - ++ (lib.optional isFullBuild python3Packages.pyyaml); + ++ (lib.optional needHdrGen python3Packages.pyyaml); buildInputs = lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders; outputs = [ "out" ] ++ (lib.optional isFullBuild "dev"); - postUnpack = lib.optionalString isFullBuild '' + postUnpack = lib.optionalString needHdrGen '' chmod +w $sourceRoot/../$pname/utils/hdrgen patchShebangs $sourceRoot/../$pname/utils/hdrgen/main.py chmod +x $sourceRoot/../$pname/utils/hdrgen/main.py diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c4157e9d66fe..24277a2ec882 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,9 +28,9 @@ let "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; "22.1.5".officialRelease.sha256 = "sha256-eunfMOH+HVpefZJ+CG7hXDoM+pi6iYvHpD3DoSAsjoE="; "23.0.0-git".gitRelease = { - rev = "084a5acf5a076aa32c04cbcdca25c27fc75d8e6d"; - rev-version = "23.0.0-unstable-2026-05-10"; - sha256 = "sha256-xSyanVzsHokSrxhixUW3ovREeojTX7pedlBoaFpbtXQ="; + rev = "e9122d11ff92f2f343668cc759081496a130a943"; + rev-version = "23.0.0-unstable-2026-05-17"; + sha256 = "sha256-dnfnxQJ6Ye3wW3FOqZbaY0t/vuSapqc8c85oItGD4D8="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 201cd7c7bbf2..fad38fd45b47 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -174,7 +174,11 @@ stdenv.mkDerivation { # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here env.NIX_CFLAGS_COMPILE = toString ( - [ "-fcommon" ] + [ + "-fcommon" + # C23 default rejects implicit declarations (e.g. close() without ). + "-std=gnu17" + ] ++ (lib.optionals stdenv.cc.isClang [ # LLVM 16 turned these into errors (rightly, perhaps.) # Allow this package to continue to build despite this change. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce847c7b2c3b..16ff232e5c71 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2916,6 +2916,22 @@ with haskellLib; stripe-concepts = doJailbreak super.stripe-concepts; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; + + # 2026-05-10: Remove again, when hackage bump is recent enough + botan-low = overrideCabal { + version = "0.2.0.1"; + sha256 = "sha256-yC+GJDNO58TIc197Mgn/vqpt4fY3YghLhJfmGkQjsxk="; + revision = null; + editedCabalFile = null; + } (warnAfterVersion "0.2.0.1" super.botan-low); + + # 2026-05-10: Remove again, when hackage bump is recent enough + botan-bindings = overrideCabal { + version = "0.3.0.0"; + sha256 = "sha256-tsarIc3LcUKPgSWZ+xcGPWGO2f9OF6SWHB6nmX/vJYw="; + revision = null; + editedCabalFile = null; + } (warnAfterVersion "0.3.0.0" super.botan-bindings); } // import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super diff --git a/pkgs/development/interpreters/elixir/1.20.nix b/pkgs/development/interpreters/elixir/1.20.nix index 82a43c1fa202..8db4087c57ad 100644 --- a/pkgs/development/interpreters/elixir/1.20.nix +++ b/pkgs/development/interpreters/elixir/1.20.nix @@ -1,7 +1,7 @@ import ./generic-builder.nix { - version = "1.20.0-rc.4"; - hash = "sha256-sboB+GW3T+t9gEcOGtd6NllmIlyWio1+cgWyyxE+484="; - # https://hexdocs.pm/elixir/1.20.0-rc.4/compatibility-and-deprecations.html#between-elixir-and-erlang-otp + version = "1.20.0-rc.5"; + hash = "sha256-D1lYpwD/nb9GyCSW4W9mVliqULb7Hs641OdtwPDfsME="; + # https://hexdocs.pm/elixir/1.20.0-rc.5/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "27"; maximumOTPVersion = "29"; } diff --git a/pkgs/development/interpreters/python/editable.nix b/pkgs/development/interpreters/python/editable.nix index 2a492e54c301..102a31ac1d4c 100644 --- a/pkgs/development/interpreters/python/editable.nix +++ b/pkgs/development/interpreters/python/editable.nix @@ -39,7 +39,7 @@ let # In editable mode build-system's are considered to be runtime dependencies. dependencies' = dependencies ++ build-system; - pyproject = { + pyprojectContents = { # PEP-621 project table project = { name = pname; @@ -81,7 +81,7 @@ buildPythonPackage ( pyproject = true; unpackPhase = '' - python -c "import json, tomli_w; print(tomli_w.dumps(json.load(open('$pyprojectContentsPath'))))" > pyproject.toml + python -c "import json, os, tomli_w; attrs = json.load(open(os.environ['NIX_ATTRS_JSON_FILE'], 'r')); print(tomli_w.dumps(attrs['pyprojectContents']))" > pyproject.toml echo 'import os.path, sys; sys.path.insert(0, os.path.expandvars("${root}"))' > _${pname}.pth ''; @@ -92,8 +92,8 @@ buildPythonPackage ( # Note: Using formats.toml generates another intermediary derivation that needs to be built. # We inline the same functionality for better UX. nativeBuildInputs = (derivationArgs.nativeBuildInputs or [ ]) ++ [ tomli-w ]; - pyprojectContents = builtins.toJSON pyproject; - passAsFile = [ "pyprojectContents" ]; + inherit pyprojectContents; preferLocalBuild = true; + __structuredAttrs = true; } ) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index fa50aef21339..5dc0d5ac7ebd 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -46,22 +46,16 @@ assert useSDL -> sdl2-compat != null; stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.10.1"; + version = "5.2.11.3"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo="; + hash = "sha256-Nyab9ytqMZT9no2MT0vDe9tDVxXc6dwScHZ1uMVh+nE="; }; - patches = [ - (fetchpatch2 { - name = "Bump-CMake-minimum-version-to-3.5"; - url = "https://github.com/liballeg/allegro5/commit/6e93fcaabaafd81701f4cd1b74f4b69dd598bc9b.patch?full_index=1"; - hash = "sha256-IEnn66bS2m6MVFCNf341yLtd7jTl2gflL5EFJFmbEt4="; - }) - ]; + patches = [ ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index e2cc58b95a9c..03194c9310fc 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -24,8 +24,8 @@ let in { icu78 = make-icu { - version = "78.2"; - hash = "sha256-Pploe1xDXUsgljDi0uu3mQbJhGheeGNQeLZy4DyJ3zU="; + version = "78.3"; + hash = "sha256-Oi56R2BLpwLzRYeDCOb+/sphLuiVz0pfIi55Vfq/4MA="; }; icu77 = make-icu { version = "77.1"; diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix deleted file mode 100644 index 5d4c6fc28e67..000000000000 --- a/pkgs/development/libraries/intel-oneapi/base.nix +++ /dev/null @@ -1,262 +0,0 @@ -{ - lib, - fetchurl, - zlib, - rdma-core, - libpsm2, - ucx, - numactl, - level-zero, - pkg-config, - libdrm, - elfutils, - libxxf86vm, - libxrandr, - libxfixes, - libxext, - libxdamage, - libxcomposite, - libx11, - libxcb, - glib, - nss, - nspr, - dbus, - at-spi2-atk, - cups, - gtk3, - pango, - cairo, - libgbm, - expat, - libxkbcommon, - eudev, - alsa-lib, - ncurses5, - bzip2, - gdbm, - libxcrypt-legacy, - freetype, - gtk2, - gdk-pixbuf, - fontconfig, - libuuid, - sqlite, - - # The list of components to install; - # Either [ "all" ], [ "default" ], or a custom list of components. - # If you want to install all default components plus an extra one, pass [ "default" ] - # Note that changing this will also change the `buildInputs` of the derivation. - # The default value is not "default" because some of the components in the defualt set are currently broken. - components ? [ - "intel.oneapi.lin.advisor" - "intel.oneapi.lin.dpcpp-cpp-compiler" - "intel.oneapi.lin.dpcpp_dbg" - "intel.oneapi.lin.vtune" - "intel.oneapi.lin.mkl.devel" - ], - - intel-oneapi, - - # For tests - runCommand, - libffi, - stdenv, -}: -intel-oneapi.mkIntelOneApi (finalAttrs: { - pname = "intel-oneapi-base-toolkit"; - - src = fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/6caa93ca-e10a-4cc5-b210-68f385feea9e/intel-oneapi-base-toolkit-2025.3.1.36_offline.sh"; - hash = "sha256-xXV6FP4t1ChSi/bcDFpkmMexNejPTtk2Nay/PmSpCFA="; - }; - - versionYear = "2025"; - versionMajor = "3"; - versionMinor = "1"; - versionRel = "36"; - - inherit components; - - # Figured out by looking at autoPatchelfHook failure output - depsByComponent = rec { - advisor = [ - libdrm - zlib - gtk2 - gdk-pixbuf - at-spi2-atk - glib - pango - gdk-pixbuf - cairo - fontconfig - glib - freetype - libx11 - libxxf86vm - libxext - libxcb - libxcomposite - libxdamage - libxfixes - libxrandr - nss - dbus - cups - libgbm - expat - libxkbcommon - eudev - alsa-lib - ncurses5 - bzip2 - libuuid - gdbm - libxcrypt-legacy - sqlite - nspr - ]; - dpcpp-cpp-compiler = [ - zlib - level-zero - ]; - dpcpp_dbg = [ - level-zero - zlib - ]; - dpcpp-ct = [ zlib ]; - mpi = [ - zlib - rdma-core - libpsm2 - ucx - libuuid - numactl - level-zero - libffi - ]; - pti = [ level-zero ]; - vtune = [ - libdrm - elfutils - zlib - libx11 - libxext - libxcb - libxcomposite - libxdamage - libxfixes - libxrandr - glib - nss - dbus - at-spi2-atk - cups - gtk3 - pango - cairo - libgbm - expat - libxkbcommon - eudev - alsa-lib - at-spi2-atk - ncurses5 - bzip2 - libuuid - gdbm - libxcrypt-legacy - sqlite - nspr - ]; - mkl = mpi ++ pti; - }; - - autoPatchelfIgnoreMissingDeps = [ - # Needs to be dynamically loaded as it depends on the hardware - "libcuda.so.1" - # All too old, not in nixpkgs anymore - "libffi.so.6" - "libgdbm.so.4" - "libopencl-clang.so.14" - "libreadline.so.6" - ]; - - passthru.updateScript = intel-oneapi.mkUpdateScript { - inherit (finalAttrs) pname; - file = "base.nix"; - downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?packages=oneapi-toolkit&oneapi-toolkit-os=linux&oneapi-lin=offline"; - }; - - passthru.tests = { - mkl-libs = stdenv.mkDerivation { - name = "intel-oneapi-test-mkl-libs"; - unpackPhase = '' - cp ${./test.c} test.c - ''; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ intel-oneapi.base ]; - - buildPhase = '' - # This will fail if no libs with mkl- in their name are found - libs="$(pkg-config --list-all | cut -d\ -f1 | grep mkl-)" - for lib in $libs; do - echo "Testing that the build succeeds with $lib" >&2 - gcc test.c -o test-with-$lib $(pkg-config --cflags --libs $lib) - done - ''; - - doCheck = true; - - checkPhase = '' - for lib in $libs; do - echo "Testing that the executable built with $lib runs" >&2 - ./test-with-$lib - done - ''; - - installPhase = '' - touch "$out" - ''; - }; - - all-binaries-run = runCommand "intel-oneapi-test-all-binaries-run" { } '' - # .*-32: 32-bit executables can't be properly patched by patchelf - # IMB-.*: all fail with a weird "bad file descriptor" error - # fi_info, fi_pingpong: exits with 1 even if ran with `--help` - # gdb-openapi: Python not initialized - # hydra_bstrap_proxy, hydra_nameserver, hydra_pmi_proxy: doesn't respect --help - # mpirun: can't find mpiexec.hydra for some reason - # sycl-ls, sycl-trace: doesn't respect --help - regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" - export I_MPI_ROOT="${intel-oneapi.base}/mpi/latest" - for bin in "${intel-oneapi.base}"/bin/*; do - if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then - echo "skipping $bin" - continue - fi - echo "trying to run $bin --help or -help" - "$bin" --help || "$bin" -help - done - touch "$out" - ''; - }; - - meta = { - description = "Intel oneAPI Base Toolkit"; - homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html"; - license = with lib.licenses; [ - intel-eula - issl - asl20 - ]; - maintainers = with lib.maintainers; [ - balsoft - ]; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix deleted file mode 100644 index bb6167d37bc7..000000000000 --- a/pkgs/development/libraries/intel-oneapi/default.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ - lib, - callPackage, - stdenv, - ncurses5, - bc, - bubblewrap, - autoPatchelfHook, - python3, - libgcc, - glibc, - writeShellScript, - writeText, - writeTextFile, - - # For the updater script - writeShellApplication, - curl, - htmlq, - common-updater-scripts, - writableTmpDirAsHomeHook, -}: - -{ - mkIntelOneApi = lib.extendMkDerivation { - constructDrv = stdenv.mkDerivation; - - excludeDrvArgNames = [ - "depsByComponent" - "components" - ]; - - extendDrvArgs = - finalAttrs: - { - pname, - versionYear, - versionMajor, - versionMinor, - versionRel, - src, - meta, - depsByComponent ? { }, - postInstall ? "", - components ? [ "default" ], - ... - }@args: - let - shortName = name: builtins.elemAt (lib.splitString "." name) 3; - in - { - version = "${finalAttrs.versionYear}.${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionRel}"; - - nativeBuildInputs = [ - # Installer wants tput - ncurses5 - # Used to check if there's enough disk space - bc - bubblewrap - - autoPatchelfHook - writableTmpDirAsHomeHook - ]; - - buildInputs = [ - # For patchShebangs - python3 - ] - # autoPatchelfHook will add these libraries to RPATH as required - ++ lib.concatMap ( - comp: - if comp == "all" || comp == "default" then - lib.concatLists (builtins.attrValues depsByComponent) - else - depsByComponent.${shortName comp} or [ ] - ) components; - - dontUnpack = true; - - # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html - installPhase = '' - runHook preInstall - # The installer expects that the installation directory is already present - mkdir -p "$out" - - # Required for the installer to find libstdc++ - export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libgcc.lib ]}" - - # The installer is an insane four-stage rube goldberg machine: - # 1. Our $src (bash script) unpacks install.sh (bash script) - # 2. install.sh unpacks bootstrapper (dylinked binary with hardcoded interpreter in /lib) - # 3. bootstrapper unpacks installer (dylinked binary with hardcoded interpreter and libraries in /lib) - # 4. installer installs the actual components we need - # - # While stage 1 allows to "only extract", other stages always try running the next executable down, and remove stuff if they fail. - # I'm afraid this is the cleanest solution for now. - mkdir -p fhs-root/{lib,lib64} - ln -s "${glibc}/lib/"* fhs-root/lib/ - ln -s "${glibc}/lib/"* fhs-root/lib64/ - bwrap \ - --bind fhs-root / \ - --bind /nix /nix \ - --ro-bind /bin /bin \ - --dev /dev \ - --proc /proc \ - bash "$src" \ - -a \ - --silent \ - --eula accept \ - --install-dir "$out" \ - --components ${lib.concatStringsSep ":" components} - - # Non-reproducible - rm -rf "$out"/logs - # This contains broken symlinks and doesn't seem to be useful - rm -rf "$out"/.toolkit_linking_tool - - ln -s "$out/$versionYear.$versionMajor"/{lib,etc,bin,share,opt} "$out" - - runHook postInstall - ''; - }; - }; - - mkUpdateScript = - { - pname, - downloadPage, - file, - }: - lib.getExe (writeShellApplication { - name = "update-intel-oneapi"; - runtimeInputs = [ - curl - htmlq - common-updater-scripts - ]; - text = '' - download_page=${lib.escapeShellArg downloadPage} - pname=${lib.escapeShellArg pname} - nixpkgs="$(git rev-parse --show-toplevel)" - packageDir="$nixpkgs/pkgs/development/libraries/intel-oneapi" - file="$packageDir"/${lib.escapeShellArg file} - - echo 'Figuring out the download URL' >&2 - - # Intel helpfully gives us a wget command to run so that we can download the toolkit installer, as part of their product page. - # This variable will contain that command (wget https://...), we will extract the URL from it. - wget_command="$(curl "$download_page" \ - | htmlq 'code' --text \ - | grep "wget.*$pname.*sh")" - - # _offline is optional: Intel sometimes only links the online installer, which shares the same UUID and version. - regex="wget (https://registrationcenter-download[.]intel[.]com/akdlm/IRC_NAS/([0-9a-z-]+)/$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)(_offline)?[.]sh)" - if [[ "$wget_command" =~ $regex ]]; then - uuid="''${BASH_REMATCH[2]}" - versionYear="''${BASH_REMATCH[3]}" - versionMajor="''${BASH_REMATCH[4]}" - versionMinor="''${BASH_REMATCH[5]}" - versionRel="''${BASH_REMATCH[6]}" - else - echo "'$wget_command' does not match the expected format $regex" >&2 - exit 1 - fi - - # Always reconstruct to point at the offline installer - url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/$uuid/$pname-$versionYear.$versionMajor.$versionMinor.''${versionRel}_offline.sh" - - if grep -qF "url = \"$url\"" "$file"; then - echo "The URL is the same ($url), skipping update" >&2 - exit 0 - fi - - echo "The new download URL is $url, prefetching it to store" >&2 - hash="$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")")" - - sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file" - sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file" - sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file" - sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file" - sed -i "s|url = \".*\";|url = \"$url\";|" "$file" - sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file" - ''; - }); - - base = callPackage ./base.nix { }; - hpc = callPackage ./hpc.nix { }; -} diff --git a/pkgs/development/libraries/intel-oneapi/hpc.nix b/pkgs/development/libraries/intel-oneapi/hpc.nix deleted file mode 100644 index 509af247eea8..000000000000 --- a/pkgs/development/libraries/intel-oneapi/hpc.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - fetchurl, - - # The list of components to install; - # Either [ "all" ], [ "default" ], or a custom list of components. - # If you want to install all default components plus an extra one, pass [ "default" ] - # Note that changing this will also change the `buildInputs` of the derivation. - # - # If you want other components listed of the toolkit, consider using intel-oneapi.base instead; - # This are specifically the components that are not present there. - components ? [ - "intel.oneapi.lin.dpcpp-cpp-compiler" - "intel.oneapi.lin.ifort-compiler" - "intel.oneapi.lin.mpi.devel" - "intel.oneapi.lin.tbb.devel" - ], - - intel-oneapi, - zlib, - rdma-core, - libpsm2, - ucx, - libuuid, - numactl, - level-zero, - libffi, -}: -intel-oneapi.mkIntelOneApi (finalAttrs: { - pname = "intel-oneapi-hpc-toolkit"; - - src = fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f59a79aa-4a6e-46e8-a6c2-be04bb13f274/intel-oneapi-hpc-toolkit-2025.3.1.55_offline.sh"; - hash = "sha256-NwLR7OWzmKYM05BZ2U7IZI+3IBnb0wiUgF+vHrX0Tro="; - }; - - versionYear = "2025"; - versionMajor = "3"; - versionMinor = "1"; - versionRel = "55"; - - inherit components; - - depsByComponent = { - mpi = [ - zlib - rdma-core - libpsm2 - ucx - libuuid - numactl - level-zero - libffi - ]; - pti = [ level-zero ]; - ifort-compiler = [ ]; - }; - - autoPatchelfIgnoreMissingDeps = [ - # Needs to be dynamically loaded as it depends on the hardware - "libcuda.so.1" - ]; - - passthru.updateScript = intel-oneapi.mkUpdateScript { - inherit (finalAttrs) pname; - file = "hpc.nix"; - downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=offline"; - }; - - meta = { - description = "Intel oneAPI HPC Toolkit"; - homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit.html"; - license = with lib.licenses; [ - intel-eula - issl - asl20 - ]; - maintainers = with lib.maintainers; [ - balsoft - ]; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/development/libraries/intel-oneapi/test.c b/pkgs/development/libraries/intel-oneapi/test.c deleted file mode 100644 index 9413ac0c68e9..000000000000 --- a/pkgs/development/libraries/intel-oneapi/test.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -#include - -int main() { - float u[] = {1., 2., 3.}; - float v[] = {4., 5., 6.}; - - float dp = cblas_sdot(3, u, 1, v, 1); - - assert(dp == 32.); -} diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index bd0e98a61ab1..6d238ea44927 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "26.1.0"; + version = "26.1.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-Ymgtqecx1DinLzygpamX+I15ucL1wenh7p/40IGepIA="; + hash = "sha256-OmhBmBGR12Tl+5msiyL8lYQ3XYcDYCqUUjQObEqjytI="; }; meta = { diff --git a/pkgs/development/ocaml-modules/dockerfile/default.nix b/pkgs/development/ocaml-modules/dockerfile/default.nix index 5ef6e3835ad6..6f354a16c5f6 100644 --- a/pkgs/development/ocaml-modules/dockerfile/default.nix +++ b/pkgs/development/ocaml-modules/dockerfile/default.nix @@ -10,13 +10,13 @@ buildDunePackage (finalAttrs: { pname = "dockerfile"; - version = "8.3.4"; + version = "8.3.9"; src = fetchFromGitHub { owner = "ocurrent"; repo = "ocaml-dockerfile"; tag = finalAttrs.version; - hash = "sha256-q8yzuRkGVe/t0N0HFLFqOPNyvWSxf4WHApZVk1CG1qw="; + hash = "sha256-O2+kjQnjKSYFZM28RwAUTnNlvEW2CrfdMjT9J8LcPcc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index b7b93ebd5e5a..3ca59f130788 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocb-stubblr"; - version = "0.1.0"; + version = "0.1.1"; src = fetchzip { url = "https://github.com/pqwy/ocb-stubblr/releases/download/v${version}/ocb-stubblr-${version}.tbz"; name = "src.tar.bz"; - sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2"; + hash = "sha256-Zd9a2EFT5j944xCFmWD4Td21VB7uGHZoNE4yvgfI9y0="; }; patches = [ ./pkg-config.patch ]; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch index d86b3f8da9f1..2be484974d4e 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch +++ b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch @@ -1,6 +1,6 @@ ---- a/src/ocb_stubblr.ml 1970-01-01 00:00:01.000000000 +0000 -+++ b/src/ocb_stubblr.ml 2016-12-04 11:10:10.000000000 +0000 -@@ -31,20 +31,9 @@ +--- a/src/ocb_stubblr.ml ++++ b/src/ocb_stubblr.ml +@@ -31,21 +31,8 @@ (* XXX Would be nice to move pkg-config results to a build artefact. *) @@ -12,8 +12,10 @@ - let var = "PKG_CONFIG_PATH" - - let path () = -- Lazy.force opam_prefix / "lib" / "pkgconfig" :: -- (try [Sys.getenv var] with Not_found -> []) |> String.concat ~sep:":" +- let opam = Lazy.force opam_prefix +- and rest = try [Sys.getenv var] with Not_found -> [] in +- opam/"lib"/"pkgconfig" :: opam/"share"/"pkgconfig" :: rest +- |> String.concat ~sep:":" - let run ~flags package = - let cmd = strf "%s=%s pkg-config %s %s 2>/dev/null" @@ -22,4 +24,3 @@ + package (String.concat ~sep:" " flags) in try `Res (run_and_read cmd) with Failure _ -> `Nonexistent end - diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix index 78eaf6a01b71..41b684504d3d 100644 --- a/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/pkgs/development/ocaml-modules/rosetta/default.nix @@ -9,11 +9,11 @@ buildDunePackage (finalAttrs: { pname = "rosetta"; - version = "0.3.0"; + version = "0.4.0"; src = fetchzip { - url = "https://github.com/mirage/rosetta/releases/download/v${finalAttrs.version}/rosetta-v${finalAttrs.version}.tbz"; - sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij"; + url = "https://github.com/mirage/rosetta/releases/download/v${finalAttrs.version}/rosetta-${finalAttrs.version}.tbz"; + hash = "sha256-LFdkwHBppDXE5q6mcDPWX1PreSVEsV9msq6rEmCWVwA="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index 2530db31841f..3ecb5474ddd0 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -21,7 +21,6 @@ ocaml_intrinsics ? null, prelude, ppx_enumerate, - rresult, scfg, yojson, z3, @@ -32,13 +31,13 @@ buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${finalAttrs.version}"; - hash = "sha256-7kshzfxWpOx2LyGOs/j/eaTB4b4ba4sp5n4yztGfFV4="; + hash = "sha256-YyzrPs6ykpUzHHZ63y3c82LG9lv0Pf4i01w5GWadumU="; }; minimalOCamlVersion = "4.14"; @@ -68,7 +67,6 @@ buildDunePackage (finalAttrs: { ocaml_intrinsics ppx_enumerate prelude - rresult scfg yojson z3 diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index 5072a31cd6cb..5aebb9f9f0fb 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -1,10 +1,9 @@ { aiohttp, - anyio, beautifulsoup4, buildPythonPackage, - colorlog, fetchFromGitHub, + httpx, langcodes, lib, orjson, @@ -16,27 +15,27 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "13.4.3"; + version = "13.5.0"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-AH5edWwVEMo/TpnVbcOEC/oYI4DOQ5nqFfoFKeoI3Ok="; + hash = "sha256-+71t47H4/idWeef8Nf+4TVHB0xEe5mWCQ271ECm3jOg="; }; build-system = [ poetry-core ]; dependencies = [ aiohttp - anyio beautifulsoup4 - colorlog + httpx langcodes orjson python-dateutil - ]; + ] + ++ httpx.optional-dependencies.http2; pythonImportsCheck = [ "aioamazondevices" ]; diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix index 89a175f962b7..39ade383a92e 100644 --- a/pkgs/development/python-modules/aioghost/default.nix +++ b/pkgs/development/python-modules/aioghost/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "aioghost"; - version = "0.4.13"; + version = "0.4.14"; pyproject = true; src = fetchFromGitHub { owner = "TryGhost"; repo = "aioghost"; tag = "v${finalAttrs.version}"; - hash = "sha256-RKM61uDXuvKHrCDCC3JJ/Mv6u275Qd7KtKkr87IRWJU="; + hash = "sha256-HZYBBJWP9XscXADtBvovybRh01fhyFGnjHJ5vweo9OA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 794258dc934a..d146990fdbdc 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.28.0"; + version = "3.28.2"; pyproject = true; src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-jy0OOeDiDh2ff3wIR6mYc8P8dOIgVeK0WVQYeug4yEI="; + hash = "sha256-Xf8uE0W/YNCrXoPuxOTixsWdqH5k3dJZDh5AdSNHTFw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix index f7c98949fbea..5e0b8d9694d7 100644 --- a/pkgs/development/python-modules/avea/default.nix +++ b/pkgs/development/python-modules/avea/default.nix @@ -7,16 +7,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "avea"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "k0rventen"; repo = "avea"; - tag = "v${version}"; - hash = "sha256-IfD74nsuHYBrwXebpRE9tzPIwp+i3jdZjh49gz8NRz4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cBYS8Q70K5MXZ63uI6OGkUsskJ7rkgTBPjlAsxmtmVA="; }; build-system = [ setuptools ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Python module for interacting with Elgato's Avea bulb"; homepage = "https://github.com/k0rventen/avea"; - changelog = "https://github.com/k0rventen/avea/releases/tag/${src.tag}"; + changelog = "https://github.com/k0rventen/avea/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index dc271a364f8e..370c916452dd 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -15,6 +15,8 @@ matplotlib, pandas, pymc, + pytensor, + seaborn, sparse, # tests @@ -26,24 +28,16 @@ buildPythonPackage (finalAttrs: { pname = "bambi"; - version = "0.17.2"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "bambinos"; repo = "bambi"; tag = finalAttrs.version; - hash = "sha256-Vjv62cYDIuTLE7MxRt4Havy7DMOiMTyIixbs4LGFGGs="; + hash = "sha256-vxsjPYQkqvmB5oKKl29+xq1BPEzBTozz9/W5mICWI4A="; }; - # TypeError: NDArray.record() missing 1 required keyword-only argument: 'in_warmup' - postPatch = '' - substituteInPlace bambi/backend/pymc.py \ - --replace-fail \ - "strace.record(point=dict(zip(varnames, value)))" \ - "strace.record(point=dict(zip(varnames, value)), in_warmup=False)" - ''; - build-system = [ setuptools setuptools-scm @@ -59,6 +53,8 @@ buildPythonPackage (finalAttrs: { matplotlib pandas pymc + pytensor + seaborn sparse ]; @@ -136,8 +132,7 @@ buildPythonPackage (finalAttrs: { disabledTestPaths = [ # Tests require network access - "tests/test_interpret.py" - "tests/test_interpret_messages.py" + "tests/test_interpret_plots.py" ]; pythonImportsCheck = [ "bambi" ]; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 9046ff2bf25a..824fd0694a97 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, setuptools, numpy, scipy, @@ -22,6 +23,13 @@ buildPythonPackage rec { hash = "sha256-kx87XY4GCL1PQIeZyovEbrPyCC/EVA6Hdvt+3P/D6VI="; }; + patches = [ + (fetchpatch2 { + url = "https://salsa.debian.org/python-team/packages/python-bayespy/-/raw/071f54815608b31aebac8f8e83bc532b2c632a48/debian/patches/numpy2.4-compat.patch"; + hash = "sha256-Tk3z94+vbGaSIqGFFRQZz0pcXI1Fzcbnva3oWnv502U="; + }) + ]; + postPatch = '' substituteInPlace versioneer.py \ --replace-fail SafeConfigParser ConfigParser \ diff --git a/pkgs/development/python-modules/biocframe/default.nix b/pkgs/development/python-modules/biocframe/default.nix index 324eea7c5a56..6cf8c766e9b3 100644 --- a/pkgs/development/python-modules/biocframe/default.nix +++ b/pkgs/development/python-modules/biocframe/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "biocframe"; - version = "0.7.2"; + version = "0.7.3"; pyproject = true; src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocFrame"; tag = version; - hash = "sha256-2O4YINYo9ehiBuZSHZmBmNIwud7GkNzAMWEv2/7oSs8="; + hash = "sha256-NycHzlOdDRyXvpZLWDr7mg5eXxrBjsSk16AUHpQrDN0="; }; build-system = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 6842a9cdfea8..7c29f8b834f0 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.43.7"; + version = "1.43.10"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-fjPMhCzR6fa8zIjtU7HcyT9VIW9pupu6yQ0GLIcLdS8="; + hash = "sha256-BVdWWLgn56EqRWKeGphzF+HmedzKvl695aIQFSjHbPg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index dcd92647d0fa..5b098bfb3ea1 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -10,6 +10,7 @@ pytest-mock, pytest-cov-stub, pytestCheckHook, + pythonAtLeast, requests, requests-mock, responses, @@ -54,6 +55,13 @@ buildPythonPackage rec { mkdir -p $HOME ''; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # argparse usage prefix uses the actual prog (python3.14 -m pytest) instead of sys.argv[0] + "test_default_help" + "test_help" + "test_search_help" + ]; + pythonImportsCheck = [ "censys" ]; meta = { diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index cf1259dfd1f3..b233d5ac8cf1 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "12.4.0"; + version = "12.4.1"; pyproject = true; src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-IH09q15Oq6ow2fBehyikfaiAwv8L9aL6c61tUNjbYIc="; + hash = "sha256-WQf2GNj4vjoUmRPmEVua0DsXNYpnJDI/oVRz+C9m82k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index 07ec68d6e207..3531b60d42c1 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.1.81"; + version = "0.2.82"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-doSMgHmbe0F3DdduLa+zzHFUqBBBj0NR4NwayfyZbDw="; + hash = "sha256-mv04UsKb8hPNFYhOCQcgav9FxwKNswWpX/TkiGcqEHI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/codecarbon/default.nix b/pkgs/development/python-modules/codecarbon/default.nix index 73407458e071..18357da80608 100644 --- a/pkgs/development/python-modules/codecarbon/default.nix +++ b/pkgs/development/python-modules/codecarbon/default.nix @@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: { pname = "codecarbon"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; __structuredAttrs = true; @@ -56,7 +56,7 @@ buildPythonPackage (finalAttrs: { owner = "mlco2"; repo = "codecarbon"; tag = "v${finalAttrs.version}"; - hash = "sha256-Nzt+CKXnv6zvWKsFD7duguVj0AA4eWZgFUlBdIEujD8="; + hash = "sha256-9eec43jszRCiA6oD3T8YTXXRkrq0ESLhSwmxL4Pg9fc="; }; build-system = [ diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index ded32b61f2ca..009efacb0e7f 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -5,21 +5,24 @@ pymeeus, pytz, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "convertdate"; - version = "2.4.0"; - format = "setuptools"; + version = "2.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "fitnr"; repo = "convertdate"; - rev = "v${version}"; - hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YgLKUSg95j9rRejkmep+Levy5Rvnl/kXEiXuS7hazbY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pymeeus pytz ]; @@ -30,9 +33,10 @@ buildPythonPackage rec { meta = { description = "Utils for converting between date formats and calculating holidays"; - mainProgram = "censusgeocode"; homepage = "https://github.com/fitnr/convertdate"; + changelog = "https://github.com/fitnr/convertdate/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; + mainProgram = "censusgeocode"; }; -} +}) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index e78e32b5838e..9f8e5a0e64dc 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "coverage"; - version = "7.13.5"; + version = "7.14.0"; pyproject = true; src = fetchFromGitHub { owner = "coveragepy"; repo = "coveragepy"; tag = finalAttrs.version; - hash = "sha256-XsgOBdehJi2fIZdwE60a32+unYLSMK5MGe1nJOfPBEY="; + hash = "sha256-tDq7s+bRt+cxy20Jskjr8sDfg3H+AOTSh3Tt+l5clkg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 43c49639dc2f..f2b3eef531f5 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system numpy, @@ -15,8 +14,10 @@ cvxopt, highspy, osqp, + qdldl, scipy, scs, + sparsediffpy, # tests hypothesis, @@ -27,7 +28,7 @@ buildPythonPackage (finalAttrs: { pname = "cvxpy"; - version = "1.8.2"; + version = "1.9.0"; pyproject = true; __structuredAttrs = true; @@ -35,18 +36,9 @@ buildPythonPackage (finalAttrs: { owner = "cvxpy"; repo = "cvxpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-MDKTuiePzqdIJlTRxbCOxoaEAisGx368iWbwKEB97QU="; + hash = "sha256-48tczmRdNExerlVTNMuRNi1dC5XhUSXNBwIGbJ9vFnU="; }; - patches = [ - # Upstream PR: https://github.com/cvxpy/cvxpy/pull/3290 - (fetchpatch { - name = "highs-1.14.0.patch"; - url = "https://github.com/cvxpy/cvxpy/commit/89f8d337d927457c2e308de8295dd83f274e40e7.patch"; - hash = "sha256-BO878Kz5ZH5FHkxZugzT+n6wjsoOReqCZWM2HDvFqAw="; - }) - ]; - postPatch = # too tight tolerance in tests (AssertionError) '' @@ -68,8 +60,10 @@ buildPythonPackage (finalAttrs: { highspy numpy osqp + qdldl scipy scs + sparsediffpy ]; nativeCheckInputs = [ @@ -86,6 +80,11 @@ buildPythonPackage (finalAttrs: { enabledTestPaths = [ "cvxpy" ]; disabledTests = [ + # Numerical assertions failing + "test_oprelcone_1_m1_k3_real" + "test_oprelcone_1_m3_k1_real" + "test_oprelcone_1_m4_k4_real" + # Disable the slowest benchmarking tests, cuts test time in half "test_tv_inpainting" "test_diffcp_sdp_example" diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix index a06645526753..738177ec8106 100644 --- a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix +++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU="; }; + patches = [ + ./tests-numpy-2.4.patch # https://github.com/dedupeio/pylbfgs/pull/52 + ]; + build-system = [ cython numpy diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/tests-numpy-2.4.patch b/pkgs/development/python-modules/dedupe-pylbfgs/tests-numpy-2.4.patch new file mode 100644 index 000000000000..d90dbc0a69e5 --- /dev/null +++ b/pkgs/development/python-modules/dedupe-pylbfgs/tests-numpy-2.4.patch @@ -0,0 +1,25 @@ +diff --git a/tests/test_lbfgs.py b/tests/test_lbfgs.py +index 1af91ef..65e2da9 100644 +--- a/tests/test_lbfgs.py ++++ b/tests/test_lbfgs.py +@@ -28,16 +28,16 @@ class TestOWLQN: + + def test_owl_line_search_default(self): + def f(x, g, *args): +- g[0] = 2 * x +- return x ** 2 ++ g[0] = 2 * x[0] ++ return x[0] ** 2 + + with pytest.warns(UserWarning, match="OWL-QN"): + xmin = fmin_lbfgs(f, 100., orthantwise_c=1) + + def test_owl_line_search_warning_explicit(self): + def f(x, g, *args): +- g[0] = 2 * x +- return x ** 2 ++ g[0] = 2 * x[0] ++ return x[0] ** 2 + + with pytest.warns(UserWarning, match="OWL-QN"): + xmin = fmin_lbfgs(f, 100., orthantwise_c=1, line_search='default') diff --git a/pkgs/development/python-modules/denon-rs232/default.nix b/pkgs/development/python-modules/denon-rs232/default.nix index 69bb56dbd029..29a4a1d369a0 100644 --- a/pkgs/development/python-modules/denon-rs232/default.nix +++ b/pkgs/development/python-modules/denon-rs232/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "denon-rs232"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "home-assistant-libs"; repo = "denon-rs232"; tag = finalAttrs.version; - hash = "sha256-SkfxUen1F5cakQao68uYz5uxAkzJfZtVtuIoFGH6mOU="; + hash = "sha256-1GVpF4aOQ8Zzu/abghRF8WJXF+9DP+1suA0F3hy8NSo="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/django-valkey/default.nix b/pkgs/development/python-modules/django-valkey/default.nix index f5740bb9954c..7acbf4ac4502 100644 --- a/pkgs/development/python-modules/django-valkey/default.nix +++ b/pkgs/development/python-modules/django-valkey/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "django-valkey"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "django-commons"; repo = "django-valkey"; tag = version; - hash = "sha256-F6BycXVBmfmtRL1C05lgg/2wehcmlqA5WWGgAIxuAsE="; + hash = "sha256-kXp4i7E2DnrMi0tTg8kdWmuImIWIPKTM5s7sPLWPFko="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/donut-shellcode/default.nix b/pkgs/development/python-modules/donut-shellcode/default.nix index 42be76fc8c3f..118ffa80a5b2 100644 --- a/pkgs/development/python-modules/donut-shellcode/default.nix +++ b/pkgs/development/python-modules/donut-shellcode/default.nix @@ -17,6 +17,9 @@ buildPythonPackage rec { hash = "sha256-gKa7ngq2+r4EYRdwH9AWnJodJjCdppzKch4Ve/4ZPhk="; }; + # aplib64.a objects lack .note.GNU-stack; linker marks .so executable-stack, breaking dlopen. + env.NIX_LDFLAGS = "-z,noexecstack"; + build-system = [ setuptools ]; pythonImportsCheck = [ "donut" ]; diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index b339c9ac6552..a5153de65b8a 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -21,14 +21,14 @@ buildPythonPackage (finalAttrs: { pname = "faraday-plugins"; - version = "1.27.2"; + version = "1.28.0"; pyproject = true; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; tag = finalAttrs.version; - hash = "sha256-GcHZQJCpEnuHfnyynULFla/ou7BCl64JAmi6eFYr1tk="; + hash = "sha256-NSJBxOD6zgDcKopU7ko6zGiN7AhIXWGQaetCkydhRwo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix index d3702f0c0403..19c9aacdfea4 100644 --- a/pkgs/development/python-modules/genai-prices/default.nix +++ b/pkgs/development/python-modules/genai-prices/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "genai-prices"; - version = "0.0.59"; + version = "0.0.60"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "genai-prices"; tag = "v${finalAttrs.version}"; - hash = "sha256-ANYl6wxjAZYnzvKhMsmC2eyg33ngF8DaYd67KCBGHLg="; + hash = "sha256-txcaBPxIUssTlnDNhe2f9Jlr5LaZT1zIcJslMK3Bayk="; }; sourceRoot = "${finalAttrs.src.name}/packages/python"; diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix new file mode 100644 index 000000000000..f7c5413a6fc4 --- /dev/null +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -0,0 +1,130 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, + arro3-core, + pyarrow, + pyproj, + numpy, + pandas, + geoarrow-types, +}: +let + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "geoarrow"; + repo = "geoarrow-rs"; + tag = "py-v${version}"; + hash = "sha256-3/HOQsgQVpEd9iAVvIHvpb0slg55/V6X6KLLvhDUVz4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src version; + pname = "geoarrow-rust-vendor"; + cargoRoot = "python"; + hash = "sha256-UjLqynlt5Rkx10hlnaY76wDRhJwhNvHmkhpj04Y8/ek="; + }; + + commonMeta = { + homepage = "https://github.com/geoarrow/geoarrow-rs"; + changelog = "https://github.com/geoarrow/geoarrow-rs/releases/tag/py-v${version}"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ daspk04 ]; + }; + + buildGeoArrowPackage = + { + pname, + subdir, + description, + pythonImportsCheck, + dependencies ? [ ], + }: + buildPythonPackage { + inherit + pname + version + src + cargoDeps + dependencies + pythonImportsCheck + ; + pyproject = true; + + sourceRoot = "${src.name}/python/${subdir}"; + cargoRoot = ".."; + __structuredAttrs = true; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + postPatch = '' + chmod -R +w ../.. + ''; + + # set target directory so maturin can find the compiled libraries in this workspace setup + env = { + CARGO_TARGET_DIR = "./target"; + }; + + passthru.tests = { inherit geoarrow-rust-tests; }; + + meta = commonMeta // { + inherit description; + }; + }; + + geoarrow-rust-core = buildGeoArrowPackage { + pname = "geoarrow-rust-core"; + subdir = "geoarrow-core"; + description = "Core library for representing GeoArrow data in Python"; + pythonImportsCheck = [ "geoarrow.rust.core" ]; + dependencies = [ + arro3-core + pyproj + ]; + }; + + geoarrow-rust-io = buildGeoArrowPackage { + pname = "geoarrow-rust-io"; + subdir = "geoarrow-io"; + description = "Rust-based readers and writers for GeoArrow in Python"; + pythonImportsCheck = [ "geoarrow.rust.io" ]; + dependencies = [ + arro3-core + pyproj + ]; + }; + + geoarrow-rust-tests = buildPythonPackage { + pname = "geoarrow-rust-tests"; + inherit src version; + + pyproject = false; + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pytestCheckHook + geoarrow-types + pandas + pyarrow + numpy + geoarrow-rust-core + geoarrow-rust-io + ]; + + pytestFlags = [ "python" ]; + }; +in +{ + inherit geoarrow-rust-core geoarrow-rust-io; +} diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index 1e3c8857a172..836f7c782ebd 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.6"; + version = "3.1.7"; pyproject = true; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = "guppy3"; tag = "v${version}"; - hash = "sha256-9pswuHLCxb/zLtyWfIRDmNPLFPamF4Ybb+7TbLf38fU="; + hash = "sha256-/vu47Mzi4q1g6JOoM01j/V1SDNMSJlP/ohuip5t+GtE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 38aea828a10b..8e5698898da4 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "holidays"; - version = "0.96"; + version = "0.97"; pyproject = true; src = fetchFromGitHub { owner = "vacanza"; repo = "python-holidays"; tag = "v${finalAttrs.version}"; - hash = "sha256-tsDGtNAF69EzE4cs0j1PeLZBITvy04kG8MUKD2aNWx0="; + hash = "sha256-d543A/A/W4PqWZSwHPRwv7V65EEpzPfugrwlWhHd/mI="; }; build-system = [ diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 033106de2c58..71f38d59f825 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -14,6 +14,7 @@ pytest-lazy-fixture, pytest-mock, pytestCheckHook, + pythonAtLeast, requests-toolbelt, requests, responses, @@ -98,6 +99,8 @@ buildPythonPackage rec { "test_naked_invocation" # Test is flaky "test_stdin_read_warning" + # flaky: daemon status check exceeds attempt limit + "test_daemon_runner" # httpbin compatibility issues "test_binary_suppresses_when_terminal" "test_binary_suppresses_when_not_terminal_but_pretty" @@ -107,9 +110,16 @@ buildPythonPackage rec { "test_terminal_output_response_charset_detection" "test_terminal_output_request_charset_detection" ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # https://github.com/httpie/cli/issues/1641 + "test_lazy_choices_help" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Test is flaky - "test_daemon_runner" + # requires network: hit pie.dev (sandbox blocks external) + "remote_httpbin" + "chunked" + "test_saved_session_cookies_on_different_domain" + "test_saved_session_cookie_pool" ]; meta = { diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 7642871d9e24..da4856c8408a 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202605171"; + version = "0.1.202605191"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-GOo1K3nDzF3S3sUp6kvzYWdoAoO94ttKOtNLiPliMY4="; + hash = "sha256-2JrnSAj3v21bfu5Ytp+zOLx93nilPEnxiem3f3PpMGA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index 059ca673e773..50f55bb9f668 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -20,16 +20,16 @@ solders, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iocsearcher"; - version = "2.7.2"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "malicialab"; repo = "iocsearcher"; - tag = "v${version}"; - hash = "sha256-XoBb3V/2ZMrGV+i0abt7+/xEFqv6f0y99scaw8aav04="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jNITY4X6ywlkjzS5Udpd46JG7PoycXyy0uJ7+UqjuF4="; }; build-system = [ setuptools ]; @@ -61,9 +61,9 @@ buildPythonPackage rec { meta = { description = "Library and command line tool for extracting indicators of compromise (IOCs)"; homepage = "https://github.com/malicialab/iocsearcher"; - changelog = "https://github.com/malicialab/iocsearcher/releases/tag/v${version}"; + changelog = "https://github.com/malicialab/iocsearcher/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "iocsearcher"; }; -} +}) diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix index fdc39b388253..1dc942482971 100644 --- a/pkgs/development/python-modules/iocx/default.nix +++ b/pkgs/development/python-modules/iocx/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + idna, pefile, pytestCheckHook, python-magic, @@ -10,26 +11,25 @@ buildPythonPackage (finalAttrs: { pname = "iocx"; - version = "0.7.0"; + version = "0.7.3"; pyproject = true; src = fetchFromGitHub { owner = "iocx-dev"; repo = "iocx"; tag = "v${finalAttrs.version}"; - hash = "sha256-QLnlxCFVN2hxQtprNuete9iEAy3k4lxJUwbZcPhHMH0="; + hash = "sha256-cCgpkUSlXQm/F8nvpybwt27cicuDAeoHk5t4dYIAsXY="; }; build-system = [ setuptools ]; dependencies = [ + idna pefile python-magic ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "iocx" ]; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 37c7fe71ed9d..b61e0d443fc5 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7MgaG/0mgetXHjYYOdXe/L7sWDrj7gUDvIOwZhBriM0="; + hash = "sha256-KzG7TpRwjn/7TuZQHX9fZk334cTFcukeng0SSExqaRA="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 42e2448a5279..c33fd5ab8aa6 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.866"; + version = "1.868"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-nLVLRot4ECZyQ+G6o3mc4fVN9uGP/ZX2RATwaA6pGBI="; + hash = "sha256-Jm3r3c4o/rMdwiPlaIe33JEyb0S4yIr9kupxZal06eU="; }; dependencies = [ lilypond ]; diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index 0f2bcac650b1..208cc7dad923 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -1,8 +1,19 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + hatchling, + hatch-jupyter-builder, + + # build inputs jupyterlab, + nodejs, + writableTmpDirAsHomeHook, + yarn-berry_3, + + # dependencies jupyter-packaging, }: @@ -11,26 +22,44 @@ buildPythonPackage rec { version = "3.3.0"; pyproject = true; - src = fetchPypi { - pname = "jupyterlab_execute_time"; - inherit version; - hash = "sha256-kA/Rrrv9PZQ9NiXu+XPu1VW7J0XUmEBAJ4OVnIod/Do="; + src = fetchFromGitHub { + owner = "deshaw"; + repo = "jupyterlab-execute-time"; + rev = "v${version}"; + hash = "sha256-1eNv6yTyorg64PXQm68eqp56Ig0eUbhPWluI/s4oijE="; }; - # jupyterlab is required to build from source but we use the pre-build package + # Fix version requirements and replace jupyterlab's pinned yarn (jlpm) with yarn postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"jupyterlab~=4.0.0"' "" + --replace-fail "jupyterlab~=4.0.0" "jupyterlab" + substituteInPlace pyproject.toml package.json \ + --replace-fail 'jlpm' 'yarn' ''; + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + nativeBuildInputs = [ + jupyterlab + nodejs + writableTmpDirAsHomeHook + yarn-berry_3 + yarn-berry_3.yarnBerryConfigHook + ]; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-aCuw+4FqA0JPMr++AgE4WI+KmXda1IosaU2yk/vE7vw="; + }; + dependencies = [ jupyterlab jupyter-packaging ]; - # has no tests - doCheck = false; - pythonImportsCheck = [ "jupyterlab_execute_time" ]; meta = { diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 858470411b5a..c294c4b53791 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "knack"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3aNbT/TFdrJQGhjw7C8v4KOl+czoJl1AZtMR5e1LW8Y="; + hash = "sha256-Ld0y/WND7Jtu0NpymyEjYtDmsSCMAWJjPJDLb5SgWHc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lacrosse-view/default.nix b/pkgs/development/python-modules/lacrosse-view/default.nix index c5749c31867d..3dcc86c398ca 100644 --- a/pkgs/development/python-modules/lacrosse-view/default.nix +++ b/pkgs/development/python-modules/lacrosse-view/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lacrosse-view"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "IceBotYT"; repo = "lacrosse_view"; tag = "v${version}"; - hash = "sha256-fIeVRqGEL79pOl/zAk3nrrgOgfvlujjK3sFfPVWfUxM="; + hash = "sha256-KU3/w/LpbDNmrE70wj7j1ztKn+k4wP6RzvUU1p50i2A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 21ec72c8f7d0..b4250dc9bdd4 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; - version = "0.30.2"; + version = "0.32.0"; pyproject = true; __structuredAttrs = true; @@ -50,14 +50,14 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lancedb"; tag = "python-v${finalAttrs.version}"; - hash = "sha256-k7eVUOnriR91DqVRJP7N9VG75bHAzbDB8bHFLFi5h1w="; + hash = "sha256-oXKlpgGACMVn/86PWQng9NXHpCzdjzikVzVfoAgvQJQ="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-yux18lKMaNOmrmVOYNMo5MMNAO0at5g/0eEsjF97Pes="; + hash = "sha256-rfAhvC6byg134NF21CR5n0A0DL42CLGy7VvHi9aZUrw="; }; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/pkgs/development/python-modules/lastversion/default.nix b/pkgs/development/python-modules/lastversion/default.nix index 2caa6f5d5313..a9ef78b10c47 100644 --- a/pkgs/development/python-modules/lastversion/default.nix +++ b/pkgs/development/python-modules/lastversion/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "lastversion"; - version = "3.6.10"; + version = "3.6.12"; pyproject = true; src = fetchFromGitHub { owner = "dvershinin"; repo = "lastversion"; tag = "v${version}"; - hash = "sha256-nWhIV8aDug3B/lSwjzIqhvszJILR5w9qM2tJ6li9dJs="; + hash = "sha256-5losSZnAW16KznXKtH+hy8Ii6j/B5tMOSQFx6Sv3DT0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libpulse/default.nix b/pkgs/development/python-modules/libpulse/default.nix new file mode 100644 index 000000000000..3b07c0116fbc --- /dev/null +++ b/pkgs/development/python-modules/libpulse/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + flit-core, + glibcLocales, + libpulseaudio, + pulseaudio, + pytestCheckHook, + stdenv, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "libpulse"; + version = "0.7"; + pyproject = true; + + src = fetchFromGitLab { + owner = "xdegaye"; + repo = "libpulse"; + tag = finalAttrs.version; + hash = "sha256-JxWJaD/9WxvF/lajWWot10/urqGktr4JGGOJRNhbPjk="; + }; + + postPatch = '' + substituteInPlace libpulse/libpulse_ctypes.py \ + --replace-fail "find_library('pulse')" "'${lib.getLib libpulseaudio}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + build-system = [ flit-core ]; + + nativeCheckInputs = [ + glibcLocales + pulseaudio + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + # using pulseaudio as it is easier to setup than pipewire + preCheck = '' + mkdir -p $HOME/.config/pulse/ + cp ${pulseaudio}/etc/pulse/* $HOME/.config/pulse/ + pulseaudio --verbose --daemonize=yes + ''; + + disabledTests = [ + # path to lib is patched and which breaks the mocking + "test_missing_lib" + ]; + + pythonImportsCheck = [ "libpulse" ]; + + meta = { + description = "Asyncio interface to the Pulseaudio and Pipewire pulse library"; + homepage = "https://gitlab.com/xdegaye/libpulse"; + license = lib.licenses.mit; + mainProgram = "pactl-py"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 26c134d58dcd..f508f4abea8c 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -25,13 +25,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-cloud"; - version = "2.3.0"; + version = "2.5.0"; pyproject = true; src = fetchPypi { pname = "llama_cloud"; inherit (finalAttrs) version; - hash = "sha256-58l75z1c4lOYTk2s0MNGnYqgq2dJM59Q2woovzK9Oq0="; + hash = "sha256-LibOVENmQkJ6pvGUJltIxS0Awsm3agc2dFg2TS352dk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 72a1bdccf7f8..8f52191ff681 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -40,14 +40,14 @@ let in buildPythonPackage.override { stdenv = stdenvTarget; } rec { pname = "llama-cpp-python"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; src = fetchFromGitHub { owner = "abetlen"; repo = "llama-cpp-python"; tag = "v${version}"; - hash = "sha256-Mdz8aTBo3bwoqtjarXnQuNYjcaU+p4HKdMQfSoYwq60="; + hash = "sha256-LqSgohfTv02RNZGMjKG0Pq2vHuIX+446uI2Q3KRmnzI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 1da685cd6a6b..058aa0d3a1ff 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -9,6 +9,7 @@ pefile, pycryptodomex, pyelftools, + pythonAtLeast, setuptools, pytestCheckHook, typing-extensions, @@ -27,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-Btx0HxiZWrb0TDpBokQGtBE2EDK0htONe/DwqlPgAd4="; }; + patches = lib.optionals (pythonAtLeast "3.14") [ + # python 3.14 ctypes rejects `_pack_` without `_layout_ = "ms"`. + ./python-3.14-ctypes-layout.patch + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/malduck/python-3.14-ctypes-layout.patch b/pkgs/development/python-modules/malduck/python-3.14-ctypes-layout.patch new file mode 100644 index 000000000000..738c3b4bc9da --- /dev/null +++ b/pkgs/development/python-modules/malduck/python-3.14-ctypes-layout.patch @@ -0,0 +1,10 @@ +--- a/malduck/structure.py ++++ b/malduck/structure.py +@@ -53,6 +53,7 @@ + fields.append((field, type_)) + + class Klass(ctypes.Structure): ++ _layout_ = "ms" + _pack_ = self._pack_ + _fields_ = fields + diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 49e67171bae4..5a078d19f18d 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -20,6 +20,7 @@ pygments, pymdown-extensions, pyyaml, + pyzmq, ruff, starlette, tomlkit, @@ -31,13 +32,13 @@ }: buildPythonPackage rec { pname = "marimo"; - version = "0.21.1"; + version = "0.23.6"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-0YzuyKyptOHe9gJH4avi/sR2q+71Hi0NXRB56jf4b1U="; + hash = "sha256-1jru7h6ep8rHm/JTDaupFRmRU9zk0Vb63nVGR0Z508o="; }; build-system = [ uv-build ]; @@ -56,6 +57,7 @@ buildPythonPackage rec { pygments pymdown-extensions pyyaml + pyzmq ruff starlette tomlkit diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 4f0d3e24ee52..a07ed4c7813b 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; tag = "v${version}"; - hash = "sha256-y4hPiK9M0fcbZd30JCujdFpiYKEbsjXrlH8l4LEMtuY="; + hash = "sha256-h27LzLgOsobRuvieQsVwZSQkagJR3Vy5kUw/HqJ9BHE="; }; build-system = [ diff --git a/pkgs/development/python-modules/mlflow-skinny/default.nix b/pkgs/development/python-modules/mlflow-skinny/default.nix new file mode 100644 index 000000000000..7683c7c045fb --- /dev/null +++ b/pkgs/development/python-modules/mlflow-skinny/default.nix @@ -0,0 +1,73 @@ +{ + buildPythonPackage, + mlflow, + + # build-system + setuptools, + + # dependencies + cachetools, + click, + cloudpickle, + databricks-sdk, + fastapi, + gitpython, + importlib-metadata, + opentelemetry-api, + opentelemetry-proto, + opentelemetry-sdk, + packaging, + protobuf, + pydantic, + python-dotenv, + pyyaml, + requests, + sqlparse, + starlette, + typing-extensions, + uvicorn, +}: + +buildPythonPackage (finalAttrs: { + pname = "mlflow-skinny"; + inherit (mlflow) version src; + pyproject = true; + __structuredAttrs = true; + + sourceRoot = "${finalAttrs.src.name}/libs/skinny"; + + build-system = [ setuptools ]; + + dependencies = [ + cachetools + click + cloudpickle + databricks-sdk + fastapi + gitpython + importlib-metadata + opentelemetry-api + opentelemetry-proto + opentelemetry-sdk + packaging + protobuf + pydantic + python-dotenv + pyyaml + requests + sqlparse + starlette + typing-extensions + uvicorn + ]; + + pythonImportsCheck = [ "mlflow" ]; + + # No tests in the skinny subtree. + doCheck = false; + + meta = mlflow.meta // { + description = "Lightweight version of MLflow that is designed to minimize package size"; + homepage = "https://github.com/mlflow/mlflow/tree/master/libs/skinny"; + }; +}) diff --git a/pkgs/development/python-modules/mlflow-tracing/default.nix b/pkgs/development/python-modules/mlflow-tracing/default.nix new file mode 100644 index 000000000000..ca76c7112bad --- /dev/null +++ b/pkgs/development/python-modules/mlflow-tracing/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + mlflow, + + # build-system + setuptools, + + # dependencies + cachetools, + databricks-sdk, + opentelemetry-api, + opentelemetry-proto, + opentelemetry-sdk, + packaging, + protobuf, + pydantic, + + # tests + pytestCheckHook, +}: +buildPythonPackage (finalAttrs: { + pname = "mlflow-tracing"; + inherit (mlflow) version; + pyproject = true; + __structuredAttrs = true; + + inherit (mlflow) src; + + sourceRoot = "${finalAttrs.src.name}/libs/tracing"; + + build-system = [ + setuptools + ]; + + dependencies = [ + cachetools + databricks-sdk + opentelemetry-api + opentelemetry-proto + opentelemetry-sdk + packaging + protobuf + pydantic + ]; + + pythonImportsCheck = [ "mlflow.tracing" ]; + + # No tests + doCheck = false; + + meta = { + description = "Open-Source SDK for observability and monitoring GenAI applications"; + homepage = "https://github.com/mlflow/mlflow/tree/master/libs/tracing"; + inherit (mlflow.meta) license; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 85d5b0a56be0..2664291d6798 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -9,195 +9,68 @@ # dependencies aiohttp, alembic, - cachetools, - click, - cloudpickle, cryptography, - databricks-sdk, docker, - fastapi, flask, flask-cors, - gitpython, graphene, gunicorn, huey, - importlib-metadata, - jinja2, - markdown, matplotlib, + mlflow-skinny, + mlflow-tracing, numpy, - opentelemetry-api, - opentelemetry-proto, - opentelemetry-sdk, - packaging, pandas, - protobuf, pyarrow, - python-dotenv, - pyyaml, - requests, scikit-learn, scipy, skops, sqlalchemy, - sqlparse, - uvicorn, - - # tests - azure-core, - azure-storage-blob, - azure-storage-file, - boto3, - botocore, - catboost, - datasets, - google-cloud-storage, - httpx, - jwt, - keras, - langchain, - librosa, - moto, - opentelemetry-exporter-otlp, - optuna, - pydantic, - pyspark, - pytestCheckHook, - pytorch-lightning, - sentence-transformers, - shap, - starlette, - statsmodels, - tensorflow, - torch, - transformers, - xgboost, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mlflow"; - version = "3.11.1"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; - tag = "v${version}"; - hash = "sha256-Oe6nBnnOz7MvGUNCcCGhHl6ZbyDfAhQ0LlfMBF4p6Hc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; }; - pythonRelaxDeps = [ - "cryptography" - "gunicorn" - "importlib_metadata" - "packaging" - "protobuf" - "pytz" - "pyarrow" - ]; + # ppyproject.release.toml is the one shipped in the Pypi package, so we use it too. + postPatch = '' + mv pyproject.release.toml pyproject.toml + ''; build-system = [ setuptools ]; dependencies = [ aiohttp alembic - cachetools - click - cloudpickle cryptography - databricks-sdk docker - fastapi flask flask-cors - gitpython graphene gunicorn huey - importlib-metadata - jinja2 - markdown matplotlib + mlflow-skinny + mlflow-tracing numpy - opentelemetry-api - opentelemetry-proto - opentelemetry-sdk - packaging pandas - protobuf pyarrow - pydantic - python-dotenv - pyyaml - requests scikit-learn scipy - shap skops sqlalchemy - sqlparse - uvicorn ]; pythonImportsCheck = [ "mlflow" ]; - nativeCheckInputs = [ - aiohttp - azure-core - azure-storage-blob - azure-storage-file - boto3 - botocore - catboost - datasets - google-cloud-storage - httpx - jwt - keras - langchain - librosa - moto - opentelemetry-exporter-otlp - optuna - pydantic - pyspark - pytestCheckHook - pytorch-lightning - sentence-transformers - starlette - statsmodels - tensorflow - torch - transformers - uvicorn - xgboost - ]; - - disabledTestPaths = [ - # Requires unpackaged `autogen` - "tests/autogen/test_autogen_autolog.py" - - # Requires unpackaged `diviner` - "tests/diviner/test_diviner_model_export.py" - - # Requires unpackaged `sktime` - "examples/sktime/test_sktime_model_export.py" - - # Requires `fastai` which would cause a circular dependency - "tests/fastai/test_fastai_autolog.py" - "tests/fastai/test_fastai_model_export.py" - - # Requires `spacy` which would cause a circular dependency - "tests/spacy/test_spacy_model_export.py" - - # Requires `tensorflow.keras` which is not included in our outdated version of `tensorflow` (2.13.0) - "tests/gateway/providers/test_ai21labs.py" - "tests/tensorflow/test_keras_model_export.py" - "tests/tensorflow/test_keras_pyfunc_model_works_with_all_input_types.py" - "tests/tensorflow/test_mlflow_callback.py" - ]; - # I (@GaetanLepage) gave up at enabling tests: # - They require a lot of dependencies (some unpackaged); # - Many errors occur at collection time; @@ -208,8 +81,10 @@ buildPythonPackage rec { description = "Open source platform for the machine learning lifecycle"; mainProgram = "mlflow"; homepage = "https://github.com/mlflow/mlflow"; - changelog = "https://github.com/mlflow/mlflow/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mlflow/mlflow/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + GaetanLepage + ]; }; -} +}) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 9f22360363e3..b70ed7de68e8 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -186,7 +186,6 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/ml-explore/mlx/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Gabriella439 booxter cameronyule viraptor diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix index 6cd26bb28bf1..e2ac4ab31407 100644 --- a/pkgs/development/python-modules/moreorless/default.nix +++ b/pkgs/development/python-modules/moreorless/default.nix @@ -8,16 +8,16 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moreorless"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "thatch"; repo = "moreorless"; - tag = "v${version}"; - hash = "sha256-VCvvPxDWriaeKeRaj/YbPLPfNL7fipGwCydr6K0HMjc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uFcNjQLr/rO2hf2ujWWSsOVxfwgAeIxDZ0yskOfBSe4="; }; build-system = [ setuptools-scm ]; @@ -31,18 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "moreorless" ]; - enabledTestPaths = [ - "moreorless/tests/click.py" - "moreorless/tests/combined.py" - "moreorless/tests/general.py" - "moreorless/tests/patch.py" - ]; - meta = { - changelog = "https://github.com/thatch/moreorless/releases/tag/${src.tag}"; description = "Wrapper to make difflib.unified_diff more fun to use"; homepage = "https://github.com/thatch/moreorless/"; + changelog = "https://github.com/thatch/moreorless/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index b95bb5d0142e..46d7a5277436 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "4.1.1"; + version = "4.1.2"; pyproject = true; src = fetchFromGitHub { repo = "mpi4py"; owner = "mpi4py"; tag = version; - hash = "sha256-I7b4x3pxtfbmlbno5OIxo4HutRX3/RjdsoNtBRKgE5w="; + hash = "sha256-h9RZr+xLmp+cVvrPkew3AOJLE8okd4A/2oqhsSmVBXU="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 56b32d654d83..c257892fee51 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -43,8 +43,8 @@ let in { mypy-boto3-accessanalyzer = - buildMypyBoto3Package "accessanalyzer" "1.43.0" - "sha256-BwX8ieQDuKQ+ZXvGD+INPX6pS6qvqewhj8Ttfi1Rs8Q="; + buildMypyBoto3Package "accessanalyzer" "1.43.10" + "sha256-oB2v3DdKFxhtwJ974/vq5UIJ9UVWCPMCAJaDNl2xTtM="; mypy-boto3-account = buildMypyBoto3Package "account" "1.43.0" @@ -227,8 +227,8 @@ in "sha256-W+hFvD3Buc29i2sHH618QtAiHUCHrAzHxbndIZsyRgY="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.43.4" - "sha256-jAr6JmEYShdpmkDPZWOWazrCd15ZYMTdwbHoWbCYrTM="; + buildMypyBoto3Package "cloudfront" "1.43.8" + "sha256-5aJzk0WW/xf3JLiFuyJwSqAmnt7s1zExJ/YjxXWtyKM="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.43.0" @@ -335,8 +335,8 @@ in "sha256-kPG0jzeHlRm8dNKCrxJY2Jw/N06PL+C/34gB9qhz2BY="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.43.7" - "sha256-XvHyT7+6/Uf2YdIeI6sL32TJGQ5Yy/VXjon70HDyGvY="; + buildMypyBoto3Package "connect" "1.43.10" + "sha256-SuUSGDyoWoz8Ddr1+LTuVQ350HFrW4pXe7zR4Ye5aiw="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.43.0" @@ -411,8 +411,8 @@ in "sha256-jkgV+/T/mGbAFQh46ZYBLTM66Rtd762XUUsbcFciJkk="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.43.0" - "sha256-SDTUIwYwaIa8GTCU4P6x0gjZcjVtv+fY39ahC6rnYDQ="; + buildMypyBoto3Package "dms" "1.43.8" + "sha256-JsAuf1JbvbWQfiUT0Y0kQlS9/zzLuF2BeikZ5tMtUu4="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.43.0" @@ -443,8 +443,8 @@ in "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.43.7" - "sha256-OO7+5yKwPCacPZWT8HmG8SMBSs+xDeWofTrEXCY8vgs="; + buildMypyBoto3Package "ec2" "1.43.10" + "sha256-fuLTYcz1oNGgN8zoTNJ8QPkdv0Jl5fjmputRuY9svo8="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.43.0" @@ -459,8 +459,8 @@ in "sha256-02BUkAFhr9sT8ohkJJFPYNni0O9/UI/G0GUee/Kx5Dw="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.43.0" - "sha256-r2UhnI0quhdur/l/5LxlaVSwgDYQGdR1KdwadfvuR2c="; + buildMypyBoto3Package "ecs" "1.43.10" + "sha256-/ROYkmhRUy4YCcdRJPyR+GZ5kl+2L3pz04Kc1ZZPfU4="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.43.0" @@ -571,11 +571,11 @@ in "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.43.7" - "sha256-PD/CGMq+yciwF8aqvkllDICUaKt1oeHtlP8CteGfYlk="; + buildMypyBoto3Package "glue" "1.43.8" + "sha256-CJJviequ3qlGqjvK0p4Z1/MPG0XK6k7LM0CkOfh4LCc="; mypy-boto3-grafana = - buildMypyBoto3Package "grafana" "1.43.0" - "sha256-ciXs8g462XTc+GTyxuGDDEsoR9DMD+bOdSUFe0OLshM="; + buildMypyBoto3Package "grafana" "1.43.8" + "sha256-qjSN2N+pZSw4PXSziognGUE4U7W+4BIr/qcmcu6+M9o="; mypy-boto3-greengrass = buildMypyBoto3Package "greengrass" "1.43.0" @@ -694,8 +694,8 @@ in "sha256-CAn84uzip9Cd8Xr33gxAx6+iQ9hRYPO0u718BtYCr84="; mypy-boto3-ivs = - buildMypyBoto3Package "ivs" "1.43.0" - "sha256-wGqp7Kw0TuAOd9RiOzEFUujuWnPTfEdWcjtNZkT/VJU="; + buildMypyBoto3Package "ivs" "1.43.10" + "sha256-2Q3yLbuHE/x96RtF1ZW8fBTvQfmujLC9ZxXGmc5lJCg="; mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.43.0" @@ -806,8 +806,8 @@ in "sha256-EunrKwNaYp0CDiwp8frI7zASilMF4wYHjDSuCsJ6aJM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.43.3" - "sha256-nHSEpvhI5+XDRqLqhWY8JNKCrnh5d0gyEReyYtbqhFw="; + buildMypyBoto3Package "logs" "1.43.9" + "sha256-z/0+HjEaoSPjLVQRXBjOShaU7xbj6ztQKdLFEqF/PXc="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.43.0" @@ -874,8 +874,8 @@ in "sha256-5AqWiNGz9jemWb8dZkuGQXxPXIruMdDWcoRzbT+ZGro="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.43.0" - "sha256-bGxwx1LeiPWn6gz4Yqu6pIQ7sMgCro5W4oO/Wk72gok="; + buildMypyBoto3Package "mediapackagev2" "1.43.9" + "sha256-1SSjLgLoGB2C7nqpAJty+BX94cwIcwoBGk03lMOgMBg="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.43.0" @@ -906,8 +906,8 @@ in "sha256-V6xgiUn87wqIlWJGOpc7Zu24EDzROAspAn3qkRifsFU="; mypy-boto3-mgn = - buildMypyBoto3Package "mgn" "1.43.0" - "sha256-YpSyhr87CmLo2+LGQzXU8q9uZt5YiDm23Ukpdh8eZIg="; + buildMypyBoto3Package "mgn" "1.43.8" + "sha256-qLvs7F/FPOLHsVnzvAGLqKRedZmdx6OWJNkP7QSLE7Q="; mypy-boto3-migration-hub-refactor-spaces = buildMypyBoto3Package "migration-hub-refactor-spaces" "1.43.0" @@ -1070,8 +1070,8 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.43.7" - "sha256-lRhSTB6e+ZikBAKlMumS7ggBeGuneDKiUtzcVHvJDVM="; + buildMypyBoto3Package "quicksight" "1.43.10" + "sha256-I+J24XB8hRjuklH5dlYAyTfOI6f7cN+EhKMI2UYFHQw="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.43.0" diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index a618d326079d..cad0d615b67c 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -14,7 +14,6 @@ gitpython, jinja2, jupyter-server, - jupyter-server-mathjax, nbformat, pygments, requests, @@ -22,19 +21,18 @@ # tests gitMinimal, - pytest-tornado, pytestCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "nbdime"; - version = "4.0.3"; + version = "4.0.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YqtQp1goJSPEUBFEufMUIh27rtBAPBL9cPak/MUy7CQ="; + hash = "sha256-jNJez+61EF1WMjfX9k60dIBY+6m7qas4kqH/YeF3zhY="; }; build-system = [ @@ -48,7 +46,6 @@ buildPythonPackage rec { gitpython jinja2 jupyter-server - jupyter-server-mathjax nbformat pygments requests @@ -57,7 +54,6 @@ buildPythonPackage rec { nativeCheckInputs = [ gitMinimal - pytest-tornado pytestCheckHook writableTmpDirAsHomeHook ]; @@ -91,7 +87,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jupyter/nbdime"; - changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter/nbdime/blob/v${version}/CHANGELOG.md"; description = "Tools for diffing and merging of Jupyter notebooks"; license = lib.licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix index c640f55c8638..2d88c5695aab 100644 --- a/pkgs/development/python-modules/nice-go/default.nix +++ b/pkgs/development/python-modules/nice-go/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nice-go"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "IceBotYT"; repo = "nice-go"; tag = version; - hash = "sha256-8hm2kB1axv2oqMLSKmquFLe7jsTFO+HYnCz5vL4ve/A="; + hash = "sha256-09Tc2fFXUevQNgJmXyeXy1sBg9Cr9OV/15Feh9tlRug="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix index c3b5b6eb5a2e..7406d631b943 100644 --- a/pkgs/development/python-modules/nominal-api-protos/default.nix +++ b/pkgs/development/python-modules/nominal-api-protos/default.nix @@ -4,6 +4,8 @@ fetchPypi, setuptools, protobuf, + grpcio, + grpcio-tools, }: buildPythonPackage rec { @@ -20,7 +22,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ protobuf ]; + dependencies = [ + protobuf + grpcio + grpcio-tools + ]; pythonImportsCheck = [ "nominal_api_protos" ]; diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index ceff7cd1fdfe..044f93b2cc75 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-SpFZ4cu+clvHtjD/Qm6L8Qi9sICWZNE2/l/YXWhAZCo="; + hash = "sha256-kPFimI9h8BL3qQ+puZy70AYnX3zpbZ2nV5revmYPjIY="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index e101000ed58b..cf58f457ff23 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -31,7 +31,6 @@ mock, optax, portpicker, - pytest-xdist, pytestCheckHook, safetensors, torch, @@ -39,14 +38,15 @@ buildPythonPackage (finalAttrs: { pname = "orbax-checkpoint"; - version = "0.11.33"; + version = "0.11.39"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${finalAttrs.version}"; - hash = "sha256-ibHV+MwQvlh2USeDVAUWEJxCS1MGuPZRnZZTBWFO7UQ="; + hash = "sha256-KrehggcpKqMd51SdEo3uzYyvH8M15tmECHzvGLBhD/4="; }; sourceRoot = "${finalAttrs.src.name}/checkpoint"; @@ -80,15 +80,10 @@ buildPythonPackage (finalAttrs: { mock optax portpicker - pytest-xdist pytestCheckHook safetensors torch ]; - pythonImportsCheck = [ - "orbax" - "orbax.checkpoint" - ]; disabledTests = [ # Flaky @@ -107,6 +102,14 @@ buildPythonPackage (finalAttrs: { # AssertionError: False is not true "test_register_and_get" "test_register_different_modules" + + # IndexError: list index out of range + "test_named_sharding" + + # ValueError: cannot reshape array of size 1 into shape (0,2) + "test_get_leaf_memory_per_device" + "test_number_of_broadcasts" + "test_tree_memory_per_device" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Probably failing because of a filesystem impurity @@ -131,8 +134,14 @@ buildPythonPackage (finalAttrs: { # Description from first occurrence: Number of processes to use. # https://github.com/google/orbax/issues/1580 "orbax/checkpoint/_src/testing/multiprocess_test.py" + "orbax/checkpoint/_src/testing/oss/multiprocess_test.py" "orbax/checkpoint/experimental/emergency/" + # ImportError: cannot import name 'tiering_service_pb2' from + # 'orbax.checkpoint.experimental.tiering_service.proto' + # (the protobuf module is not generated from the .proto file) + "orbax/checkpoint/experimental/tiering_service/server_test.py" + # ValueError: Distributed system is not available; please initialize it via `jax.distributed.initialize()` at the start of your program. "orbax/checkpoint/_src/handlers/array_checkpoint_handler_test.py" @@ -148,6 +157,9 @@ buildPythonPackage (finalAttrs: { # '/build/absl_testing/DefaultSnapshotTest/runTest/root/path/to/source/data.txt' "orbax/checkpoint/_src/path/snapshot/snapshot_test.py" + # Expects to run on 8 devices + "orbax/checkpoint/_src/multihost/multihost_test.py" + # Circular dependency flax "orbax/checkpoint/_src/handlers/pytree_checkpoint_handler_test.py" "orbax/checkpoint/_src/metadata/empty_values_test.py" @@ -160,6 +172,12 @@ buildPythonPackage (finalAttrs: { "orbax/checkpoint/checkpoint_manager_test.py" "orbax/checkpoint/single_host_test.py" "orbax/checkpoint/transform_utils_test.py" + "orbax/checkpoint/_src/handlers/standard_checkpoint_handler_test.py" + ]; + + pythonImportsCheck = [ + "orbax" + "orbax.checkpoint" ]; meta = { diff --git a/pkgs/development/python-modules/oslex/default.nix b/pkgs/development/python-modules/oslex/default.nix index 5eeec6baab23..b5f8a215b6aa 100644 --- a/pkgs/development/python-modules/oslex/default.nix +++ b/pkgs/development/python-modules/oslex/default.nix @@ -4,18 +4,19 @@ fetchFromGitHub, hatchling, mslex, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oslex"; - version = "0.1.3"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "petamas"; repo = "oslex"; - tag = "release/v${version}"; - hash = "sha256-OcmBtxGS1Cq2kEcxF0Il62LUGbAAcG4lieokr/nK2/4="; + tag = "release/v${finalAttrs.version}"; + hash = "sha256-BTyLL3tb1P8VMGvTgoHGmwvFqf3gOyXOI+YmHuEjrKc="; }; build-system = [ @@ -26,6 +27,10 @@ buildPythonPackage rec { mslex ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "oslex" ]; @@ -36,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ yzx9 ]; }; -} +}) diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index f3a8fb64705b..3cad5136d858 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.7.2"; + version = "6.8.0"; pyproject = true; src = fetchPypi { pname = "oslo_i18n"; inherit version; - hash = "sha256-sSQa0+7iFuncmstDNvzgvXnEwoZ1HucN+kL/L5dj008="; + hash = "sha256-oLTGTBOWhp1xRNymCtl8frAo949h+RxwB1MSOAUZl98="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osrf-pycommon/default.nix b/pkgs/development/python-modules/osrf-pycommon/default.nix new file mode 100644 index 000000000000..bf40562a528e --- /dev/null +++ b/pkgs/development/python-modules/osrf-pycommon/default.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "osrf-pycommon"; + version = "2.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "osrf"; + repo = "osrf_pycommon"; + tag = finalAttrs.version; + hash = "sha256-gKYeCvcJDJkW2OYP7K3eyztuPSkzE8dHoTUh4sKvxcM="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "osrf_pycommon" ]; + + disabledTestPaths = [ + "tests/test_code_format.py" # flake8 based tests don't work + ]; + + meta = { + description = "Commonly needed Python modules used by Python software developed at OSRF"; + homepage = "http://osrf-pycommon.readthedocs.org/"; + changelog = "https://github.com/osrf/osrf_pycommon/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; + downloadPage = "https://github.com/osrf/osrf_pycommon"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix index 5cf9d0aa5104..1edd266975ba 100644 --- a/pkgs/development/python-modules/powerapi/default.nix +++ b/pkgs/development/python-modules/powerapi/default.nix @@ -11,6 +11,8 @@ pytest-cov-stub, pytest-timeout, pytestCheckHook, + pythonAtLeast, + pythonOlder, pyzmq, setproctitle, setuptools, @@ -38,11 +40,14 @@ buildPythonPackage rec { ]; optional-dependencies = { - influxdb = [ influxdb-client ]; kubernetes = [ kubernetes ]; mongodb = [ pymongo ]; # opentsdb = [ opentsdb-py ]; prometheus = [ prometheus-client ]; + } + // lib.optionalAttrs (pythonOlder "3.14") { + # influxdb-client depends on reactivex, which is disabled on 3.14 + influxdb = [ influxdb-client ]; }; nativeCheckInputs = [ @@ -55,7 +60,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "powerapi" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # multiprocessing pickling fails: darwin sandbox + py3.14 weakref change + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin || pythonAtLeast "3.14") [ "test_puller" "TestDispatcher" "TestK8sProcessor" diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index 748b50129472..9db10662aa28 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -46,6 +46,10 @@ buildPythonPackage rec { disabledTests = [ #ValueError: Invalid modulus "test_modulus_verification" + # bcrypt 5.0 rejects test fixture password longer than 72 bytes + "test_compute_v" + "test_generate_v" + "test_srp" ]; pythonImportsCheck = [ "proton" ]; diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix index 52fad873c884..345e89080267 100644 --- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-ai-slim"; - version = "1.95.1"; + version = "1.97.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-JE5ufIfwEVtJ9OOdPnuQPiOOvmo63l6D7IsNIats39c="; + hash = "sha256-L18K1g77PeHlc7BdWalrMPOaBmdRErIXogiLcW57lq8="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim"; diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix index ecd8a93b915e..f9b84b83e230 100644 --- a/pkgs/development/python-modules/pydantic-graph/default.nix +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-graph"; - version = "1.95.1"; + version = "1.97.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-JE5ufIfwEVtJ9OOdPnuQPiOOvmo63l6D7IsNIats39c="; + hash = "sha256-L18K1g77PeHlc7BdWalrMPOaBmdRErIXogiLcW57lq8="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 66ec3665a6ef..aa330c312f1c 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.26"; + version = "0.3.27"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-EkLew8BpNK7OzlLd3BOvFKtG8OTVLuUUNxOKM+W0WFA="; + hash = "sha256-B4xd+wXaZC3gl+uyGlM+y3bahU20ny8v34USCkJJhlQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix index 5b07098ec2e4..7d56f4d3a71d 100644 --- a/pkgs/development/python-modules/pyezvizapi/default.nix +++ b/pkgs/development/python-modules/pyezvizapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyezvizapi"; - version = "1.0.4.8"; + version = "1.0.4.9"; pyproject = true; src = fetchFromGitHub { owner = "RenierM26"; repo = "pyEzvizApi"; tag = "v${version}"; - hash = "sha256-JR+OZ0te2WK7IamZ7FpzbwNc42hjNz2qOW8NlzzOH7Y="; + hash = "sha256-hpfsDZzv5rhr8y7PNcprwFoQdVUq0UlN+UtPrkqz4zE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 960a4e51c350..4ca04d4462fe 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pyfxa"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3zxXWzFOjWcnX8hAQpRzGlzTmnXjZjn9jF+MdsHuGkw="; + hash = "sha256-gq/OfpKjw6BSbGKTXbRa2crxleJJoj0BN4Ful1npWlw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index afccc4be5f55..6e1efec2efaf 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "pyintesishome"; - version = "1.8.7"; + version = "1.8.8"; pyproject = true; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; tag = finalAttrs.version; - hash = "sha256-TwZAuu/mnChZwhZ5uGPiQ23curCiqTKWNgDrvwpgojc="; + hash = "sha256-wB4rrguafKEzAVYRTKQQTG4Z48obWrigLHbeGdoNQrQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 52aca02491c9..22671fe18f2e 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pynput"; tag = "v${version}"; - hash = "sha256-rOkUyreS3JqEyubQUdNLJf5lDuFassDKrQrUXKrKlgI="; + hash = "sha256-LoolcMYzurJrR7HR1qDO+dvLwP1l9P3+QOzI7uwLdso="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix b/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix index 0c238cbb69d0..b3333494c09d 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - fetchFromGitHub, setuptools, darwin, pyobjc-core, @@ -10,15 +9,9 @@ buildPythonPackage rec { pname = "pyobjc-framework-Quartz"; - version = "11.1"; pyproject = true; - src = fetchFromGitHub { - owner = "ronaldoussoren"; - repo = "pyobjc"; - tag = "v${version}"; - hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; - }; + inherit (pyobjc-core) version src; sourceRoot = "${src.name}/pyobjc-framework-Quartz"; diff --git a/pkgs/development/python-modules/pyobjc-framework-Security/default.nix b/pkgs/development/python-modules/pyobjc-framework-Security/default.nix index 8209ff78bd8d..15012555150d 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Security/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Security/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - fetchFromGitHub, setuptools, darwin, pyobjc-core, @@ -10,15 +9,9 @@ buildPythonPackage rec { pname = "pyobjc-framework-Security"; - version = "11.1"; pyproject = true; - src = fetchFromGitHub { - owner = "ronaldoussoren"; - repo = "pyobjc"; - tag = "v${version}"; - hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; - }; + inherit (pyobjc-core) version src; sourceRoot = "${src.name}/pyobjc-framework-Security"; diff --git a/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix b/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix index 9e466395e469..4f76fab4ca81 100644 --- a/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - fetchFromGitHub, setuptools, darwin, pyobjc-core, @@ -10,15 +9,9 @@ buildPythonPackage rec { pname = "pyobjc-framework-WebKit"; - version = "11.1"; pyproject = true; - src = fetchFromGitHub { - owner = "ronaldoussoren"; - repo = "pyobjc"; - tag = "v${version}"; - hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; - }; + inherit (pyobjc-core) version src; sourceRoot = "${src.name}/pyobjc-framework-WebKit"; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index e80113d11a1f..fa5c6af59e15 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -7,24 +7,21 @@ pydicom, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyorthanc"; - version = "1.22.1"; - + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "gacou54"; repo = "pyorthanc"; - tag = "v${version}"; - hash = "sha256-vdrLWDDEMEh7hg+M4FdxiaCC3IJfvuh8fgq+aLPfVJc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-L1vIU6oDZ95lFt2w/TYFpHdmHmDE2XPn10XdEUIlxRQ="; }; build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pydicom" - ]; + pythonRelaxDeps = [ "pydicom" ]; dependencies = [ httpx @@ -38,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Python library that wraps the Orthanc REST API"; homepage = "https://github.com/gacou54/pyorthanc"; - changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${src.tag}"; + changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 7b7eccdc467e..e051db5fbebe 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "python-bidi"; - version = "0.6.9"; + version = "0.6.10"; pyproject = true; src = fetchFromGitHub { owner = "MeirKriheli"; repo = "python-bidi"; tag = "v${version}"; - hash = "sha256-fnKaKQz0qMHIXQj6tH8WcoxDk+TASl77VM/0BFEoKag="; + hash = "sha256-IFLuUpOTZgI9KoZmeQKMlNPRQizXuaRhE0k/jk0fZvs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-iUpY/gmbY+wIWwVd2ubMOnE/srBKDLHNchdteMUVmpE="; + hash = "sha256-YW5BSnb4wSCTfQZ4ytiAxDmzrkyDAwTt4T1YzcZeiNY="; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/python-modules/python-duco-client/default.nix b/pkgs/development/python-modules/python-duco-client/default.nix index 7a079ed02de8..32dd82c536d0 100644 --- a/pkgs/development/python-modules/python-duco-client/default.nix +++ b/pkgs/development/python-modules/python-duco-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "python-duco-client"; - version = "0.4.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "ronaldvdmeer"; repo = "python-duco-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-q7Y+66/vJvm05gHyg8mk0vWYySso3DDRvqw6w9hvn9w="; + hash = "sha256-259aAdOltH/Yr+acIhFCe6M/JXCUQS80e8b15wlnVQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index 1ffeb9b47d5b..fb81ff90b846 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, aiohttp, netifaces, pytest-aio, @@ -13,28 +12,18 @@ buildPythonPackage rec { pname = "python-izone"; - version = "1.2.9"; + version = "1.2.10"; pyproject = true; src = fetchFromGitHub { owner = "Swamp-Ig"; repo = "pizone"; tag = "v${version}"; - hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg="; + hash = "sha256-/wErnm3SY5N/Bm1oODQsAVTPAtERcrJqwPt1ipDBuZ0="; }; - patches = [ - # https://github.com/Swamp-Ig/pizone/pull/26 - (fetchpatch { - name = "replace-async-timeout-with-asyncio.timeout.patch"; - url = "https://github.com/Swamp-Ig/pizone/commit/776a7c5682ecd1b75a0b36dea71c914c25476a77.patch"; - hash = "sha256-Cl71BErInSPtFNbPaV7E/LEDZPMuFNGKA8i5e+C3BMA="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools_scm[toml] >= 4, <6" "setuptools-scm[toml]" \ --replace-fail '"setuptools_scm_git_archive",' "" ''; diff --git a/pkgs/development/python-modules/python-qube-heatpump/default.nix b/pkgs/development/python-modules/python-qube-heatpump/default.nix index 5b07d81563d5..eeacfeebd715 100644 --- a/pkgs/development/python-modules/python-qube-heatpump/default.nix +++ b/pkgs/development/python-modules/python-qube-heatpump/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "python-qube-heatpump"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "MattieGit"; repo = "python-qube-heatpump"; tag = "v${finalAttrs.version}"; - hash = "sha256-E3JVk3eYJhesPMu0eFqxPu1HTyLWtKc8rV9z1E5IwJs="; + hash = "sha256-+voRl54hzKqtaps0HubOOQKuki4uIPlPPl31e6o6hXs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-xapp/default.nix b/pkgs/development/python-modules/python-xapp/default.nix index 4510f0df269f..fdd0418f8c58 100644 --- a/pkgs/development/python-modules/python-xapp/default.nix +++ b/pkgs/development/python-modules/python-xapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-xapp"; - version = "3.0.2"; + version = "3.0.3"; pyproject = false; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-+wN4BYAS7KYQT0vhyOSdyrJpOhGyv+2FAloClgZOyH0="; + hash = "sha256-KJ5mzilUg//FvwyhTHjzaUI3661RhN74r5qDIzdDOl8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywmspro/default.nix b/pkgs/development/python-modules/pywmspro/default.nix index ab29bfcf57d4..91e3537a43e3 100644 --- a/pkgs/development/python-modules/pywmspro/default.nix +++ b/pkgs/development/python-modules/pywmspro/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pywmspro"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "mback2k"; repo = "pywmspro"; tag = version; - hash = "sha256-cQ2qDVH7CfCj3he4f01tkwVrgCuE+NxSTeKINh75gxc="; + hash = "sha256-vEuJPJrGJffnk7FogcOXEiYNnciAFkzgAeJkjWZWt4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 067534536bc6..1ef3c33ec2fa 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.26.0"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-sdk-rust"; tag = "lib/v${version}"; - hash = "sha256-A404lYKGAigzsnqWO4BAphOK/Juj4Fa2EHXQO8N1U9I="; + hash = "sha256-ZxfDOcfTMyBvS5IRU2c61TOxwnM8hW4hTTjI4JlbBJk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-NAcCZks5N1KPqeA5v72NAcJqHGexRU99yXQHg21vkPA="; + hash = "sha256-Tx3qmBXUZZWNrkQybKNc/gmF/3Jfip+bgF9PSTEXntM="; }; buildAndTestSubdir = "crates/lib"; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 1ca2185d1dae..aff452f93978 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -196,6 +196,12 @@ buildPythonPackage (finalAttrs: { # Probably won't work in the Nix sandbox due to `xcffib.ConnectionException` "test_urgent_hook_fire" + + # flaky: race between force_update() executor task and widget.info() read + "test_threadpolltext_force_update" + + # flaky: race between repl server bind and client connect + "test_repl_server_executes_code" ]; passthru = { diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 817d57053e58..89e77b995785 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -28,14 +28,14 @@ buildPythonPackage (finalAttrs: { pname = "qutip"; - version = "5.2.3"; + version = "5.2.3.post1"; pyproject = true; src = fetchFromGitHub { owner = "qutip"; repo = "qutip"; tag = "v${finalAttrs.version}"; - hash = "sha256-y3yQf6rCjK0342WnUBieBmCLOWXjBAkxPe+G7TzZKio="; + hash = "sha256-9OcRV3BmRdDOCmov2cK3eoFutQI3Bf6w2QRPpFTZKCU="; }; build-system = [ diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 61e67de684d5..69ee8a2007a7 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { "rbtools/diffs/tests/test_apple_diff_tool.py::AppleDiffToolTests::test_run_diff_file_with_text_differences" # AssertionError: b'---[38 chars]0000 +0000\n+++ /path2.txt\t2022-09-26 10:20:3[42 chars]ar\n' != b'---[38 chars]0000 -0700\n+++ /path2.txt\t2022-09-26 10:20:3[42 chars]ar\n' # rbtools.utils.process.RunProcessError: Unexpected error executing the command: svn co file:///build/source/rbtools/clients/tests/testdata/svn-repo /build/rbtools._bw2ih4g/working/svn-repo "rbtools/clients/tests/test_svn.py" + "rbtools/clients/tests/test_git.py::GitSubversionClientTests" "rbtools/utils/tests/test_source_tree.py" "rbtools/clients/tests/test_scanning.py::ScanningTests::test_scanning_nested_repos_1" "rbtools/clients/tests/test_scanning.py::ScanningTests::test_scanning_nested_repos_2" diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 0dd6ff5e2245..5d2696e2e781 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.8.2"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; tag = "v${version}"; - hash = "sha256-tCtqLT+so4hBvjPB/hFogXzuje1YdGFtq9BmVKKyqoQ="; + hash = "sha256-hBZg1u6JtWGC+l1D1M18al6OQ298Z76tkiqYrBQYIzQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rerun-notebook/default.nix b/pkgs/development/python-modules/rerun-notebook/default.nix new file mode 100644 index 000000000000..99c79a166158 --- /dev/null +++ b/pkgs/development/python-modules/rerun-notebook/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + rerun, + fetchPypi, + + # dependencies + anywidget, + ipykernel, + jupyter-ui-poll, +}: + +buildPythonPackage (finalAttrs: { + pname = "rerun-notebook"; + inherit (rerun) version; + format = "wheel"; + __structuredAttrs = true; + + # Building this package from source is very cumbersome (it requires a wasm web-viewer + # cross-compile via cargo + an npm/esbuild bundle). Using the upstream wheel for now. + src = fetchPypi { + pname = "rerun_notebook"; + inherit (finalAttrs) version; + format = "wheel"; + python = "py2.py3"; + hash = "sha256-meHaELZC6ujtn3AQB/vxXZxno54XrS99y4rFKMWa6BU="; + }; + + pythonRelaxDeps = [ + # Upstream pins ipykernel<7.0.0 to dodge ipython/ipykernel#1450. + "ipykernel" + ]; + dependencies = [ + anywidget + ipykernel + jupyter-ui-poll + ]; + + pythonImportsCheck = [ "rerun_notebook" ]; + + meta = { + description = "Implementation helper for running rerun-sdk in notebooks"; + homepage = "https://github.com/rerun-io/rerun/tree/main/rerun_notebook"; + inherit (rerun.meta) + changelog + license + maintainers + ; + }; +}) diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 60fe41dff852..fded3aee9e80 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -19,13 +19,16 @@ typing-extensions, # tests + av, datafusion, inline-snapshot, polars, pytest-snapshot, pytestCheckHook, + rerun-notebook, tomli, torch, + torchvision, }: buildPythonPackage { @@ -86,13 +89,16 @@ buildPythonPackage { pythonImportsCheck = [ "rerun" ]; nativeCheckInputs = [ + av datafusion inline-snapshot polars pytest-snapshot pytestCheckHook + rerun-notebook tomli torch + torchvision ]; inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; @@ -111,9 +117,25 @@ buildPythonPackage { # TypeError: 'Snapshot' object is not callable "test_chunk_record_batch" "test_schema_recording" + + # pytest_snapshot mismatch: serialized schema/summary output drifted in 0.32.0 + "test_schema" + "test_summary_format" + + # AttributeError: 'datetime.datetime' object has no attribute 'value' + "test_lenses_time_extraction" + + # av.InvalidDataError: the mp4 asset is a Git LFS pointer, not the real + # video (rerun.src is fetched without fetchLFS). + "test_collect_optimize_video_stream_summary" ]; disabledTestPaths = [ + # RuntimeError: MCAP error: Bad magic number. The .mcap test assets are + # Git LFS pointer files, not real binaries (rerun.src is fetched without + # fetchLFS). + "rerun_py/tests/integration/test_mcap_reader.py" + # "fixture 'benchmark' not found" "tests/python/log_benchmark/test_log_benchmark.py" "tests/python/log_benchmark/test_micro_benchmark.py" diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index e961bf26a03b..a2002907ec4c 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { pname = "robotframework-seleniumlibrary"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; # no tests included in PyPI tarball @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { owner = "robotframework"; repo = "SeleniumLibrary"; tag = "v${finalAttrs.version}"; - hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ="; + hash = "sha256-NiB1dJWivyDc1ucldQ2cs3jTWt3hHY6AGsboKPmY+mo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix index 3a84be94939d..06cfb393bdbe 100644 --- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix +++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix @@ -8,23 +8,24 @@ # dependencies boto3, - mlflow, + mlflow-skinny, # tests pytestCheckHook, scikit-learn, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sagemaker-mlflow"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-mlflow"; - tag = "v${version}"; - hash = "sha256-riCoUpao9QIrQMb7r9stJO/xTSsDfL+uNS664W5GRQc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-QE40ZBW7N3GPC+eJqj5uzS3L+A6Wu2/LgHOiUsEXKMw="; }; build-system = [ @@ -33,7 +34,7 @@ buildPythonPackage rec { dependencies = [ boto3 - mlflow + mlflow-skinny ]; pythonImportsCheck = [ "sagemaker_mlflow" ]; @@ -56,16 +57,24 @@ buildPythonPackage rec { "test_presigned_url" "test_presigned_url_with_fields" + # Exercises a `sqlite://` model-registry store, only available with the + # sqlalchemy backend of the full `mlflow` package (not `mlflow-skinny`). + "test_store_instantiation_none" + ]; + + disabledTestPaths = [ + # `from mlflow.models import infer_signature` fails to import at collection + # time: `infer_signature` is only available in the full `mlflow` package, + # not in `mlflow-skinny`. Also see: # https://github.com/aws/sagemaker-mlflow/issues/16 - # TypeError: LogisticRegression.__init__() got an unexpected keyword argument 'multi_class' - "test_model_registry" + "test/integration/tests/test_model_registry.py" ]; meta = { description = "MLFlow plugin for SageMaker"; homepage = "https://github.com/aws/sagemaker-mlflow"; - changelog = "https://github.com/aws/sagemaker-mlflow/releases/tag/v${version}"; + changelog = "https://github.com/aws/sagemaker-mlflow/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index 1f1e23f24d23..88b19a6e2679 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -5,6 +5,7 @@ setuptools, pytestCheckHook, numpy, + openssl, }: buildPythonPackage rec { @@ -23,7 +24,10 @@ buildPythonPackage rec { dependencies = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + openssl + pytestCheckHook + ]; pythonImportsCheck = [ "sipyco" ]; diff --git a/pkgs/development/python-modules/sparsediffpy/default.nix b/pkgs/development/python-modules/sparsediffpy/default.nix new file mode 100644 index 000000000000..5b84d329f292 --- /dev/null +++ b/pkgs/development/python-modules/sparsediffpy/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cmake, + ninja, + numpy, + scikit-build-core, + + # buildInputs + blas, +}: + +buildPythonPackage (finalAttrs: { + pname = "sparsediffpy"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SparseDifferentiation"; + repo = "SparseDiffPy"; + tag = "v${finalAttrs.version}"; + # SparseDiffEngine is built from source and their cmake does not support finding it on the + # system. We fallback to using the git submodule approach for now. + fetchSubmodules = true; + hash = "sha256-4FiObnGIJSSH7BMkKS7y7rc4HYzDgMV7ym+wPZ/KHJ8="; + }; + + build-system = [ + cmake + ninja + numpy + scikit-build-core + ]; + dontUseCmakeConfigure = true; + + buildInputs = [ + blas + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ "sparsediffpy" ]; + + # No tests + doCheck = false; + + meta = { + description = "Python bindings for SparseDiffEngine, a C library for computing sparse Jacobians and Hessians"; + homepage = "https://github.com/SparseDifferentiation/SparseDiffPy"; + changelog = "https://github.com/SparseDifferentiation/SparseDiffPy/blob/${finalAttrs.src.tag}/RELEASES.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index 535c012c6ec9..8f58933a387a 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tabledata"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = "tabledata"; tag = "v${version}"; - hash = "sha256-kZAEKUOcxb3fK3Oh6+4byJJlB/xzDAEGNpUDEKyVkhs="; + hash = "sha256-yt71e2ZPJ5WpDLs6sU4kYQGR13IgJB7gMEzhaCHblos="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 6e2499f70265..1a05b9974c44 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.27.0"; + version = "1.27.2"; pyproject = true; src = fetchFromGitHub { @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "sdk-python"; tag = version; fetchSubmodules = true; - hash = "sha256-UjfEBD0gLqZ+u53j1Chhearpljv+Arxw7Ru5slHA8i8="; + hash = "sha256-AwWcZJlYysGfNuhM2jgCWoT1MblNt6oof4/uMOsdCMk="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2e7a731bfcd7..f6c71a616094 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.97"; + version = "3.1.99"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-wBDCzuk/YS1n8aW9FxtzfgupPOfJ2VOpXrrjTa/izbE="; + hash = "sha256-09CpBVLxz5BjbxgrLoAamK+9lHMWyZFE+bptEmT0CeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 62c29071e33e..91b2a380b5f3 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textnets"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "jboynyc"; repo = "textnets"; tag = "v${version}"; - hash = "sha256-GbJH+6EqfP+miqpYitnBwNDO6uQQq3h9Fy58nVaF1vw="; + hash = "sha256-0KBKpA4nnHxem65tZTtZcXl/EVS1ifWOXGT7a/750Gk="; }; build-system = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index d7b48ee4dd7f..f4960e92fa30 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "textual"; - version = "8.2.5"; + version = "8.2.6"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-bQnyTnoG/3Lcrn9cHwNHUYw6piOg8U9bAoPfZW7SDmQ="; + hash = "sha256-VSgwa817ovlbKnuJx6KCy3osund8PXZ4Sqlh02TkxGA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/trectools/default.nix b/pkgs/development/python-modules/trectools/default.nix index b626e5d2bef1..8ac9550f2076 100644 --- a/pkgs/development/python-modules/trectools/default.nix +++ b/pkgs/development/python-modules/trectools/default.nix @@ -46,14 +46,19 @@ buildPythonPackage { sarge ]; - unittestFlagsArray = [ - "unittests/" - ]; - nativeCheckInputs = [ unittestCheckHook ]; + preCheck = '' + # tests pass numpy arrays to float(), which numpy 2 rejects + rm unittests/testtreceval.py + ''; + + unittestFlagsArray = [ + "unittests/" + ]; + pythonImportsCheck = [ "trectools" ]; meta = { diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 739fb0c2d3ee..434ca8a5552f 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.15.0"; + version = "0.16.0"; pyproject = true; # https://github.com/python-trio/trio-asyncio/issues/160 @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio-asyncio"; tag = "v${version}"; - hash = "sha256-6c+4sGEpCVC8wxBg+dYgkOwRAUOi/DTITrDx3M2koyE="; + hash = "sha256-7kp99tdJhExjg8WsfBtXJyFrKnSAtTF1fhPFxCU7eI8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tritonclient/default.nix b/pkgs/development/python-modules/tritonclient/default.nix index 0b90905a475b..419de8bda9b7 100644 --- a/pkgs/development/python-modules/tritonclient/default.nix +++ b/pkgs/development/python-modules/tritonclient/default.nix @@ -5,6 +5,7 @@ fetchPypi, numpy, python-rapidjson, + urllib3, # optional dependencies aiohttp, geventhttpclient, @@ -14,7 +15,7 @@ let pname = "tritonclient"; - version = "2.54.0"; + version = "2.68.0"; format = "wheel"; in buildPythonPackage rec { @@ -27,8 +28,8 @@ buildPythonPackage rec { x86_64-linux = "manylinux1_x86_64"; }; hashes = { - aarch64-linux = "e485a67c75121a2b58456bd6275086252dd72208674b0c85bd57a60f428b686f"; - x86_64-linux = "53c326498e9036f99347a938d52abd819743e957223edec31ae3c9681e5a6065"; + aarch64-linux = "sha256-RkHdD4yPvo85Fqts07XFsgiMUCFXWiWuHQqfGDznJGk="; + x86_64-linux = "sha256-7h98H/ipZk56193fhhaSR62Mnis4Wakn/ZhOrhWa4vc="; }; in fetchPypi { @@ -38,13 +39,14 @@ buildPythonPackage rec { platform = platforms.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - sha256 = + hash = hashes.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; propagatedBuildInputs = [ numpy python-rapidjson + urllib3 ]; pythonImportsCheck = [ "tritonclient" ]; diff --git a/pkgs/development/python-modules/typed-argparse/default.nix b/pkgs/development/python-modules/typed-argparse/default.nix index 4b15c9318a77..3f042cb8ea89 100644 --- a/pkgs/development/python-modules/typed-argparse/default.nix +++ b/pkgs/development/python-modules/typed-argparse/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools, typing-extensions, pytestCheckHook, @@ -24,13 +25,21 @@ buildPythonPackage { dependencies = [ typing-extensions ]; - pythonImportsCheck = [ "typed_argparse" ]; - nativeCheckInputs = [ pytestCheckHook pytest-cov-stub ]; + # https://github.com/typed-argparse/typed-argparse/pull/82 + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + "test_nargs_with_choices__literal_illegal_default" + "test_nargs_with_choices__enum_illegal_default" + "test_bindings_check" + "test_check_reserved_names" + ]; + + pythonImportsCheck = [ "typed_argparse" ]; + meta = { description = "Type-safe Python argument parsing"; homepage = "https://typed-argparse.github.io/typed-argparse/"; diff --git a/pkgs/development/python-modules/typesense/default.nix b/pkgs/development/python-modules/typesense/default.nix index f3fb86c02caf..78441621aa8d 100644 --- a/pkgs/development/python-modules/typesense/default.nix +++ b/pkgs/development/python-modules/typesense/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "typesense"; - version = "1.3.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "typesense"; repo = "typesense-python"; tag = "v${version}"; - hash = "sha256-b3t4l02tOiSMrkqZACV6l5f+Kb5Wfcnq9ZZCld1SKBU="; + hash = "sha256-vo9DW4kinb00zWW4yX8ibyelQxW3eVabn+oMddPEd18="; }; patches = [ diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 1047d820d480..598de8ecac99 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -12,19 +12,19 @@ buildPythonPackage (finalAttrs: { pname = "typst"; - version = "0.14.8"; + version = "0.14.9"; pyproject = true; src = fetchFromGitHub { owner = "messense"; repo = "typst-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-hJOAcP4MyI7TCY8M99OVaMhFhp2RbhBekCc1mjqBvcc="; + hash = "sha256-BiheOVvXPoLGtOzObZte38RkMVkUMOsFURn5DU1cw+o="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-trmnUSIYr5X3UyJjbd7VYko71ziPsvR7l1c0XfFzC80="; + hash = "sha256-PM0WntALVI/ks7N/Uk5tjcb0XBr2PSUY+O1nalFg2JQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix index c9cd36c7d6b2..3d7d32fabd24 100644 --- a/pkgs/development/python-modules/urllib3-future/default.nix +++ b/pkgs/development/python-modules/urllib3-future/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "urllib3-future"; - version = "2.20.904"; + version = "2.20.905"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; tag = version; - hash = "sha256-HcHTZDG4fAP6FlIHwnSQUh2cTCmDN+aN9Iz2wnn3LPg="; + hash = "sha256-IA8aVChwAazkK4cqR7S7dDwzvKG6XmrsFgWjRssOrr4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix index d23520cd2871..2d0173629921 100644 --- a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix +++ b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vacuum-map-parser-roborock"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; src = fetchFromGitHub { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; tag = "v${version}"; - hash = "sha256-MqsLvAs4PU/K2yBxEhVJucstZg9QFPYgOTCbgT2Uq/A="; + hash = "sha256-v9T9KGKi2vvxZQDjL6CBziPisgQ7sp3HnWZgZ/e8kVY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix index e5104ebf1ff5..232ee4ef0704 100644 --- a/pkgs/development/python-modules/victron-mqtt/default.nix +++ b/pkgs/development/python-modules/victron-mqtt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "victron-mqtt"; - version = "2026.5.0"; + version = "2026.5.4"; pyproject = true; src = fetchFromGitHub { owner = "tomer-w"; repo = "victron_mqtt"; tag = "v${finalAttrs.version}"; - hash = "sha256-0VGDGtuMs1Bw+98ddI0Gggxm1nWEWWn4Z/RbuTfzqoY="; + hash = "sha256-oiik7n2eT71v814N0LhebTNecT5FuZSObbwqmon6BZI="; }; build-system = [ diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix index 169aa0c75566..8a24fecbd8b6 100644 --- a/pkgs/development/python-modules/viser/default.nix +++ b/pkgs/development/python-modules/viser/default.nix @@ -1,13 +1,14 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, # nativeBuildInputs nodejs, - fetchYarnDeps, - yarnConfigHook, + fetchNpmDeps, + npmHooks, # build-system hatchling, @@ -15,79 +16,78 @@ # dependencies imageio, msgspec, - nodeenv, numpy, - opencv-python, - plyfile, - psutil, requests, rich, - scikit-image, - scipy, tqdm, trimesh, typing-extensions, websockets, yourdfpy, + zstandard, # optional-dependencies hypothesis, + liblzfse, + nodeenv, + opencv-python, + playwright, pre-commit, - pandas, + psutil, pyright, pytest, + pytest-playwright, + pytest-xdist, ruff, gdown, matplotlib, + pandas, plotly, - # pyliblzfse, + plyfile, robot-descriptions, torch, tyro, # nativeCheckInputs pytestCheckHook, + playwright-driver, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "viser"; - version = "1.0.20"; + version = "1.0.27"; pyproject = true; src = fetchFromGitHub { - owner = "nerfstudio-project"; + owner = "viser-project"; repo = "viser"; - tag = "v${version}"; - hash = "sha256-usnvEvuBNPrqRXV7jh0qw1ppmZgAe1CUhAwd/M5CvC0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qE9V6KjniKm3vBtf5ger6UHob4go0wTaJnmYtvYqvMc="; }; postPatch = '' - # prepare yarn offline cache + # prepare npm offline cache mkdir -p node_modules cd src/viser/client - cp package.json yarn.lock ../../.. + cp package.json package-lock.json ../../.. ln -s ../../../node_modules - - # fix: [vite-plugin-eslint] Failed to load config "react-app" to extend from. - substituteInPlace vite.config.mts --replace-fail \ - "eslint({ failOnError: false, failOnWarning: false })," "" - cd ../../.. ''; nativeBuildInputs = [ - yarnConfigHook + npmHooks.npmConfigHook nodejs ]; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/src/viser/client/yarn.lock"; - hash = "sha256-4x+zJIqjVoKmEdOUPGpCuMmlRBfF++3oWtbNYAvd2ko="; + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + src = finalAttrs.src + "/src/viser/client/"; + hash = "sha256-fAFN/JCUVSvRDGfq39E3V+dhqp1i6vFG/j8wKmOva4c="; }; preBuild = '' cd src/viser/client - yarn --offline build + npm --offline run build cd ../../.. ''; @@ -98,37 +98,39 @@ buildPythonPackage rec { dependencies = [ imageio msgspec - nodeenv numpy - opencv-python - plyfile - psutil requests rich - scikit-image - scipy tqdm trimesh typing-extensions websockets yourdfpy + zstandard ]; optional-dependencies = { dev = [ hypothesis + nodeenv + opencv-python + playwright pre-commit + psutil pyright pytest + pytest-playwright + pytest-xdist ruff ]; examples = [ gdown + liblzfse matplotlib + opencv-python pandas plotly plyfile - # pyliblzfse robot-descriptions torch tyro @@ -137,18 +139,42 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + playwright-driver pytestCheckHook ]; + # adding pre-commit here break PYTHONPATH in 3.14 + checkInputs = lib.filter (p: p.pname != "pre-commit") finalAttrs.passthru.optional-dependencies.dev; + + env = { + PLAYWRIGHT_BROWSERS_PATH = playwright-driver.browsers; + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = true; + PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true; + }; + + disabledTestPaths = [ + # too many flaky tests + "tests/e2e" + ]; + disabledTests = [ + # assert 0 != 0 + # (only when xdist) + "test_server_port_is_freed" + + # counts ffmpeg pids, can be confused when + # building multiple times this package in parallel + "test_process_termination" + ]; + pythonImportsCheck = [ "viser" ]; meta = { - changelog = "https://github.com/nerfstudio-project/viser/releases/tag/${src.tag}"; - description = "Web-based 3D visualization + Python"; - homepage = "https://github.com/nerfstudio-project/viser"; + changelog = "https://github.com/viser-project/viser/releases/tag/${finalAttrs.src.tag}"; + description = "Web-based 3D visualization in Python"; + homepage = "https://github.com/viser-project/viser"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nim65s ]; }; -} +}) diff --git a/pkgs/development/python-modules/warp-lang/dynamic-link.patch b/pkgs/development/python-modules/warp-lang/dynamic-link.patch index 70a65c3d5fba..a0e04e0900e7 100644 --- a/pkgs/development/python-modules/warp-lang/dynamic-link.patch +++ b/pkgs/development/python-modules/warp-lang/dynamic-link.patch @@ -1,11 +1,9 @@ -diff --git a/build_llvm.py b/build_llvm.py -index 1aa8631a..2304ce1f 100644 --- a/build_llvm.py +++ b/build_llvm.py -@@ -346,34 +346,24 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None: - - clang_dll_path = os.path.join(build_path, f"bin/{lib_name}") - +@@ -378,34 +378,24 @@ + + clang_dll_path = os.path.join(build_path, "bin", lib_name) + - if args.build_llvm: - # obtain Clang and LLVM libraries from the local build - install_path = os.path.join(llvm_install_path, f"{args.mode}-{arch}") @@ -13,7 +11,7 @@ index 1aa8631a..2304ce1f 100644 - else: - # obtain Clang and LLVM libraries from packman - fetch_prebuilt_libraries(arch) -- libpath = os.path.join(base_path, f"_build/host-deps/llvm-project/release-{arch}/lib") +- libpath = os.path.join(base_path, "_build", "host-deps", "llvm-project", f"release-{arch}", "lib") - - libs = [] - @@ -23,7 +21,7 @@ index 1aa8631a..2304ce1f 100644 + libs = ["LLVM", "clang-cpp"] + install_paths = ["@LLVM_LIB@", "@LIBCLANG_LIB@"] + libpaths = [os.path.join(install_path, "lib") for install_path in install_paths] - + if os.name == "nt": libs.append("Version.lib") libs.append("Ws2_32.lib") @@ -44,4 +42,3 @@ index 1aa8631a..2304ce1f 100644 libs.append("-lpthread") libs.append("-ldl") if sys.platform != "darwin": - diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 350d709f1ea8..2b21cc849073 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "weblate-language-data"; - version = "2026.7"; + version = "2026.8"; pyproject = true; src = fetchFromGitHub { owner = "WeblateOrg"; repo = "language-data"; tag = finalAttrs.version; - hash = "sha256-IKOvVYmB7SA82aMQWqYbwmh7xBg5szR/DvnPS6T0sts="; + hash = "sha256-7wNm6bu2L1/eF5D49wSYu1qfVC5Fl5MbaSbXO/az4F4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index f320e25f2d07..754ed5140a12 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -11,16 +11,16 @@ xarray, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xarray-einstats"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "arviz-devs"; repo = "xarray-einstats"; - tag = "v${version}"; - hash = "sha256-CgyMc2Yvut+1LfH9F2FAd62HuLu+58Xr50txbWj4mYU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-R/CbCaToW9U0+WqayE33gSyx5wKrhlZd7w4kjyxoxrk="; }; build-system = [ flit-core ]; @@ -36,7 +36,10 @@ buildPythonPackage rec { numba = [ numba ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "xarray_einstats" ]; @@ -48,7 +51,8 @@ buildPythonPackage rec { meta = { description = "Stats, linear algebra and einops for xarray"; homepage = "https://github.com/arviz-devs/xarray-einstats"; + changelog = "https://github.com/arviz-devs/xarray-einstats/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index c33050f281e0..b864acdbba0f 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -187,6 +187,9 @@ let ''; passthru.dist = finalAttrs.finalPackage + "/libexec/electron"; + + __structuredAttrs = true; + strictDeps = true; }; darwin = finalAttrs: { diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 315ec0c2a500..c323d404aaba 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,35 +12,46 @@ }, "39": { "hashes": { - "aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa", - "aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97", - "armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40", - "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0", - "x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d", - "x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33" + "aarch64-darwin": "f7e3ed2cc34dd2eba3f2a95234b576fe8082d35fb133e482102c08105f298572", + "aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247", + "armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc", + "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v", + "x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b", + "x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1" }, - "version": "39.8.9" + "version": "39.8.10" }, "40": { "hashes": { - "aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7", - "aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634", - "armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5", - "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p", - "x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0", - "x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8" + "aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5", + "aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63", + "armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681", + "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", + "x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04", + "x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667" }, - "version": "40.9.2" + "version": "40.10.0" }, "41": { "hashes": { - "aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0", - "aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a", - "armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c", - "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7", - "x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737", - "x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2" + "aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a", + "aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a", + "armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875", + "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", + "x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4", + "x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97" }, - "version": "41.3.0" + "version": "41.6.1" + }, + "42": { + "hashes": { + "aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117", + "aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d", + "armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a", + "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", + "x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f", + "x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9" + }, + "version": "42.1.0" } } diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index 02918284e028..1a1818235ee4 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -86,6 +86,9 @@ let install -m777 -D chromedriver $out/bin/chromedriver runHook postInstall ''; + + __structuredAttrs = true; + strictDeps = true; }; darwin = { diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6dd2fa8085d3..7b5806952ae5 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,35 +12,46 @@ }, "39": { "hashes": { - "aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf", - "aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3", - "armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6", - "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0", - "x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69", - "x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14" + "aarch64-darwin": "c21e261f8047a51c5a2e8d5ad19fc66d9f389c215bd2ada680c3ea39618f3f90", + "aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0", + "armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b", + "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v", + "x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c", + "x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33" }, - "version": "39.8.9" + "version": "39.8.10" }, "40": { "hashes": { - "aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528", - "aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107", - "armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4", - "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p", - "x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a", - "x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432" + "aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0", + "aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc", + "armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73", + "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", + "x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8", + "x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f" }, - "version": "40.9.2" + "version": "40.10.0" }, "41": { "hashes": { - "aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16", - "aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5", - "armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee", - "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7", - "x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9", - "x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f" + "aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0", + "aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885", + "armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0", + "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", + "x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7", + "x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c" }, - "version": "41.3.0" + "version": "41.6.1" + }, + "42": { + "hashes": { + "aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21", + "aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1", + "armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b", + "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", + "x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb", + "x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e" + }, + "version": "42.1.0" } } diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 7d8ca0b388de..da16e1b9bdde 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -11,6 +11,7 @@ npmHooks, yarn-berry_4, unzip, + writers, libnotify, libpulseaudio, @@ -68,10 +69,20 @@ in npmRoot = "third_party/node"; + missingHashes = + if (info.electron_yarn_data ? "missing_hashes") then + writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes + else + null; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { src = gclientDeps."src/electron".path; patches = [ yarnPatch ]; - hash = info.electron_yarn_hash; + hash = info.electron_yarn_data.hash; + missingHashes = + if (info.electron_yarn_data ? "missing_hashes") then + writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes + else + null; }; dontYarnBerryInstallDeps = true; # we'll run the hook manually diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 3760d3ce76c7..9361d5d4a449 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-y2aqNUsE8XmM+SoLThECL2J5b4NVydj0WAoy7t4AiJg=", + "hash": "sha256-7hMzrFN/W37fq4bNPk5910UHy/ItMkHol/SmK1Uip6c=", "owner": "electron", "repo": "electron", - "tag": "v39.8.9" + "tag": "v39.8.10" }, "fetcher": "fetchFromGitHub" }, @@ -1342,10 +1342,12 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-4wVNDVy8SMZgh3tTzytUveyBv0MwLlWpjwDgC/+WYVM=", + "electron_yarn_data": { + "hash": "sha256-ouqZAfaDG1wnKpwyCTF0H25HYd3Klftq7dQrOvSQiQA=" + }, "modules": "140", "node": "22.22.1", - "version": "39.8.9" + "version": "39.8.10" }, "40": { "chrome": "144.0.7559.236", @@ -1404,10 +1406,10 @@ }, "src/electron": { "args": { - "hash": "sha256-wTKT4XA0ylL5uUZWfp9XhxiGUkfXrtEzw3Pw+nGwr4w=", + "hash": "sha256-H4mLOoA2fdI5yF1qnXC1s1+BVO/ouxXOHh2ZzqJVAVc=", "owner": "electron", "repo": "electron", - "tag": "v40.9.2" + "tag": "v40.10.0" }, "fetcher": "fetchFromGitHub" }, @@ -1741,10 +1743,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-WJSNbXox5oT6WQXARbl9B+DcEaHrCpu96s5Pvq48bfE=", + "hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=", "owner": "nodejs", "repo": "node", - "tag": "v24.14.1" + "tag": "v24.15.0" }, "fetcher": "fetchFromGitHub" }, @@ -2690,13 +2692,55 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-HSLQS89ZdIxni51WDVvr19oDZyaG/PlPG8XfdvEDQhQ=", + "electron_yarn_data": { + "hash": "sha256-GPTl9cT6CLfwQx5u7egDiSCGG6hikRDinPuijp97dHE=", + "missing_hashes": { + "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", + "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", + "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ed0f486a5085942727e255a9c14bfd99756d4af3ad2c2e702bfb7ab682fc9041d5327f3e89dc4dbfc9a09a6c884dbc9a79a46c720435c5ad2f2fe3f48bb9c3ac", + "@oxfmt/binding-darwin-x64@npm:0.42.0": "b607e67171aa33717f7fe80d9d5c8ca816ff30dbbd2b41c4b129977c749c62a4bb1f6829aa95c564d15246c98689ba153fc003a09a1549e2f3316810b35463be", + "@oxfmt/binding-freebsd-x64@npm:0.42.0": "c038e53f42083a56d548bd2b89765d1b36150c874e83a41631dfa039fe4fd999475a4a5a99414e43fe44654abdbdfb78c17f53fb482ba3bdc9d22f5641931a41", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "79d0b84f3281c7935eb153a53b7032fbb159357580cbcac721096d87ceb124e40863c0b7786ff1b94ad2cdc9b1beabe37e972e1b959423af028e6dea0fc8e0b6", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "c67dfa0553ba44f0585c3bba85efcbbd42b63b59f177302693fa83cc7b6fe6a6f2509c972cae9b367eb7cd36e8578209657ac4928cf329bf816fa4bfc578d2c1", + "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "f8507b36f7f2673a4d6db227ed2e98f94d30f81275820d0d25e5e6b0b9b20c7f4cc32b646ae02aac0068b90ba3d47bcbd85ad789b27f028b8ea07e168ec731ce", + "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "c4d0406e36248b4a8ddd62ac2d7c1b6648d23fb2b1eee471e3965d6c411b2dedfc681d227adcff50bbff5f786727bef31420610564691887cdecb50d7f1f7587", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "12b0eb3cff0807f898dd2e47de5712c8b57d2373108135e87f1de69902204c0527b383753983388f32e48749c479ce0f6247fbc927a2e035b2fb1f6c31ae5df7", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "aff4c5104769388174a69f5f4ad418f33e86ff1286117072e2200b7217aa9d30375ffb4deeabd728aac7975ed5e79832ac725725df9ff2ea6f819aef5e166353", + "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "710b0b9fc2d999a66b2c9e656e40e74e71d820d8670d5ee64dc36d373f1132a0c3ddcbedba6130f832b9e8abbb0988ab95de7a6ddd4657007f05fea4a3631835", + "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "8fc8ee6c1ea3369d3f7ec2f6dbe3fe846663c8e10a0ea976b1b2e150117359580d7efc904f5da0ead2f59066b1e17076aa09c1c4f2544071c29b623ada15da70", + "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "d46d962752e0e2978cbd9b552a0d4bebde69fa9581512dfda33e7bc645c849e2787ef6a4e2ae825e7d2abf68b895c90c4a351387d2f0d2ba336e990c54e245f0", + "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "e757b0b12ccf6e7355e2a3123fa0bea0908e1f220b7bb3601c18203bc78f1157be8364af9df3ca56f9c0bb123aeecbf058df31a9ee12612e1149b9c6228dc6f9", + "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "fe85007d6e7e7c1b6662a9756267de459fc7213af9ddf6f0494397d9d666a452d4a1a6f6fe6ce288d8dd4763d07b52b4534cc177bdf0e5613559f144b78e8fbb", + "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "04bd529ea236c23d8dc73d95acd365612ab489b0e6a4bdd976302b933b92dcc11d4d1629e2294036f16c1e1f5120140547f65060a9e2dc8adbb21f790e2eca39", + "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "9775afa164de049416abf481f062b8c670cd27a70d82a0868fa61749f741e777a76eb0a57a9ef276f158a35741d90a856a492777a0a9f17c9ac01ead32935fe3", + "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "5c38197ac6f874c2622b68a531b9fc9a221de05aa09c40717bba775f658680ebf964db7aa41c12271f90261bf50713cd4ebb2c10f12bf33cf2103fb9d67a88bb", + "@oxlint/binding-android-arm-eabi@npm:1.62.0": "ca066c115156993090f95062fa734ebc241619587b9b29db8f63ef70835a55762a8839487d360e92aacf9aab1851546076b7abc90208f9a3671ba0883b09fbba", + "@oxlint/binding-android-arm64@npm:1.62.0": "4519779ba0454b083cfff6e6cf955fbb7ef33700ae63a5eb418a105311adcb6c227bffab2b22be38b742ddec6deaa2370ea27bc6e325876ce21cf12dacd7d6b6", + "@oxlint/binding-darwin-arm64@npm:1.62.0": "35df3bec6216822a5c511800541703d0ce7605a9517a34f73a5e59746bbcac3ee7ffb440888aaef5a68d566dd772469b74c66b79c7c413e097e9cd240e0a261f", + "@oxlint/binding-darwin-x64@npm:1.62.0": "9f0ccc7228a5a9b41e56281959847725a1287ff7f86670cf2c104c37ed79cbc408f3117d46358da62b95355b25a89704c5d00f9aca894a9e179315546993719c", + "@oxlint/binding-freebsd-x64@npm:1.62.0": "062402a1a4fb00abfde96433f54ac74dc1bdb84f1698d49b0de6711220c2da8853b2c74aebebdba0189c1e22547db928548b29b8aa38ec3a8d7523298be12d84", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.62.0": "584ca793611955a1952e7caa4aa16a8d00d535999daac5bffa4ead8f543b0a351da6b4c71c5e04f8a3c31d06d4f9a8b7c2762409d586549e5533acf989ce10df", + "@oxlint/binding-linux-arm-musleabihf@npm:1.62.0": "a82dc3aba571055bb67499d0235987b854ae5512779f415f7748e58d10dfa19799c777c1b316cbfdeae3f3c951bd4a584e52881c09b19d8aa050b097151b3788", + "@oxlint/binding-linux-arm64-gnu@npm:1.62.0": "d9ca6087f45ec1f3b259ab1127e5f9fd50df68954de8094a9fe6ac1a01d50beafbf015b71c16dad5509ab8919067693bdb0ac0dcd62f08f0afa7688b7178e565", + "@oxlint/binding-linux-arm64-musl@npm:1.62.0": "d1b64d5d0218125b0c71838ef7a51b88b81e9b3cf810aaf1100c6605bf5efbafe93d6728b880f1e9f4360af2e5019af249a781d7a39d7f905b3be51055981ddf", + "@oxlint/binding-linux-ppc64-gnu@npm:1.62.0": "d3e3043345012fb8892d3fcfc83b18c55c5a6f494ba5f5689108656ecee71c389df4e1ebac6ebad75357074cb9a23278281ef19d271b5517ff7e9b514db5e00d", + "@oxlint/binding-linux-riscv64-gnu@npm:1.62.0": "d969682bec86433e5b0a199fc3cdf6c25a2ff3355ea1e123e9476612a2560d1f69ef81e0911e616f75ed6024f9e6394f970876c791eab438c7bcbf5f834c9c89", + "@oxlint/binding-linux-riscv64-musl@npm:1.62.0": "45aa7bc86e51cb61c8519be2ce4a8bf92d6d9e92dde07c0b31655d0b317c5198ff95e0454467a9b6edbe730d72343cdb4cb8293db2c6234dd43af95038e86b4d", + "@oxlint/binding-linux-s390x-gnu@npm:1.62.0": "60e79cbfe33de0eecee4ace00502224c5e92fc3f2db385c291d5c256efe2e3222599172e907567505e08a46a11242b1ccffa7afb3945f1266bcfb1e23d4dcb61", + "@oxlint/binding-linux-x64-gnu@npm:1.62.0": "31bbec2b606af01f990b6b53c8878090d8fe8ec9c27642276217c2ead3b3f3c06e9ce1934180de0c1b6a1a7e8b2106862f6f74e7e5eca7303f7aa5441168469e", + "@oxlint/binding-linux-x64-musl@npm:1.62.0": "9c7095d2a94920d943a3023f5f186f040329fffa0dc9320b9c2b3fa5c18e16473b5ef93e69e68692f4721112ba45e6a27887f4f9d3a82cfc23cfa5716b79776c", + "@oxlint/binding-openharmony-arm64@npm:1.62.0": "1cd0b8e6148685f74f261410b55abd9443b39938f69a42d770da61c08864af96d1251c6ff90d07625466b7dc1997ed25956a8924f49ac1b29ab0ed776f8d74cc", + "@oxlint/binding-win32-arm64-msvc@npm:1.62.0": "b8598eefbede42c7c8327e3d3d5e13cf85a0e4c1d261b6f30ce72533e1156eee12c7e5723a2e2fedda8c485fffab12c452b8ac7edc42557615449fbdc6872753", + "@oxlint/binding-win32-ia32-msvc@npm:1.62.0": "14276c38660c8920bc8dc2afd231c4a722d682b4a8e8230879441b4fb4714ff72a0adebf6be8d3bcbc2e92b3da6e737d60d9a8c9dd35b076a78dc78598b209a2", + "@oxlint/binding-win32-x64-msvc@npm:1.62.0": "07f46eb801dda09aaa911fdbb09a1676bb954ab5e183b34bf61c51281fc697c37ef9912cb99d9f79e8053e98d31661e6a312719231841eb7a3bc6e037b4674a4" + } + }, "modules": "143", - "node": "24.14.1", - "version": "40.9.2" + "node": "24.15.0", + "version": "40.10.0" }, "41": { - "chrome": "146.0.7680.188", + "chrome": "146.0.7680.216", "chromium": { "deps": { "gn": { @@ -2705,15 +2749,15 @@ "version": "0-unstable-2026-02-05" } }, - "version": "146.0.7680.188" + "version": "146.0.7680.216" }, "chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=", "deps": { "src": { "args": { - "hash": "sha256-EKShXS1zF3TWCNLj8gCxjXlr80rA99QGM9ip28kgQH0=", + "hash": "sha256-US3KELmSThwFAYS73Wh8w/6F5JjjE3/QnJ32axIoS1U=", "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "146.0.7680.188", + "tag": "146.0.7680.216", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2752,10 +2796,10 @@ }, "src/electron": { "args": { - "hash": "sha256-x3XSMSq1GuSTwQuOqbg9hCaMCoKx8UPGMDtJu5y1qfA=", + "hash": "sha256-0i3h/60XFgtX3/uJ5wI36o1EU0nKn0HawXBzv8RJuKs=", "owner": "electron", "repo": "electron", - "tag": "v41.3.0" + "tag": "v41.6.1" }, "fetcher": "fetchFromGitHub" }, @@ -2785,8 +2829,8 @@ }, "src/third_party/angle": { "args": { - "hash": "sha256-u/2B+93xg1sMlg+R9zjAFXpyjgLCyzB7JY4bjLafFFE=", - "rev": "d1100603964278cd89c5eb94707fbca242c788bf", + "hash": "sha256-W820GLtq3Nyw75kNRXwZZNVQjKgT9TzCXA2zU2q2QeM=", + "rev": "f27a667c64ebf41644efa31e66c52dce26824a4f", "url": "https://chromium.googlesource.com/angle/angle.git" }, "fetcher": "fetchFromGitiles" @@ -2977,8 +3021,8 @@ }, "src/third_party/dawn": { "args": { - "hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU=", - "rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5", + "hash": "sha256-Tjc7KNI4gqYgE7jg/pE2H4BpE00LQD4bgrw7pRm/ssI=", + "rev": "a94afcc3f32ac522df1383bb80b78680c7b1de70", "url": "https://dawn.googlesource.com/dawn.git" }, "fetcher": "fetchFromGitiles" @@ -3347,8 +3391,8 @@ }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=", - "rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce", + "hash": "sha256-SkaXi8kd2WlwE/t+Mb9n60SWiUhQksJsSW/x/mgmMco=", + "rev": "b5d2fb00c10392da233017c223b1a5662bc7bb0c", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" @@ -3467,8 +3511,8 @@ }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-/FtYzbcOgOlaaWCoJfYns5oye7DoRZx1/xew3lN7tAM=", - "rev": "e83e25f791932202256479052f18bdd03a091147", + "hash": "sha256-XxoaxHT0UjHY2M5YriB0iERQYdSAOA4lCiBxctmU1H4=", + "rev": "d45dc9655773862fbdaef40c449b919e815ac878", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" @@ -3628,8 +3672,8 @@ }, "src/third_party/pdfium": { "args": { - "hash": "sha256-/reVJqqKSGUX1INmwOPQabPodYwlbhlxTIO0pAlnJnY=", - "rev": "9e6326d6112c90f525c5f85cd7e39318bc705317", + "hash": "sha256-H2YIwVZByH1rsSScgEnzcRtHLwxfEBr00tgMBHX5yiM=", + "rev": "436c484cff819ca5c12374a6c4896127f8bcf27e", "url": "https://pdfium.googlesource.com/pdfium.git" }, "fetcher": "fetchFromGitiles" @@ -3724,8 +3768,8 @@ }, "src/third_party/skia": { "args": { - "hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM=", - "rev": "30d129c8800b5626c46fb83fa62db10b9b22b319", + "hash": "sha256-Nj7Hgzdf0DCNsQAjGyiq1+lvDd9J78M5N1jdL1wa9HU=", + "rev": "ef5f213b0436c53fdf59184d9536eb5ee5aa8084", "url": "https://skia.googlesource.com/skia.git" }, "fetcher": "fetchFromGitiles" @@ -3999,8 +4043,8 @@ }, "src/third_party/webrtc": { "args": { - "hash": "sha256-2yynA/qNvjP6KN2jShDuwnaSMJ1xRduWP4xsbODPDOE=", - "rev": "70d86bbfaeeadffb1193c2aad245edd23ef251ef", + "hash": "sha256-m+ylEOjCbCdlQ9+6lEaFSUXig3x2kWFa8PNdOADRVEU=", + "rev": "2964e45d0fc4552b6ffe8789061f8fd2a96dca38", "url": "https://webrtc.googlesource.com/src.git" }, "fetcher": "fetchFromGitiles" @@ -4047,16 +4091,1472 @@ }, "src/v8": { "args": { - "hash": "sha256-NFz9p4EWq46Tm+Y/hBXk4Vb0Ljy/s1BTbuiMH351IJs=", - "rev": "f09a91282a26caa91d016c962d785d852cfdec36", + "hash": "sha256-SRHjAvmBRo9SMgShF3Ma+1HcIBdWL+JKQk4QTjL+vp8=", + "rev": "f9116f3bf9a50b0f7925daacfdc6fed503a9dbe2", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "sha256-i9/E2hO0vq5kbDwFLvaVl7OoixGpHxBQ6sMiHgnWYuA=", + "electron_yarn_data": { + "hash": "sha256-Ry8gzsdaR61djEgF+MpXAYGK00lRD5ZLq3cLUV1prFs=", + "missing_hashes": { + "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", + "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", + "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ed0f486a5085942727e255a9c14bfd99756d4af3ad2c2e702bfb7ab682fc9041d5327f3e89dc4dbfc9a09a6c884dbc9a79a46c720435c5ad2f2fe3f48bb9c3ac", + "@oxfmt/binding-darwin-x64@npm:0.42.0": "b607e67171aa33717f7fe80d9d5c8ca816ff30dbbd2b41c4b129977c749c62a4bb1f6829aa95c564d15246c98689ba153fc003a09a1549e2f3316810b35463be", + "@oxfmt/binding-freebsd-x64@npm:0.42.0": "c038e53f42083a56d548bd2b89765d1b36150c874e83a41631dfa039fe4fd999475a4a5a99414e43fe44654abdbdfb78c17f53fb482ba3bdc9d22f5641931a41", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "79d0b84f3281c7935eb153a53b7032fbb159357580cbcac721096d87ceb124e40863c0b7786ff1b94ad2cdc9b1beabe37e972e1b959423af028e6dea0fc8e0b6", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "c67dfa0553ba44f0585c3bba85efcbbd42b63b59f177302693fa83cc7b6fe6a6f2509c972cae9b367eb7cd36e8578209657ac4928cf329bf816fa4bfc578d2c1", + "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "f8507b36f7f2673a4d6db227ed2e98f94d30f81275820d0d25e5e6b0b9b20c7f4cc32b646ae02aac0068b90ba3d47bcbd85ad789b27f028b8ea07e168ec731ce", + "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "c4d0406e36248b4a8ddd62ac2d7c1b6648d23fb2b1eee471e3965d6c411b2dedfc681d227adcff50bbff5f786727bef31420610564691887cdecb50d7f1f7587", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "12b0eb3cff0807f898dd2e47de5712c8b57d2373108135e87f1de69902204c0527b383753983388f32e48749c479ce0f6247fbc927a2e035b2fb1f6c31ae5df7", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "aff4c5104769388174a69f5f4ad418f33e86ff1286117072e2200b7217aa9d30375ffb4deeabd728aac7975ed5e79832ac725725df9ff2ea6f819aef5e166353", + "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "710b0b9fc2d999a66b2c9e656e40e74e71d820d8670d5ee64dc36d373f1132a0c3ddcbedba6130f832b9e8abbb0988ab95de7a6ddd4657007f05fea4a3631835", + "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "8fc8ee6c1ea3369d3f7ec2f6dbe3fe846663c8e10a0ea976b1b2e150117359580d7efc904f5da0ead2f59066b1e17076aa09c1c4f2544071c29b623ada15da70", + "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "d46d962752e0e2978cbd9b552a0d4bebde69fa9581512dfda33e7bc645c849e2787ef6a4e2ae825e7d2abf68b895c90c4a351387d2f0d2ba336e990c54e245f0", + "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "e757b0b12ccf6e7355e2a3123fa0bea0908e1f220b7bb3601c18203bc78f1157be8364af9df3ca56f9c0bb123aeecbf058df31a9ee12612e1149b9c6228dc6f9", + "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "fe85007d6e7e7c1b6662a9756267de459fc7213af9ddf6f0494397d9d666a452d4a1a6f6fe6ce288d8dd4763d07b52b4534cc177bdf0e5613559f144b78e8fbb", + "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "04bd529ea236c23d8dc73d95acd365612ab489b0e6a4bdd976302b933b92dcc11d4d1629e2294036f16c1e1f5120140547f65060a9e2dc8adbb21f790e2eca39", + "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "9775afa164de049416abf481f062b8c670cd27a70d82a0868fa61749f741e777a76eb0a57a9ef276f158a35741d90a856a492777a0a9f17c9ac01ead32935fe3", + "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "5c38197ac6f874c2622b68a531b9fc9a221de05aa09c40717bba775f658680ebf964db7aa41c12271f90261bf50713cd4ebb2c10f12bf33cf2103fb9d67a88bb", + "@oxlint/binding-android-arm-eabi@npm:1.61.0": "64a0e4e724ec776f7bf88926b9544484ac4b8b7c906539073683281d0de4d887494aabad654807336f8c306cbc2bbd2cbf218c780fa02ce7b8cd2c9c280a886c", + "@oxlint/binding-android-arm64@npm:1.61.0": "fcbef757ed0eecbddb90e3818315614dbd4bdba7f9e8aa23255d39d12dd2ee5cd1bc5608f2d236b3028330bad7ba741e7dc3569d06373dabade10bcafb056de7", + "@oxlint/binding-darwin-arm64@npm:1.61.0": "1ff458a5cde78b3b3f7852dad86ef6e430732361b81e5ac5712f83a237725bde05d67980beced4361416abb376dc6a6384435f2a4932a62c5794a58ca01b9d73", + "@oxlint/binding-darwin-x64@npm:1.61.0": "3e09d59d46985c2652ee3fa3560215df05eebf470f2acd3fb502d303f661e3d75861a8908a1b215e3912e5da23673cc517862e06be21be6c95770fc5848778ef", + "@oxlint/binding-freebsd-x64@npm:1.61.0": "8f7141e3a7a0334836ea9f333d76fb6a12e145533cda2f485fff536b725193595a172c154b402d0eff3b14e13a36b3a0a14629987bcbf8faa444d9213c5e78d8", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.61.0": "2bf2eb6e1e6a3339822464e7f66f52824348ea5b4b0a2f87ed5fdfe6b7b993bb2ea0346e59dc68ec78030a3c4b8784810a2bb88edb69de99aacdda03606a35cf", + "@oxlint/binding-linux-arm-musleabihf@npm:1.61.0": "53d57e4693087ddd6e9104651f3200d11276aa8bf261ffe07c91908b7ba6dee0aaa58d74f3b58ad256b8dfb4689fee0e205d9479550b87a898644396afb1de55", + "@oxlint/binding-linux-arm64-gnu@npm:1.61.0": "b19d95033889b7a22e29b6b38a84c913f5e087015354de8ea52e60e8d067ecdbcedcecd49df2d3338e1ce5d579e079efaa43ee67ca626e92b619d41aa18277ae", + "@oxlint/binding-linux-arm64-musl@npm:1.61.0": "b61ede290d57073065e20161ae54d36d4700a814e6e62abc63e8e4f18558598e22695fcb9b14c67ce8aec50de2b733d6183f873d65de491936fbf7e1b9fbb59e", + "@oxlint/binding-linux-ppc64-gnu@npm:1.61.0": "7d0cb33713ce1716a0ddbc100b79eb888ad20af74c0c924db01b0b27c33677717f3f7a0f6d341ec0637ab0ec2dbc5033fea4154cf88b6c9513b1796b6a53ddf3", + "@oxlint/binding-linux-riscv64-gnu@npm:1.61.0": "a6c8ad8419110bbfc35f12256058fb0c31816f328a089bd6424ba03d582ebaed71f39ce673f77767dd17e2a4ed021789106a580d99e5f0a1f097ab3cf916f7a8", + "@oxlint/binding-linux-riscv64-musl@npm:1.61.0": "64e6073f588b995f509dccb6b66060a1cfeb5cea08613edf1a3f7819992ccce3a3f9539cd2b1962231a472f12c4ffa325600bbcc9279ada400b993488989470e", + "@oxlint/binding-linux-s390x-gnu@npm:1.61.0": "93b84e9694a451b023a2fbf2ca3cad533b5ea947bd89f6a8b95433cf12b6bb86bdbceb51188a5a5914a51a9e0ecca02abc6b0d656ce9616d8904eb8ebbaf84a8", + "@oxlint/binding-linux-x64-gnu@npm:1.61.0": "49d0ba0286946d633d933e2ae575a38dfef9f6570380d141f2bcdf10b09cba192a87767e5fd6cbeb115c23eae9c7241830c022180ada5bc96131badcc65c3d31", + "@oxlint/binding-linux-x64-musl@npm:1.61.0": "54567fcd74360d287a85ff18ce82c2691c0fea7f87e720f0390a621acf2422f64cafd135deebf329831fcac7cfe66389c8e6a5dcb8f8427ea6d4b3446ddeeab0", + "@oxlint/binding-openharmony-arm64@npm:1.61.0": "011ffbfde581da50b130705d59e0a043b4e6858dea1fc6fd100c7a2aa511179726769197a6868809a7040a28f454c0481a832c667b44b10820c0300b74a0b6f7", + "@oxlint/binding-win32-arm64-msvc@npm:1.61.0": "d5f962f94acfb6a882b04eb9ba33e05e2896b96cb6ab7b44c70aff55be93c633c6c88884d4f3f65f82ab88b6535c6034f4e9a7141bcfff23ad24efd0cb7bab78", + "@oxlint/binding-win32-ia32-msvc@npm:1.61.0": "f2902478c85eb95665cf3c4021cc4cdd3ea98f8863d9a311a6f2532059d1c8cc3c36c9e0eac7b459827cd03c4c7e6803bb96939d7476f3289df9362aaadd4710", + "@oxlint/binding-win32-x64-msvc@npm:1.61.0": "e4a5cf6c8db10fdf1cda748ab368357260e1fcab8df5819587b940613f55e57a729e99641119ff074d5aea59de16f4563322e01be5ac27d1349c9ca14d60302d" + } + }, "modules": "145", "node": "24.15.0", - "version": "41.3.0" + "version": "41.6.1" + }, + "42": { + "chrome": "148.0.7778.97", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=", + "rev": "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a", + "version": "0-unstable-2026-04-01" + } + }, + "version": "148.0.7778.97" + }, + "chromium_npm_hash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8=", + "deps": { + "src": { + "args": { + "hash": "sha256-nr/bMzJ+4b7/WeT3yG6rddGHvBi51ZzDTdQLIvJYBtg=", + "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "tag": "148.0.7778.97", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/perf/canvas_bench": { + "args": { + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "args": { + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/xr/webvr_info": { + "args": { + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/docs/website": { + "args": { + "hash": "sha256-Trkan7bzRaLFlTkRfNGh7ssoZ3QpMh+mxQacsSM+d2I=", + "rev": "44319eca109f9678595924a90547c1f6650d8664", + "url": "https://chromium.googlesource.com/website.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/electron": { + "args": { + "hash": "sha256-QVWPIw2G5ai9dCLZ6K1ZuJKydMFexA17X1gtB3XeXKc=", + "owner": "electron", + "repo": "electron", + "tag": "v42.1.0" + }, + "fetcher": "fetchFromGitHub" + }, + "src/media/cdm/api": { + "args": { + "hash": "sha256-GsaRxLnsz1jrFZ3m5tv65d1dioG23uJnmfa+WD7XcFc=", + "rev": "33c977516b3dfe5b065bc298aa74175e1999ab51", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/net/third_party/quiche/src": { + "args": { + "hash": "sha256-yKMmfdSBvbB3T042TJbZ1Mw+y0kyfHP0knQVFWAFPTg=", + "rev": "21ffbe4c7b717d00d2d768c259b5b330fd754ac3", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "args": { + "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=", + "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle": { + "args": { + "hash": "sha256-3KVTEBcnQTn99ccdKzylzUvua2jlS4g8/nfIDdLk6ug=", + "rev": "cc0e3572e8789f4a184dd9714a04b3d98ae81015", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "args": { + "hash": "sha256-3jx4QVR9nB3WggfrORGJGifmJQhAYVSPusa7RlR16qg=", + "rev": "f52e89f885064b9109501bca16c813bb29389993", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/glmark2/src": { + "args": { + "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=", + "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "args": { + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/anonymous_tokens/src": { + "args": { + "hash": "sha256-eJP45x3vXOG1rWvRl/0H0c2IV7nQ/9dYjAzJGHHszdc=", + "rev": "fdff40da0398d2c229308aed169345f6ff1a150f", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/boringssl/src": { + "args": { + "hash": "sha256-fZc95YrREDbf0YcO6zahIjdX6TcRJANcH9MrkLIIIHw=", + "rev": "d8be2b4a71155bf82da092ef543176351eeb59ff", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/breakpad/breakpad": { + "args": { + "hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA=", + "rev": "8be0e3114685fcc1589561067282edf75ea1259a", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cast_core/public/src": { + "args": { + "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=", + "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/catapult": { + "args": { + "hash": "sha256-aHlf8gw3KxbKoyyajP4w586iYybx7HSkcKtLcZIgiDE=", + "rev": "4f1d71f6841d210b3a06ab3ef2e2ed679af0ee56", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/catapult/third_party/webpagereplay": { + "args": { + "hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0=", + "rev": "be48b5e3387780790ecc7723434b6ea6733bcc33", + "url": "https://chromium.googlesource.com/webpagereplay.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-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc=", + "rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cld_3/src": { + "args": { + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.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/compiler-rt/src": { + "args": { + "hash": "sha256-q6syHriTR8TCQSqTWbbAkVVK0a/i4wojdEGN7sWGxUY=", + "rev": "76287b5da8e155135536c8e3a67432d97d74fe3a", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/content_analysis_sdk/src": { + "args": { + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cpu_features/src": { + "args": { + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cpuinfo/src": { + "args": { + "hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=", + "rev": "7607ca500436b37ad23fb8d18614bec7796b68a7", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crabbyavif/src": { + "args": { + "hash": "sha256-x1MRNtGLmwlRNenoQKz2Bgm3J5eHlNiJZtzhT9lttmk=", + "rev": "7466a44ac80893803d4a7168b98dc6cd02d1fe2d", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.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/cros-components/src": { + "args": { + "hash": "sha256-7wx73HZ6aqXQvLxwX6XnJAPefi/t47gIhvDH3FRT1j4=", + "rev": "fb512780dcc5ba4b5be9e8a3118919002077c760", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cros_system_api": { + "args": { + "hash": "sha256-a/mAa1+if6B1FHe9crO8PDpc3o8M+CeIuXjXT0lwZOY=", + "rev": "c27a09148de373889e5d2bf616c4e85a68050ae2", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crossbench": { + "args": { + "hash": "sha256-Hxazf58z9imnGO1aj2NRtsQ+BYrfAuIuZscADpr1NVI=", + "rev": "c179f7919aade97c5cff64d14b9171736e7aaef9", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crossbench-web-tests": { + "args": { + "hash": "sha256-7vCQw91L2c97dnVdrJ53zL8hi0KZffDJJjk7GaG3b/U=", + "rev": "b19e4e52c33fb8a105c3fc99598b0b9b4bc59752", + "url": "https://chromium.googlesource.com/chromium/web-tests.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dav1d/libdav1d": { + "args": { + "hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII=", + "rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn": { + "args": { + "hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8=", + "rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/EGL-Registry/src": { + "args": { + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/OpenGL-Registry/src": { + "args": { + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/directx-headers/src": { + "args": { + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/dxc": { + "args": { + "hash": "sha256-z+yIuVweIyLdOiZDRfSppjTRoYq8S93+JNUla4Umot8=", + "rev": "eb67a9085c758516d940e1ce3fed0acfb6518209", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/dxheaders": { + "args": { + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/glfw3/src": { + "args": { + "hash": "sha256-4QSD1/uxWfYZPMjShB0h639eqAfuBRXAVfOm6BbZCBs=", + "rev": "043378876a67b092f5d0d3d9748660121a336dd3", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "args": { + "hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU=", + "rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/webgpu-headers/src": { + "args": { + "hash": "sha256-yE3/mfhqc7YtVNg4f/nrUpuRUGRjOzdwl++vPvd+mvc=", + "rev": "7d3186c3dd2c708703524027b46b8703534ab3cc", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/depot_tools": { + "args": { + "hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM=", + "rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/devtools-frontend/src": { + "args": { + "hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8=", + "rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dom_distiller_js/dist": { + "args": { + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/domato/src": { + "args": { + "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", + "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", + "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dragonbox/src": { + "args": { + "hash": "sha256-j6swuGgYGfiFcK3iqd4EKTeU92rZHKTbF5T1fcak/ko=", + "rev": "beeeef91cf6fef89a4d4ba5e95d47ca64ccb3a44", + "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/eigen3/src": { + "args": { + "hash": "sha256-9AHpSqemqdwXoMiP3hH1YuEd3+nrudeVGTpInw+8BU4=", + "rev": "a3074053a614df7a3896cb4edbcba40222a5f549", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/electron_node": { + "args": { + "hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=", + "owner": "nodejs", + "repo": "node", + "tag": "v24.15.0" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/emoji-segmenter/src": { + "args": { + "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=", + "rev": "955936be8b391e00835257059607d7c5b72ce744", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/engflow-reclient-configs": { + "args": { + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/expat/src": { + "args": { + "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc=", + "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/farmhash/src": { + "args": { + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fast_float/src": { + "args": { + "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=", + "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4", + "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/federated_compute/src": { + "args": { + "hash": "sha256-Cp0WQBbqWvPdrKCMQhH4Z6zl6YlIPLjafWZEwdkYWlc=", + "rev": "eb170f645b270c7979edb863fd2cf8edab2b2fd1", + "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ffmpeg": { + "args": { + "hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs=", + "rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/flac": { + "args": { + "hash": "sha256-LZFAJf8mF14XvXYvvBoLHGied2P7o23LUxszDpZLe8E=", + "rev": "e7108e2ed031547c3759217819a032065c820d73", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/flatbuffers/src": { + "args": { + "hash": "sha256-gV1hn1iHI7knFEXy3Oii97mLRZYJUBiBlTh6/sqOoXg=", + "rev": "a86afae9399bbe631d1ea0783f8816e780e236cc", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fontconfig/src": { + "args": { + "hash": "sha256-Oo4ewK86dbEkO5EXyGWvdmsPHa8Wk1BHQah784vIem0=", + "rev": "d62c2ab268d1679335daa8fb0ea6970f35224a76", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fp16/src": { + "args": { + "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=", + "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/freetype/src": { + "args": { + "hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=", + "rev": "99b479dc34728936b006679a31e12b8cf432fc55", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fuzztest/src": { + "args": { + "hash": "sha256-Pvz+CWTBcWE0N0yfNGZhXDgUrGeIaCNfEjP1jYmF6G0=", + "rev": "800c545cf9d6e9c01328a1974f93a7e6564a74fd", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fxdiv/src": { + "args": { + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/gemmlowp/src": { + "args": { + "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=", + "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/glslang/src": { + "args": { + "hash": "sha256-vSbMdTjlRVvYLi5ZvTVmfe76oAQ4AhqyD+ohvkvIYIs=", + "rev": "715c8500e7cd67f2eba9e60e98852a1ed49d2f15", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/google_benchmark/src": { + "args": { + "hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA=", + "rev": "188e8278990a9069ffc84441cb5a024fd0bede37", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/googletest/src": { + "args": { + "hash": "sha256-gJhv3DQQSP5BQ6GmDobq42/Gkx4AbOg/ZS80bM0WpEw=", + "rev": "4fe3307fb2d9f86d19777c7eb0e4809e9694dde7", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/harfbuzz/src": { + "args": { + "hash": "sha256-/RT2OPWFiVwFqmNS4o+gE0JrcVO1cQDkCkgrSEe7BzE=", + "rev": "4fc96139259ebc35f40118e0382ac8037d928e5c", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/highway/src": { + "args": { + "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI=", + "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/hunspell_dictionaries": { + "args": { + "hash": "sha256-mYDPXa64IOKLMNiBiMqDrQMR7gDPI+vdyVc+M7E+ddc=", + "rev": "cccf64a8acc951afe3f47fee023908e55699bc58", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/icu": { + "args": { + "hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE=", + "rev": "ff7995a708a10ab44db101358083c7f74752da9f", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ink/src": { + "args": { + "hash": "sha256-uDaK/cDA52Cn+ioPW2bXAJze1eW8TK3xF7+bl/Ylh6Y=", + "rev": "9d5367423281a8fcf5bc1c418e20477a992b270a", + "url": "https://chromium.googlesource.com/external/github.com/google/ink.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ink_stroke_modeler/src": { + "args": { + "hash": "sha256-W5HgVe0v9O/EuhpKMHp83PLq4p6cuBul3QUGLYdF6rY=", + "rev": "da42d439389c90ec7574f0381ec53e7f5be0c2eb", + "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/instrumented_libs": { + "args": { + "hash": "sha256-5cb9qhSEzb941pF5HH0Br+x9wEH7MiGwQttvErb2mZo=", + "rev": "e8cb570a9a2ee9128e2214c73417ad2a3c47780b", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jetstream/main": { + "args": { + "hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8=", + "rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jetstream/v2.2": { + "args": { + "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=", + "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.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/leveldatabase/src": { + "args": { + "hash": "sha256-a1fcVI9Vsm1qE17Fnx5UxwOy4ZFMMJ0OKwNs/gZHYQI=", + "rev": "7ee830d02b623e8ffe0b95d59a74db1e58da04c5", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libFuzzer/src": { + "args": { + "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=", + "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libaddressinput/src": { + "args": { + "hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4=", + "rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libaom/source/libaom": { + "args": { + "hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE=", + "rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++/src": { + "args": { + "hash": "sha256-7O/X2JW8ghkPTjmFZmT9cgG3Ui5zk3gUb436KlPww34=", + "rev": "7ab65651aed6802d2599dcb7a73b1f82d5179d05", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++abi/src": { + "args": { + "hash": "sha256-L5CUvhpOLS+NBNGssCv0pY9rsDFuAI0LlPjXQRfy62A=", + "rev": "8f11bb1d4438d0239d0dfc1bd9456a9f31629dda", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libdrm/src": { + "args": { + "hash": "sha256-kOaTjBeo4IsfWEk/JBTNId5ikrnpoc9DEjIl7DUd2yE=", + "rev": "369990d9660a387f618d0eedc341eb285016243b", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libgav1/src": { + "args": { + "hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo=", + "rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libipp/libipp": { + "args": { + "hash": "sha256-GzLVt6RIN+FgOpcK61ya5lvdIIhQRciAb/ISIirWogY=", + "rev": "4be5f77f672a3a9f1bbf3c935fb0ea8b3f86ce61", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libjpeg_turbo": { + "args": { + "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=", + "rev": "d1f5f2393e0d51f840207342ae86e55a86443288", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/liblouis/src": { + "args": { + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libpfm4/src": { + "args": { + "hash": "sha256-t4LMG38GksMEM5DktyJ0qLUX1biXErQ57MaMtd7hoeo=", + "rev": "977a25bb3dfe45f653a6cee71ffaae9a92fc3095", + "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libphonenumber/dist": { + "args": { + "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=", + "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libprotobuf-mutator/src": { + "args": { + "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=", + "rev": "7bf98f78a30b067e22420ff699348f084f802e12", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libsrtp": { + "args": { + "hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I=", + "rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libsync/src": { + "args": { + "hash": "sha256-aI7Exie3AmTy8R/Ua5lua0lCwMO1k4wMS6cxulU6iD8=", + "rev": "d29ac04dc81e6b072c091c5b1342a282765ea250", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libunwind/src": { + "args": { + "hash": "sha256-JW4kqpVTCFDN4WZE2S5gEkX1O7eDycl+adm3KGlUoTU=", + "rev": "6ca46ff28e3578c57cbead6f233969eb3dabc176", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libva-fake-driver/src": { + "args": { + "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=", + "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194", + "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libvpx/source/libvpx": { + "args": { + "hash": "sha256-RyYnkLYafiS6kQKeOmzohtxFRXudDzgEmQkG+qKHozc=", + "rev": "47ac1ec7f3de7d7cb3d070844c427c8f1fa9d6fc", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libwebm/source": { + "args": { + "hash": "sha256-Lzfs15Us8MDDQYvLRVf6xKg9A76aXPnTukx/A8Mf7rw=", + "rev": "b7a1e4767fbb02ad467f45ba378e858e897028da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libwebp/src": { + "args": { + "hash": "sha256-a7F97BEnwpdx9W8OsVnz+NfIYW+J1XVDSi38KsIZIfI=", + "rev": "c00d83f6642e7838a12bb03bca94237f03cc2e00", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libyuv": { + "args": { + "hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98=", + "rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/litert/src": { + "args": { + "hash": "sha256-rcEPZNSV0DiDrmoBCtJ07wFzzpmpM93jG4jYaEdNWvI=", + "rev": "588075c77c6895cce6397d41d2890b1aa0a14372", + "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/llvm-libc/src": { + "args": { + "hash": "sha256-OWe2lAT5XbADWuxHgg53lZiU0My/ys86FEXvn4zlVx0=", + "rev": "2a826f2fda3cf8d75b47cbc3bb1d9b244f13a6ab", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/lss": { + "args": { + "hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo=", + "rev": "29164a80da4d41134950d76d55199ea33fbb9613", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/material_color_utilities/src": { + "args": { + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/minigbm/src": { + "args": { + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nan": { + "args": { + "hash": "sha256-Tq6whJBeGlJhF7/ctFOEgb1W12Tu/HGNTC5ujQtk+Qk=", + "owner": "nodejs", + "repo": "nan", + "rev": "675cefebca42410733da8a454c8d9391fcebfbc2" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/nasm": { + "args": { + "hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8=", + "rev": "45252858722aad12e545819b2d0f370eb865431b", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nearby/src": { + "args": { + "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA=", + "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/neon_2_sse/src": { + "args": { + "hash": "sha256-4OzG4wIPwnKbFD9LG+stxHt5O4qB85ZIXVeSrNqDAyM=", + "rev": "662a85912e8f86ec808f9b15ce77f8715ba53316", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nlohmann_json/src": { + "args": { + "hash": "sha256-t+ygFLws+E4D0Avia7swt4wruaDFaAT6shN6tl92q8k=", + "rev": "75d9166a68355d2cd5a98bfd1a75a3a3dae8f071", + "url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/oak/src": { + "args": { + "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8=", + "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa", + "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openh264/src": { + "args": { + "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=", + "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src": { + "args": { + "hash": "sha256-hRDFnoqAH4HoWZ3oTWlzNge2nwlxpUC/GEq0MQVzBw8=", + "rev": "448a19d1f24e0f8ce85ad0c1c6a50cf370ae69d7", + "url": "https://chromium.googlesource.com/openscreen" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src/buildtools": { + "args": { + "hash": "sha256-sWkgWY2rXVQK83WBVaZxCupQsS/8BtlgagNBQywScPE=", + "rev": "eca5f0685c48ed59ff06077cb18cee00934249dd", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "args": { + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ots/src": { + "args": { + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pdfium": { + "args": { + "hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U=", + "rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/perfetto": { + "args": { + "hash": "sha256-jVih4xWota4SZQi4yEtaIP+4qgD03OsELt2aaulIXik=", + "rev": "46432bb2a7a60e10fcee516f1692e6846d098a8d", + "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/protobuf-javascript/src": { + "args": { + "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=", + "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pthreadpool/src": { + "args": { + "hash": "sha256-Es9QNblzo5b+x4K7myQJwIiUKvqyP16QExWPhGqqDO8=", + "rev": "9003ee6c137cea3b94161bd5c614fb43be523ee1", + "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pyelftools": { + "args": { + "hash": "sha256-rEnt08K90/Psfa+SQgTUG3YGrhp4/udXG9VKIwPM7pk=", + "rev": "8047437615d66d3267ac0134834b80e70639d572", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pywebsocket3/src": { + "args": { + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/quic_trace/src": { + "args": { + "hash": "sha256-JmK7nmHg/BfXvFNG2oMpOV83EF+LwVLdwL6qX5FGREs=", + "rev": "352288a06d2c83ae68b5a402b2219f4678be9f39", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/re2/src": { + "args": { + "hash": "sha256-oEU+dz8ax1S36+f9OysjB0GnQj8mjZx1VsZ/UgckdDI=", + "rev": "972a15cedd008d846f1a39b2e88ce48d7f166cbd", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/readability/src": { + "args": { + "hash": "sha256-lFsHXk4kEkzIbHgJiLTgeiKqiGOErzUwADo8WSZlnec=", + "rev": "d7949dc47dd9ed9ee1d3b34ffdcf3bce28cde435", + "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ruy/src": { + "args": { + "hash": "sha256-4To1BMUgzj2/sV7USN9W0CgHnpRmaktEspfhwWWeVBc=", + "rev": "2af88863614a8298689cc52b1a47b3fcad7be835", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/search_engines_data/resources": { + "args": { + "hash": "sha256-UPP47dgdXxr+LPvTcEc6gi89OxmvdKD3CdwV4wKXvwQ=", + "rev": "2ecec7b3a56bcb5d7a4a1fc9bc71d7e1cda2a8d1", + "url": "https://chromium.googlesource.com/external/search_engines_data.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/securemessage/src": { + "args": { + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/skia": { + "args": { + "hash": "sha256-HsKHffZWTls362kjokxzdhaxb/xJD1g70VHGk9l6GVM=", + "rev": "afe8b760ada5128164f9826866b4381a3463df41", + "url": "https://skia.googlesource.com/skia.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/smhasher/src": { + "args": { + "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=", + "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/snappy/src": { + "args": { + "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=", + "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/main": { + "args": { + "hash": "sha256-oF8ELo2qmkgaTpNzBLaC3A6gyf2iFv+FQNPGwdGqzVU=", + "rev": "e2e2538900938c5d6819e9456bf33d48f806c96c", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v2.0": { + "args": { + "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=", + "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v2.1": { + "args": { + "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=", + "rev": "8bf7946e39e47c875c00767177197aea5727e84a", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v3.0": { + "args": { + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v3.1": { + "args": { + "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=", + "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-cross/src": { + "args": { + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-headers/src": { + "args": { + "hash": "sha256-UKBVs2s05hP+paPq1dZFaUEQQ9Kx9acHxYUyJVx22eY=", + "rev": "6dd7ba990830f7c15ac1345ff3b43ef6ffdad216", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-tools/src": { + "args": { + "hash": "sha256-8Xtzq8WOdFEw+uEJqMW39LLHt2m165K9OJsIFZuifoM=", + "rev": "2d14d2e76aa7de72404b17078eda15c20a6a0389", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/sqlite/src": { + "args": { + "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg=", + "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/squirrel.mac": { + "args": { + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "args": { + "hash": "sha256-ykR4JFDJyajpzubzptjrxC9WUbGBTma5YLaBiPB6y0s=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "2a8e2123a3931038179ee06105c9e6ec336b12ea" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "args": { + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/swiftshader": { + "args": { + "hash": "sha256-h0utcwCnzwhFufggkBNeA674x2Kqwu4sz3jQ/9eoQv0=", + "rev": "89556131bf9d48af3c5c9fbb9a3322e706da89a3", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/text-fragments-polyfill/src": { + "args": { + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/tflite/src": { + "args": { + "hash": "sha256-r2b+/VBffxsh1sRM2xcFiBx9K6GD6FsaQXpfFMBFUag=", + "rev": "de8d7f65b6eb670e4dad0225d0d6f99bebaab559", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ukey2/src": { + "args": { + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-deps": { + "args": { + "hash": "sha256-VOyN618wzyyO2Wh18gCnw+FCr/NbegX3A/54MClyhwc=", + "rev": "0ced1107c62836f439f684a5696c4bd69e09fce3", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-headers/src": { + "args": { + "hash": "sha256-/yolWlC7ruRiJ0gSdCoSlqL9+j2uJAh+o+H0OG37pq4=", + "rev": "afe9eb980aa928a66d1c9c06f38c55dd59868720", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-loader/src": { + "args": { + "hash": "sha256-8ParcURRRU3eS9Oej/vHTwOwvYy3HsVJsKh2wQLKUgM=", + "rev": "df84d2be47457a8dfd7eb66f8c2b031683bd1ba5", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-tools/src": { + "args": { + "hash": "sha256-tmTD/waVX/duaKXvj0FNUS+ncL1agM73kK7pEfHEsSA=", + "rev": "90bf5bc4fd8bea0d300f6564af256a51a34124b8", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-utility-libraries/src": { + "args": { + "hash": "sha256-B3GXmwJEvnGcER5DJt0FGrwqNi3t8iV6VgX8uOrExlU=", + "rev": "48b1fd1a65e436bae806cb6180c9338846b9de97", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-validation-layers/src": { + "args": { + "hash": "sha256-GqjVHxtda1a47+9G+nqh4qNMJmQaUdZNMUGQ8kAIIkk=", + "rev": "ac146eef210b6f52b842111c5d3419ab32a7293f", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan_memory_allocator": { + "args": { + "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=", + "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/gtk": { + "args": { + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/kde": { + "args": { + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/src": { + "args": { + "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY=", + "rev": "efbc060534be948b63e1f395d69b583eebba3235", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland/src": { + "args": { + "hash": "sha256-5iG0HaPXJCEo027TuyXlJQNGluTaAPlvwQDFbiYOEJQ=", + "rev": "736d12ac67c20c60dc406dc49bb06be878501f86", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webdriver/pylib": { + "args": { + "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo=", + "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webgl/src": { + "args": { + "hash": "sha256-Aax2hr/9Zq6Avk+TMU1OMBLGshUL6hyRTX6eoOQesqM=", + "rev": "216b10fafd3f6a900c715a8c758a4c7f9883b030", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webgpu-cts/src": { + "args": { + "hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU=", + "rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webpagereplay": { + "args": { + "hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0=", + "rev": "be48b5e3387780790ecc7723434b6ea6733bcc33", + "url": "https://chromium.googlesource.com/webpagereplay.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webrtc": { + "args": { + "hash": "sha256-jTJv53qt971Va5q6MaULysYiChBVmsFYxG9fzkcE0ak=", + "rev": "9600e77d854090669817d22aa2fc941ee92aaacd", + "url": "https://webrtc.googlesource.com/src.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/weston/src": { + "args": { + "hash": "sha256-PySen9syu0OshtlHAZw666FeSQXdnsV8nlW9RmxgapM=", + "rev": "b65be9e699847c975440108a42f05412cc7fddac", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wuffs/src": { + "args": { + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/xnnpack/src": { + "args": { + "hash": "sha256-xal21wjgeql3MjQXw6F1ezcRsnhVKod5jv0nYWroJ1o=", + "rev": "1812bbe2928a32f26c5e48466712ba6460cf290c", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/zstd/src": { + "args": { + "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg=", + "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/v8": { + "args": { + "hash": "sha256-x2FGL3J+JaWO1m6jBrcayR7Vlz90fYEAuufm4PULYyM=", + "rev": "ddc9a95905de5268332a8f0216dc2bc67d26e829", + "url": "https://chromium.googlesource.com/v8/v8.git" + }, + "fetcher": "fetchFromGitiles" + } + }, + "electron_yarn_data": { + "hash": "sha256-PT4mxXZ2Dcao7/iouNhrFZbGwO7kFbdJANFfA8UR4Ew=", + "missing_hashes": { + "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", + "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", + "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ed0f486a5085942727e255a9c14bfd99756d4af3ad2c2e702bfb7ab682fc9041d5327f3e89dc4dbfc9a09a6c884dbc9a79a46c720435c5ad2f2fe3f48bb9c3ac", + "@oxfmt/binding-darwin-x64@npm:0.42.0": "b607e67171aa33717f7fe80d9d5c8ca816ff30dbbd2b41c4b129977c749c62a4bb1f6829aa95c564d15246c98689ba153fc003a09a1549e2f3316810b35463be", + "@oxfmt/binding-freebsd-x64@npm:0.42.0": "c038e53f42083a56d548bd2b89765d1b36150c874e83a41631dfa039fe4fd999475a4a5a99414e43fe44654abdbdfb78c17f53fb482ba3bdc9d22f5641931a41", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "79d0b84f3281c7935eb153a53b7032fbb159357580cbcac721096d87ceb124e40863c0b7786ff1b94ad2cdc9b1beabe37e972e1b959423af028e6dea0fc8e0b6", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "c67dfa0553ba44f0585c3bba85efcbbd42b63b59f177302693fa83cc7b6fe6a6f2509c972cae9b367eb7cd36e8578209657ac4928cf329bf816fa4bfc578d2c1", + "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "f8507b36f7f2673a4d6db227ed2e98f94d30f81275820d0d25e5e6b0b9b20c7f4cc32b646ae02aac0068b90ba3d47bcbd85ad789b27f028b8ea07e168ec731ce", + "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "c4d0406e36248b4a8ddd62ac2d7c1b6648d23fb2b1eee471e3965d6c411b2dedfc681d227adcff50bbff5f786727bef31420610564691887cdecb50d7f1f7587", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "12b0eb3cff0807f898dd2e47de5712c8b57d2373108135e87f1de69902204c0527b383753983388f32e48749c479ce0f6247fbc927a2e035b2fb1f6c31ae5df7", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "aff4c5104769388174a69f5f4ad418f33e86ff1286117072e2200b7217aa9d30375ffb4deeabd728aac7975ed5e79832ac725725df9ff2ea6f819aef5e166353", + "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "710b0b9fc2d999a66b2c9e656e40e74e71d820d8670d5ee64dc36d373f1132a0c3ddcbedba6130f832b9e8abbb0988ab95de7a6ddd4657007f05fea4a3631835", + "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "8fc8ee6c1ea3369d3f7ec2f6dbe3fe846663c8e10a0ea976b1b2e150117359580d7efc904f5da0ead2f59066b1e17076aa09c1c4f2544071c29b623ada15da70", + "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "d46d962752e0e2978cbd9b552a0d4bebde69fa9581512dfda33e7bc645c849e2787ef6a4e2ae825e7d2abf68b895c90c4a351387d2f0d2ba336e990c54e245f0", + "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "e757b0b12ccf6e7355e2a3123fa0bea0908e1f220b7bb3601c18203bc78f1157be8364af9df3ca56f9c0bb123aeecbf058df31a9ee12612e1149b9c6228dc6f9", + "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "fe85007d6e7e7c1b6662a9756267de459fc7213af9ddf6f0494397d9d666a452d4a1a6f6fe6ce288d8dd4763d07b52b4534cc177bdf0e5613559f144b78e8fbb", + "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "04bd529ea236c23d8dc73d95acd365612ab489b0e6a4bdd976302b933b92dcc11d4d1629e2294036f16c1e1f5120140547f65060a9e2dc8adbb21f790e2eca39", + "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "9775afa164de049416abf481f062b8c670cd27a70d82a0868fa61749f741e777a76eb0a57a9ef276f158a35741d90a856a492777a0a9f17c9ac01ead32935fe3", + "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "5c38197ac6f874c2622b68a531b9fc9a221de05aa09c40717bba775f658680ebf964db7aa41c12271f90261bf50713cd4ebb2c10f12bf33cf2103fb9d67a88bb", + "@oxlint/binding-android-arm-eabi@npm:1.61.0": "64a0e4e724ec776f7bf88926b9544484ac4b8b7c906539073683281d0de4d887494aabad654807336f8c306cbc2bbd2cbf218c780fa02ce7b8cd2c9c280a886c", + "@oxlint/binding-android-arm64@npm:1.61.0": "fcbef757ed0eecbddb90e3818315614dbd4bdba7f9e8aa23255d39d12dd2ee5cd1bc5608f2d236b3028330bad7ba741e7dc3569d06373dabade10bcafb056de7", + "@oxlint/binding-darwin-arm64@npm:1.61.0": "1ff458a5cde78b3b3f7852dad86ef6e430732361b81e5ac5712f83a237725bde05d67980beced4361416abb376dc6a6384435f2a4932a62c5794a58ca01b9d73", + "@oxlint/binding-darwin-x64@npm:1.61.0": "3e09d59d46985c2652ee3fa3560215df05eebf470f2acd3fb502d303f661e3d75861a8908a1b215e3912e5da23673cc517862e06be21be6c95770fc5848778ef", + "@oxlint/binding-freebsd-x64@npm:1.61.0": "8f7141e3a7a0334836ea9f333d76fb6a12e145533cda2f485fff536b725193595a172c154b402d0eff3b14e13a36b3a0a14629987bcbf8faa444d9213c5e78d8", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.61.0": "2bf2eb6e1e6a3339822464e7f66f52824348ea5b4b0a2f87ed5fdfe6b7b993bb2ea0346e59dc68ec78030a3c4b8784810a2bb88edb69de99aacdda03606a35cf", + "@oxlint/binding-linux-arm-musleabihf@npm:1.61.0": "53d57e4693087ddd6e9104651f3200d11276aa8bf261ffe07c91908b7ba6dee0aaa58d74f3b58ad256b8dfb4689fee0e205d9479550b87a898644396afb1de55", + "@oxlint/binding-linux-arm64-gnu@npm:1.61.0": "b19d95033889b7a22e29b6b38a84c913f5e087015354de8ea52e60e8d067ecdbcedcecd49df2d3338e1ce5d579e079efaa43ee67ca626e92b619d41aa18277ae", + "@oxlint/binding-linux-arm64-musl@npm:1.61.0": "b61ede290d57073065e20161ae54d36d4700a814e6e62abc63e8e4f18558598e22695fcb9b14c67ce8aec50de2b733d6183f873d65de491936fbf7e1b9fbb59e", + "@oxlint/binding-linux-ppc64-gnu@npm:1.61.0": "7d0cb33713ce1716a0ddbc100b79eb888ad20af74c0c924db01b0b27c33677717f3f7a0f6d341ec0637ab0ec2dbc5033fea4154cf88b6c9513b1796b6a53ddf3", + "@oxlint/binding-linux-riscv64-gnu@npm:1.61.0": "a6c8ad8419110bbfc35f12256058fb0c31816f328a089bd6424ba03d582ebaed71f39ce673f77767dd17e2a4ed021789106a580d99e5f0a1f097ab3cf916f7a8", + "@oxlint/binding-linux-riscv64-musl@npm:1.61.0": "64e6073f588b995f509dccb6b66060a1cfeb5cea08613edf1a3f7819992ccce3a3f9539cd2b1962231a472f12c4ffa325600bbcc9279ada400b993488989470e", + "@oxlint/binding-linux-s390x-gnu@npm:1.61.0": "93b84e9694a451b023a2fbf2ca3cad533b5ea947bd89f6a8b95433cf12b6bb86bdbceb51188a5a5914a51a9e0ecca02abc6b0d656ce9616d8904eb8ebbaf84a8", + "@oxlint/binding-linux-x64-gnu@npm:1.61.0": "49d0ba0286946d633d933e2ae575a38dfef9f6570380d141f2bcdf10b09cba192a87767e5fd6cbeb115c23eae9c7241830c022180ada5bc96131badcc65c3d31", + "@oxlint/binding-linux-x64-musl@npm:1.61.0": "54567fcd74360d287a85ff18ce82c2691c0fea7f87e720f0390a621acf2422f64cafd135deebf329831fcac7cfe66389c8e6a5dcb8f8427ea6d4b3446ddeeab0", + "@oxlint/binding-openharmony-arm64@npm:1.61.0": "011ffbfde581da50b130705d59e0a043b4e6858dea1fc6fd100c7a2aa511179726769197a6868809a7040a28f454c0481a832c667b44b10820c0300b74a0b6f7", + "@oxlint/binding-win32-arm64-msvc@npm:1.61.0": "d5f962f94acfb6a882b04eb9ba33e05e2896b96cb6ab7b44c70aff55be93c633c6c88884d4f3f65f82ab88b6535c6034f4e9a7141bcfff23ad24efd0cb7bab78", + "@oxlint/binding-win32-ia32-msvc@npm:1.61.0": "f2902478c85eb95665cf3c4021cc4cdd3ea98f8863d9a311a6f2532059d1c8cc3c36c9e0eac7b459827cd03c4c7e6803bb96939d7476f3289df9362aaadd4710", + "@oxlint/binding-win32-x64-msvc@npm:1.61.0": "e4a5cf6c8db10fdf1cda748ab368357260e1fcab8df5819587b940613f55e57a729e99641119ff074d5aea59de16f4563322e01be5ac27d1349c9ca14d60302d" + } + }, + "modules": "146", + "node": "24.15.0", + "version": "42.1.0" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index ed97795fdbbb..83f2ea787d04 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -113,17 +113,38 @@ def get_chromium_gn_source(chromium_tag: str) -> dict: } } + @memory.cache -def get_electron_yarn_hash(electron_tag: str) -> str: +def get_electron_yarn_data(electron_tag: str) -> dict: print(f"yarn-berry-fetcher prefetch", file=sys.stderr) with tempfile.TemporaryDirectory() as tmp_dir: + print(f"Patching yarn.lock for yarn 4.14 support", file=sys.stderr) + yarn_lock_file=get_electron_file(electron_tag, "yarn.lock") + patched_yarn_lock_file=yarn_lock_file.replace('version: 8', 'version: 9', count=1) with open(tmp_dir + "/yarn.lock", "w") as f: - f.write(get_electron_file(electron_tag, "yarn.lock")) - return ( - subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"]) + f.write(patched_yarn_lock_file) + missing_hashes_str = ( + subprocess.check_output( + ["yarn-berry-fetcher", "missing-hashes", tmp_dir + "/yarn.lock"] + ) .decode("utf-8") - .strip() ) + missing_hashes = json.loads(missing_hashes_str) + cmd = ["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"] + if missing_hashes: + with open(tmp_dir + "/missing-hashes.json", "w") as f: + f.write(missing_hashes_str) + cmd.append(tmp_dir + "/missing-hashes.json") + hash = subprocess.check_output(cmd).decode("utf-8").strip() + + data = { + "hash": hash, + } + if missing_hashes: + data["missing_hashes"] = missing_hashes + + return data + @memory.cache def get_chromium_npm_hash(chromium_tag: str) -> str: @@ -143,7 +164,12 @@ def get_chromium_npm_hash(chromium_tag: str) -> str: def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]: tasks = [] - a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"]))) + a = lambda: ( + ( + "electron_yarn_data", + get_electron_yarn_data(gclient_data["src/electron"]["args"]["tag"]), + ) + ) tasks.append(delayed(a)()) a = lambda: ( ( diff --git a/pkgs/development/tools/electron/wrapper.nix b/pkgs/development/tools/electron/wrapper.nix index 412596a0629b..5f4b61abc575 100644 --- a/pkgs/development/tools/electron/wrapper.nix +++ b/pkgs/development/tools/electron/wrapper.nix @@ -40,5 +40,9 @@ stdenv.mkDerivation { unwrapped = electron-unwrapped; inherit (electron-unwrapped) headers dist; }; + + __structuredAttrs = true; + strictDeps = true; + inherit (electron-unwrapped) meta; } diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 5fc88bc6407f..2279ff8e5d4f 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -26,12 +26,12 @@ let stdenvNoCC.mkDerivation (finalAttrs: { pname = "coreboot-toolchain-${arch}"; - version = "25.12"; + version = "26.03"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-zm1M+iveBxE/8/vIXZz1KoFkMaKW+bsQM4me5T6WqVY="; + hash = "sha256-9ollzu6vtU+uHibvV/B5N70ZVl701kuI/orWlFZLjIU="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 38fd24135427..72cdbe9d8e10 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation ( in { - version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.04.00" else "7.14"; + version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.05.00" else "7.14"; pname = "ocaml${ocaml.version}-camlp5"; @@ -35,7 +35,7 @@ stdenv.mkDerivation ( "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; hash = { - "8.04.00" = "sha256-5IQVGm/tqEzXmZmSYGbGqX+KN9nQLQgw+sBP+F2keXo="; + "8.05.00" = "sha256-Y7d72gAxtyAQOIvLGua6Pib+FCoeMlbRYa9vzc+9hRo="; "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o="; "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU="; } @@ -81,7 +81,7 @@ stdenv.mkDerivation ( meta = { broken = - lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.04.00"; + lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.05.00"; description = "Preprocessor-pretty-printer for OCaml"; longDescription = '' Camlp5 is a preprocessor and pretty-printer for OCaml programs. diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3bbbfe263e65..0379bd23a3db 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -39,6 +39,8 @@ let checkFlags = [ # requires pgrx to be properly initialized with cargo pgrx init + "--skip=object_utils::tests::parses_managed_postmasters" + # test name in versions < 0.18 "--skip=command::schema::tests::test_parse_managed_postmasters" ]; @@ -60,9 +62,9 @@ in # Not to be used with buildPgrxExtension, where it should be pinned. # When you make an extension use the latest version, *copy* this to a separate pinned attribute. cargo-pgrx = generic { - version = "0.17.0"; - hash = "sha256-Ld7m7ggxlf8FufpeiAE9qcu49X0SgX6XXHS6KIewGyA="; - cargoHash = "sha256-hNj39YzJna8iZxnlrLz+uLduxaD+uvggQRM7ng3MN1k="; + version = "0.18.0"; + hash = "sha256-sBezVDNnyqFQwvFm/CkhlY1zm7Ii2NQPeTfoUQu55e0="; + cargoHash = "sha256-/miOlhZ87fnKT1f+XVaWK4xAzHje8OGVlYl4iU0Sf34="; }; } // lib.mapAttrs (_: generic) (import ./pinned.nix) diff --git a/pkgs/games/minecraft-servers/default.nix b/pkgs/games/minecraft-servers/default.nix deleted file mode 100644 index 0b5a9a28834b..000000000000 --- a/pkgs/games/minecraft-servers/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - callPackage, - lib, - javaPackages, -}: -let - versions = lib.importJSON ./versions.json; - - latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); - escapeVersion = builtins.replaceStrings [ "." ] [ "-" ]; - - getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless; - - packages = lib.mapAttrs' (version: value: { - name = "vanilla-${escapeVersion version}"; - value = callPackage ./derivation.nix { - inherit (value) version url sha1; - jre_headless = getJavaVersion ( - if value.javaVersion == null then - 8 - else if value.javaVersion == 16 then - 17 - else - value.javaVersion - ); # versions <= 1.6 will default to 8 - }; - }) versions; -in -lib.recurseIntoAttrs ( - packages - // { - vanilla = builtins.getAttr "vanilla-${escapeVersion latestVersion}" packages; - } -) diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index acaf1a9fbcf1..88776fb9ece5 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchurl, - SDL2, + sdl3, cmake, libpng, libzip, @@ -17,31 +17,36 @@ let sfl-src = fetchFromGitHub { owner = "slavenf"; repo = "sfl-library"; - tag = "2.0.2"; - hash = "sha256-C8BRl77fryD1aNW6ASD/orb8+hrAKBqmXjr2Z4JqX94="; + tag = "2.2.0"; + hash = "sha256-U1InclhSF3pte2AhKUVYBYOXZagksDMkUWgFn5ZB/tk="; }; openloco-objects = fetchurl { - url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.5/objects.zip"; - sha256 = "fe8943fabad8eb07cebab5354589abd7e798a705f7993bb4d9dab2122b4fe96e"; + url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.8/objects.zip"; + sha256 = "sha256-ZYiR2UpGBAt79x39fwG7wd2mRwcSyz3AdIKTH+tQE8c="; }; in stdenv.mkDerivation rec { pname = "openloco"; - version = "25.11"; + version = "26.04"; src = fetchFromGitHub { owner = "OpenLoco"; repo = "OpenLoco"; tag = "v${version}"; - hash = "sha256-ohHTa5ow6wiq0GajqLcOwL9mnjocw+Od93SEaxCR2C0="; + hash = "sha256-tOvqDJfF6iG05EatUdWGp4wv8UDXdDs1frQ9FMF5myU="; }; postPatch = '' - # the upstream build process determines the version tag from git; since we - # are not using a git checkout, we patch it manually - sed -i '/#define OPENLOCO_NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp + # the upstream build process determines the version tag, branch + # and commit hash from git; since we are not using a git checkout, + # we patch it manually + sed -i '/#define OPENLOCO_NAME "OpenLoco"/a\ + #define OPENLOCO_VERSION_TAG "${version}"\ + #define OPENLOCO_BRANCH "master"\ + #define OPENLOCO_COMMIT_SHA1_SHORT "b79ace0"'\ + src/Version/include/OpenLoco/Version.hpp # prefetch sfl header sources grep -q 'GIT_TAG \+${sfl-src.tag}' thirdparty/CMakeLists.txt @@ -63,7 +68,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 + sdl3 libpng libzip openal diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index a453b9cf8cd8..5ee3785b7eb5 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -57,7 +57,6 @@ let # THIRD PARTY inherit cmark - gpgme taglib wayland wayland-protocols @@ -85,6 +84,7 @@ let oxygen-icons = self.callPackage ./misc/oxygen-icons { }; phonon = self.callPackage ./misc/phonon { }; phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + plasma-pass = self.callPackage ./misc/plasma-pass { }; plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { }; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; diff --git a/pkgs/kde/misc/plasma-pass/default.nix b/pkgs/kde/misc/plasma-pass/default.nix new file mode 100644 index 000000000000..579d0cbe4676 --- /dev/null +++ b/pkgs/kde/misc/plasma-pass/default.nix @@ -0,0 +1,24 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + + oath-toolkit, + qgpgme, +}: +mkKdeDerivation rec { + pname = "plasma-pass"; + version = "1.3.1"; + + src = fetchurl { + url = "mirror://kde/stable/plasma-pass/plasma-pass-${version}.tar.xz"; + hash = "sha256-WoiYXcUiyjKH8T7ZiWCak4cZltToxbCkFZTi06L+jyo="; + }; + + extraBuildInputs = [ + oath-toolkit + qgpgme + ]; + + meta.license = [ lib.licenses.lgpl21Plus ]; +} diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index ec8de3f2ea8f..c63fee56ceaf 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.31"; - hash = "sha256-AvsMS5Za+k+b08Nz4UOey9Uzg0Z9hT5lkwMN5cf5ZG8="; + version = "6.18.32"; + hash = "sha256-XgqytdTnL3Jjcs9riMRGgRVfyy76jxdBcC0hSt4rc58="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.0.8"; - hash = "sha256-bB/qCLw3m+g3Z/JcYl7XNYT313jBbQdcMzvZaK8Fw4Q="; + version = "7.0.9"; + hash = "sha256-QlCbzTqHtVROdIEoqwrAf8mylLh2WHSqFY/eQ3jvrW8="; }; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 04fcd61b297a..6ab5cfa0a397 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ in buildLinux ( args // rec { - version = "7.0.8"; + version = "7.0.9"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "xuzWN+GvsY/EiIwKd+QgUsRVVkM7KQb3i11oyhy2KaQ="; + sha256 = "vu6rRldDBp/N6kkMzZEgz9aMsGa/VWPdnkZTCF/Yobo="; }; # This is based on the following source: diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfsvfs/default.nix similarity index 81% rename from pkgs/os-specific/linux/nullfs/default.nix rename to pkgs/os-specific/linux/nullfsvfs/default.nix index c289c63f3a88..ee9b4ab0ab0e 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfsvfs/default.nix @@ -6,14 +6,14 @@ kernelModuleMakeFlags, }: stdenv.mkDerivation rec { - pname = "nullfs"; - version = "0.22"; + pname = "nullfsvfs"; + version = "0.26"; src = fetchFromGitHub { owner = "abbbi"; repo = "nullfsvfs"; rev = "v${version}"; - sha256 = "sha256-UJubWx5QfzLAiYTN1BPaziT3gKsTI0OVCmcuwKX3Gp0="; + sha256 = "sha256-gEvkl8IKekuiQjY+TVaC72vJ310k2A/kXfR5mxdvPpc="; }; hardeningDisable = [ "pic" ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/" - install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/ + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/" + install -p -m 644 nullfsvfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/ runHook postInstall ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index fc1809109537..8970e60aa426 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -101,11 +101,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "595.44.06"; + version = "595.44.08"; persistencedVersion = "595.45.04"; settingsVersion = "595.45.04"; - sha256_64bit = "sha256-Gq7peoXLeYVuVHBx+2EIx3/bZIVl56c35qS/30Q7208="; - openSha256 = "sha256-RSlpdGhYTxxywMQ+0tBkpJG5ohnmJYh8pzedin1sBBs="; + sha256_64bit = "sha256-slPOKXeI3Y2ebiytS20c8bbwWbUdn2dFkwJih9Mbmyc="; + openSha256 = "sha256-PpfrDfBkrzszROLDfgeBUISIZm3BimmXTRhkL/X4+p8="; settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA="; persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix index 0b6ee61243eb..4f6912a79dcd 100644 --- a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "thomasloven"; domain = "browser_mod"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { inherit owner; repo = "hass-browser_mod"; tag = "v${version}"; - hash = "sha256-A0FxgLwm8MWFulFLL6qQmWd4DndMxg6zwqLfc/5WCbU="; + hash = "sha256-Q7+9pcV9vZ+PPXjlOezcDPtzcekXqBHgPJSwh5n9ruE="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildHomeAssistantComponent rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-eSyHX36QeNDPUnvq13bUsO1utn4oZO3Przeoa75MoVk="; + hash = "sha256-MeB1NgQM8HvQF42AaE1XkIt0aODVACO8a0wtUFOqVW8="; }; npmBuildScript = "build"; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix index 5762e612c9fc..1b530d91e23c 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.11"; + version = "1.16.12"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-jbT+skF/WQmfPob6TZ7ff9mgnWvC9siE+WgFONXqGbw="; + hash = "sha256-hLQ8MHzBmvxqqgI18qmSePUOZBznCYg9cpHr/YcDHts="; }; - npmDepsHash = "sha256-crF/KesvY5GvH14n9KrND5O7sJxsSV2Nbcod2stesvg="; + npmDepsHash = "sha256-gGOvBSHzBSl7eUpjuoddzZATL4GBluvbfxc8vjiZZgo="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 1e0ce698e8af..43f6f752704f 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -60,17 +60,17 @@ let in { tomcat9 = common { - version = "9.0.117"; - hash = "sha256-90oLBh4rAGjsKhel4BwlCFH28w82LIEnIJoqbveVKyk="; + version = "9.0.118"; + hash = "sha256-L9Me+dqZKbh4mX9zHPJVNv6sV0FhwC2TmXJ0ccfEBrI="; }; tomcat10 = common { - version = "10.1.54"; - hash = "sha256-X81S45HmNDDbqr6RdqvWsLyXmpnsQr7ujtW/pBVuFeE="; + version = "10.1.55"; + hash = "sha256-l4oNCJA0XuxSo4yWcKjhEtTMjPjLEO9B0F1rcXiFdJU="; }; tomcat11 = common { - version = "11.0.21"; - hash = "sha256-mJAzZQx9iAN34CYwe2qwtR3q/p6OoOOY6tA4zPpidW0="; + version = "11.0.22"; + hash = "sha256-c9I5Iy8U394ieOjZMfdn7UVK7ZsBjk1wodQEwlebWZg="; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix index 28ff69d9a888..a39ef18698ad 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-pyroscope-app"; - version = "2.0.5"; - zipHash = "sha256-bZmGGLw97fWpW0n7isFzdSLGtU43PswBumRXQgqHWuk="; + version = "2.0.6"; + zipHash = "sha256-+3nNqZBn8z754q/+cyb8uLP9zZeBlIr7eVpUEoYQPcU="; meta = { description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix b/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix new file mode 100644 index 000000000000..c761d5a1cab3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix @@ -0,0 +1,126 @@ +{ + lib, + fetchFromGitHub, + writeText, + + postgresqlBuildExtension, + postgresqlTestExtension, + postgresql, + + openssl, + curl, + + cmake, + ninja, + pkg-config, + python3, + git, + which, +}: + +postgresqlBuildExtension (finalAttrs: { + pname = "pg_duckdb"; + version = "1.1.1"; + + # duckdbVersionFull is used to set OVERRIDE_GIT_DESCRIBE, which effectively suppresses + # build script attempts to use git to figure it out. + # To get the version first run `git submodule update --init --recursive` inside pg_duckdb/, + # then run `git describe --tags --long --match "v*.*.*"` inside pg_duckdb/third_party/duckdb + duckdbVersion = "1.4.3"; + duckdbVersionFull = "${finalAttrs.duckdbVersion}-0-gd1dc88f950"; + + src = fetchFromGitHub { + owner = "duckdb"; + repo = "pg_duckdb"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-B/9U1j29zqNMNgK2t2MFJemCrLgQo1qRrCacSjPzYdg="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + git + which + ]; + + # Avoid build errors by suppressing these hooks. + # Extension build scripts drive cmake and ninja themselves. + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + # curl is required by httpfs (duckdb-httpfs/vcpkg.json), but not included in postgresql.buildInputs + buildInputs = postgresql.buildInputs ++ [ + openssl + curl + ]; + + # 1. Disable calling `git submodule update --init --recursive` from Makefile: + # submodules are already in place thanks to fetchFromGitHub's fetchSubmodules option. + # 2. duckdb-httpfs prefers to use vcpkg to build its dependencies (see + # duckdb-httpfs/README.md), but this derivation won't run vcpkg, so the + # libraries are linked dynamically. But because the -lssl and -lcrypto flags + # are missing, libssl/libcrypto symbols can't be resolved during the link time. + postPatch = '' + substituteInPlace Makefile \ + --replace-fail \ + 'git submodule update --init --recursive' \ + 'true' + + substituteInPlace Makefile \ + --replace-fail \ + 'PG_DUCKDB_LINK_FLAGS += -Wl,-rpath,$(PG_LIB)/ -L$(DUCKDB_BUILD_DIR)/src -L$(PG_LIB) -lstdc++ -llz4' \ + 'PG_DUCKDB_LINK_FLAGS += -Wl,-rpath,$(PG_LIB)/ -L$(DUCKDB_BUILD_DIR)/src -L$(PG_LIB) -lstdc++ -llz4 -lssl -lcrypto' + ''; + + # Download httpfs extension source code and override pg_duckdb's attempt to + # get it using git in pg_duckdb_extensions.cmake by using EXTENSION_CONFIGS + httpfsSrc = fetchFromGitHub { + owner = "duckdb"; + repo = "duckdb-httpfs"; + rev = "9c7d34977b10346d0b4cbbde5df807d1dab0b2bf"; + fetchSubmodules = true; + hash = "sha256-/gR99nrks2nRmfk1ypZCSAKpok1DGizXgNz0u5Bw3Jk="; + }; + + makeFlags = + let + httpfsCmake = writeText "pg_duckdb_httpfs.cmake" '' + duckdb_extension_load(httpfs + SOURCE_DIR ${finalAttrs.httpfsSrc} + EXTENSION_VERSION v${finalAttrs.duckdbVersion} + ) + ''; + in + [ + "GEN=ninja" + "DUCKDB_BUILD=ReleaseStatic" + "PG_CONFIG=${postgresql.pg_config}/bin/pg_config" + "DUCKDB_VERSION=v${finalAttrs.duckdbVersionFull}" + "EXTENSION_CONFIGS=${httpfsCmake};../pg_duckdb_extensions.cmake" + ]; + + passthru.tests.extension = postgresqlTestExtension { + inherit (finalAttrs) finalPackage; + postgresqlExtraSettings = '' + shared_preload_libraries = 'pg_duckdb' + ''; + sql = '' + CREATE EXTENSION pg_duckdb; + SELECT duckdb.raw_query('SELECT 42'); + ''; + }; + + meta = { + description = "DuckDB-powered Postgres extension for high-performance analytics"; + homepage = "https://github.com/duckdb/pg_duckdb"; + changelog = "https://github.com/duckdb/pg_duckdb/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ skonotopov ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index fe293b9ce6cb..0a8337229dd0 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.27.0"; + version = "2.27.0-p0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-ytEVnNmLARsDQKqvfuInRf1AZ9vNRdTo0yJBebQqDrg="; + hash = "sha256-R91Xd6bb7iryoqQQUm6LENEOztXNY0dDzizx/72yrxs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 96aba467b7be..64d7f371ec5b 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -53,13 +53,13 @@ }: let - version = "2026.1.3"; + version = "2026.1.4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE="; + sha256 = "sha256-kQYDKZIMsWByuCZQfUlwhoIew5QykVylRMh6xvrHIBY="; }; pnpm = pnpm_10; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 01df10a128c3..2183789763f8 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -304,7 +304,7 @@ GEM mini_sql (1.6.0) mini_suffix (0.3.3) ffi (~> 1.9) - minio_runner (1.0.0) + minio_runner (1.0.1) minitest (5.26.2) mocha (2.8.2) ruby2_keywords (>= 0.0.5) @@ -1082,7 +1082,7 @@ CHECKSUMS mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503 mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7 - minio_runner (1.0.0) sha256=ca0fc56a90c63b65a26cda632938c9075046835d41f4b9d1e165b0550eae0538 + minio_runner (1.0.1) sha256=3675ad7abd79177b3fdd9f37e20fe46f7d4dcbb41f3f30a53db2207277241795 minitest (5.26.2) sha256=f021118a6185b9ba9f5af71f2ba103ad770c75afde9f2ab8da512677c550cde3 mocha (2.8.2) sha256=1f77e729db47e72b4ef776461ce20caeec2572ffdf23365b0a03608fee8f4eee msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 2d77c94cb35b..ab25c69fbcb2 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1781,10 +1781,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f05mq75bc35w78vkx21bn1lcl07r4w2jqysdji6afy6j1mca3ya"; + sha256 = "158p4ivp485j7njk0gqznk5lszbgwh7y4dwzvlzpn5vrpmxasx9n"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; minitest = { groups = [ diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index cfa7dbeb5542..e28b33d117ba 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -402,6 +402,29 @@ rec { done ''; + # verify that l3build works correctly + l3build = + runCommand "texlive-test-l3build" + { + nativeBuildInputs = [ (texliveSmall.withPackages (ps: [ ps.l3build ])) ]; + } + '' + cat >>build.lua <>test-l3build.tex <=4.17"; # added 2025-07-18 prl-tools = throw "Parallel Tools no longer provide any kernel module, please use pkgs.prl-tools instead."; # added 2025-10-04 nvidia_dc_565 = throw "nvidiaPackages.dc_565 has reached end of life, see https://endoflife.date/nvidia"; # added 2026-02-10 diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d5dd6929b4e1..4862bee32275 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,6 +1,5 @@ { stdenv, - fetchpatch, config, callPackages, lib, @@ -30,7 +29,6 @@ nix-update-script, oniguruma, openldap, - openssl_1_1, openssl, pam, pcre2, diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbf15eec4e19..ee2088abb591 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6204,6 +6204,11 @@ self: super: with self; { geoarrow-pyarrow = callPackage ../development/python-modules/geoarrow-pyarrow { }; + inherit (callPackage ../development/python-modules/geoarrow-rust { }) + geoarrow-rust-core + geoarrow-rust-io + ; + geoarrow-types = callPackage ../development/python-modules/geoarrow-types { }; geocachingapi = callPackage ../development/python-modules/geocachingapi { }; @@ -8881,6 +8886,8 @@ self: super: with self; { pkgsLibpcap = pkgs.libpcap; # Needs the C library }; + libpulse = callPackage ../development/python-modules/libpulse { }; + libpurecool = callPackage ../development/python-modules/libpurecool { }; libpwquality = lib.pipe pkgs.libpwquality [ @@ -10167,6 +10174,10 @@ self: super: with self; { mlflow = callPackage ../development/python-modules/mlflow { }; + mlflow-skinny = callPackage ../development/python-modules/mlflow-skinny { }; + + mlflow-tracing = callPackage ../development/python-modules/mlflow-tracing { }; + mlrose = callPackage ../development/python-modules/mlrose { }; mlt = toPythonModule ( @@ -11068,37 +11079,49 @@ self: super: with self; { netapp-ontap = callPackage ../development/python-modules/netapp-ontap { }; - netbox-attachments = callPackage ../development/python-modules/netbox-attachments { }; + netbox-attachments = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-attachments/package.nix + { }; - netbox-bgp = callPackage ../development/python-modules/netbox-bgp { }; + netbox-bgp = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix { }; - netbox-contextmenus = callPackage ../development/python-modules/netbox-contextmenus { }; + netbox-contextmenus = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix + { }; - netbox-contract = callPackage ../development/python-modules/netbox-contract { }; + netbox-contract = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix { }; - netbox-dns = callPackage ../development/python-modules/netbox-dns { }; + netbox-dns = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix { }; - netbox-documents = callPackage ../development/python-modules/netbox-documents { }; + netbox-documents = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix { }; - netbox-floorplan-plugin = callPackage ../development/python-modules/netbox-floorplan-plugin { }; + netbox-floorplan-plugin = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix + { }; netbox-interface-synchronization = - callPackage ../development/python-modules/netbox-interface-synchronization + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-interface-synchronization/package.nix { }; - netbox-napalm-plugin = callPackage ../development/python-modules/netbox-napalm-plugin { }; + netbox-napalm-plugin = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-napalm-plugin/package.nix + { }; netbox-plugin-prometheus-sd = - callPackage ../development/python-modules/netbox-plugin-prometheus-sd + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-plugin-prometheus-sd/package.nix { }; - netbox-qrcode = callPackage ../development/python-modules/netbox-qrcode { }; + netbox-qrcode = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-qrcode/package.nix { }; - netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { }; + netbox-reorder-rack = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix + { }; - netbox-routing = callPackage ../development/python-modules/netbox-routing { }; + netbox-routing = callPackage ../by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix { }; - netbox-topology-views = callPackage ../development/python-modules/netbox-topology-views { }; + netbox-topology-views = + callPackage ../by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix + { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; @@ -12059,6 +12082,8 @@ self: super: with self; { osqp = callPackage ../development/python-modules/osqp { }; + osrf-pycommon = callPackage ../development/python-modules/osrf-pycommon { }; + osrparse = callPackage ../development/python-modules/osrparse { }; oss2 = callPackage ../development/python-modules/oss2 { }; @@ -16985,6 +17010,8 @@ self: super: with self; { reretry = callPackage ../development/python-modules/reretry { }; + rerun-notebook = callPackage ../development/python-modules/rerun-notebook { }; + rerun-sdk = callPackage ../development/python-modules/rerun-sdk { }; resampy = callPackage ../development/python-modules/resampy { }; @@ -18319,6 +18346,8 @@ self: super: with self; { sparse = callPackage ../development/python-modules/sparse { }; + sparsediffpy = callPackage ../development/python-modules/sparsediffpy { }; + spatial-image = callPackage ../development/python-modules/spatial-image { }; spatialmath-python = callPackage ../development/python-modules/spatialmath-python { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 048ab88854ed..8aa46192660f 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -290,9 +290,15 @@ let # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun { overlays = [ - (self': super': { - pkgsStatic = super'; - }) + ( + self': super': + { + pkgsStatic = super'; + } + // lib.optionalAttrs super'.stdenv.hostPlatform.isMusl { + pkgsMusl = super'; + } + ) ] ++ overlays; crossSystem = {