diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bcbcc73dae1f..ad45fb65096d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,7 +27,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} @@ -36,7 +36,7 @@ jobs: permission-pull-requests: write permission-workflows: write - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: ref: ${{ github.event.pull_request.head.sha }} token: ${{ steps.app-token.outputs.token }} @@ -61,6 +61,9 @@ jobs: Even as a non-committer, if you find that it is not acceptable, leave a comment. + > [!TIP] + > If you maintain all packages touched by this pull request, and they are all located under `pkgs/by-name/*`, you can comment **`@NixOS/nixpkgs-merge-bot merge`** to automatically merge this PR using the [`nixpkgs-merge-bot`](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md#nixpkgs-merge-bot). + - name: Log current API rate limits env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index b43aca0541e6..9eb5911aadb5 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -46,7 +46,7 @@ jobs: # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/ FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true" steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: | @@ -56,7 +56,7 @@ jobs: run: npm install @actions/artifact bottleneck # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour. - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46a4b7b4cf3f..7ea446842a3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: runs-on: ${{ matrix.runner }} timeout-minutes: 60 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a264e3ecba48..59b801f0c0d1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-slim timeout-minutes: 3 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false path: trusted @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 5 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml index 16efc03bf6e5..feb770a24ecd 100644 --- a/.github/workflows/comment.yml +++ b/.github/workflows/comment.yml @@ -23,14 +23,14 @@ jobs: timeout-minutes: 2 if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge') steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: | ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml index b05eb973074c..cf16302421d9 100644 --- a/.github/workflows/edited.yml +++ b/.github/workflows/edited.yml @@ -36,7 +36,7 @@ jobs: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs # We only need Pull Requests: write here, but the app is also used for backports. - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 9d8dc0b7deab..9146cff5631b 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -37,7 +37,7 @@ jobs: outputs: versions: ${{ steps.versions.outputs.versions }} steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false path: trusted @@ -45,7 +45,7 @@ jobs: ci/supportedVersions.nix - name: Check out the PR at the test merge commit - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false ref: ${{ inputs.mergedSha }} @@ -89,7 +89,7 @@ jobs: sudo mkswap /swap sudo swapon /swap - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions @@ -171,7 +171,7 @@ jobs: statuses: write timeout-minutes: 5 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions @@ -342,7 +342,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 06e04c57499c..95ad536571a8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions @@ -90,7 +90,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: .github/actions diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 3bcb0891b145..299f56c09dfe 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -25,7 +25,7 @@ jobs: targetSha: ${{ steps.prepare.outputs.targetSha }} systems: ${{ steps.prepare.outputs.systems }} steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: | diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index d29f34e643c0..58e454d13cd6 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -26,7 +26,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} @@ -34,7 +34,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index a9bbf62c388d..9609a440ae89 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -31,7 +31,7 @@ jobs: systems: ${{ steps.prepare.outputs.systems }} touched: ${{ steps.prepare.outputs.touched }} steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout-cone-mode: true # default, for clarity diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index a6f2299d06cc..a458489f6886 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -20,14 +20,14 @@ jobs: runs-on: ubuntu-slim timeout-minutes: 2 steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: | ci/github-script # Use the GitHub App to make sure the reaction happens with the same user who will later merge. - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID id: app-token with: diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 1b144af2a0b6..b815909c3472 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered and to # request team member lists. - - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0 + - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} @@ -30,7 +30,7 @@ jobs: permission-pull-requests: write - name: Fetch source - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout: | @@ -64,7 +64,7 @@ jobs: echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT" - name: Create Pull Request - uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9 + uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11 with: token: ${{ steps.app-token.outputs.token }} add-paths: maintainers/github-teams.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63e055207c76..ae1681d8d9e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: push: ${{ steps.files.outputs.push }} targetSha: ${{ steps.prepare.outputs.targetSha }} steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: persist-credentials: false sparse-checkout-cone-mode: true # default, for clarity diff --git a/.mailmap b/.mailmap index 78903382ab3c..758853950495 100644 --- a/.mailmap +++ b/.mailmap @@ -26,6 +26,9 @@ Sandro Jäckel Sandro Jäckel superherointj <5861043+superherointj@users.noreply.github.com> Tomodachi94 Tomo <68489118+Tomodachi94@users.noreply.github.com> +toastal +toastal <561087+toastal@users.noreply.github.com> +toastal Vladimír Čunát Vladimír Čunát Yifei Sun diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d86cafd010fb..694755d650ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -659,13 +659,13 @@ If you have any problems with formatting, please ping the [formatting team](http Do ```nix - { rev = version; } + { tag = version; } ``` instead of ```nix - { rev = "${version}"; } + { tag = "${version}"; } ``` - Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`. diff --git a/ci/OWNERS b/ci/OWNERS index 51888466bd1a..19100d11b58e 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -206,9 +206,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @wolfgangwalther # Perl -/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg -/pkgs/top-level/perl-packages.nix @stigtsp @zakame @marcusramberg -/pkgs/development/perl-modules @stigtsp @zakame @marcusramberg +/pkgs/development/interpreters/perl @stigtsp @marcusramberg +/pkgs/top-level/perl-packages.nix @stigtsp @marcusramberg +/pkgs/development/perl-modules @stigtsp @marcusramberg # R /pkgs/applications/science/math/R @jbedo @@ -262,7 +262,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/java-packages.nix @NixOS/java # Jetbrains -/pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara +/pkgs/applications/editors/jetbrains @leona-ya @theCapypara # Licenses /lib/licenses.nix @alyssais @emilazy @jopejoe1 @@ -382,12 +382,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/vscode/extensions # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @aanderse @globin @ma27 @talyz -/nixos/tests/php @aanderse @globin @ma27 @talyz -/pkgs/build-support/php/build-pecl.nix @aanderse @globin @ma27 @talyz -/pkgs/development/interpreters/php @jtojnar @aanderse @globin @ma27 @talyz -/pkgs/development/php-packages @aanderse @globin @ma27 @talyz -/pkgs/top-level/php-packages.nix @jtojnar @aanderse @globin @ma27 @talyz +/doc/languages-frameworks/php.section.md @aanderse @ma27 @talyz +/nixos/tests/php @aanderse @ma27 @talyz +/pkgs/build-support/php/build-pecl.nix @aanderse @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @aanderse @ma27 @talyz +/pkgs/development/php-packages @aanderse @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @aanderse @ma27 @talyz # Docker tools /pkgs/build-support/docker @roberth @jhol diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index f16e03af69bd..e8289112963b 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -765,7 +765,7 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash` ## `fetchgit` {#fetchgit} -Used with Git. Expects `url` to a Git repo, `rev`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. +Used with Git. Expects `url` to a Git repo, `rev` or `tag`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash), or use `tag` for a tag name like `refs/tags/v1.0`. If you want to fetch a tag you should pass the `tag` parameter instead of `rev` which has the same effect as setting `rev = "refs/tags"/${version}"`. This is safer than just setting `rev = version` w.r.t. possible branch and tag name conflicts. @@ -1005,4 +1005,3 @@ fetchtorrent { - `config`: When using `transmission` as the `backend`, a json configuration can be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure. - diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index 5ea70319dd49..64c72385fb35 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = version; + tag = version; hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28="; }; @@ -68,7 +68,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = version; + tag = version; hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28="; }; diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 9b5d104469e3..77b6d67e83d5 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -84,7 +84,7 @@ nix-prefetch -E "{ sha256 }: ((import ./. { }).my-package.overrideAttrs { vendor version = "0.4.0"; src = fetchFromGitHub { inherit (previousAttrs.src) owner repo; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; }; vendorHash = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 360124bbcdac..508b8f3f97f6 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -539,7 +539,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "..."; repo = "..."; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 095eaba4e648..33579f70e41b 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -86,7 +86,7 @@ jd-cli.overrideMavenAttrs (old: rec { src = fetchFromGitHub { owner = old.src.owner; repo = old.src.repo; - rev = "${old.pname}-${version}"; + tag = "${old.pname}-${version}"; # old source hash of 1.2.0 version hash = "sha256-US7j6tQ6mh1libeHnQdFxPGoxHzbZHqehWSgCYynKx8="; }; diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index 465aa9cdf16c..49870b166154 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -20,7 +20,7 @@ buildNimPackage (finalAttrs: { src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = lib.fakeHash; }; @@ -74,7 +74,7 @@ buildNimSbom (finalAttrs: { src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_lk"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = lib.fakeHash; }; buildInputs = [ openssl ]; diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 55739e652aad..d09e35c3a84b 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -45,10 +45,7 @@ Here is a simple package example. - It also accepts a `duneVersion` parameter (valid values are `"2"`, and `"3"`). The recommended practice is to set it only if you don't want the - default value and/or it depends on something else like package version. You - might see a not-supported argument `useDune2`. The behavior was `useDune2 = - true;` => `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = - "1";`. It was used at the time when dune3 didn't exist. + default value and/or it depends on something else like package version. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 988fa659f0aa..a78bbf724206 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -307,7 +307,7 @@ stdenvNoCC.mkDerivation ( src = fetchFromGitHub { owner = "git-owner"; repo = "git-repo"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; }; in diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 1c2b74db69fc..11e0fb70ad2a 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -14,8 +14,15 @@ - `kanata` now requires `karabiner-dk` version 6.0+ or later. The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package. +- `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`. + - All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years. +- `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these + two versions, and the one affected most was the removal of `asio::io_service` in favor of `asio::io_context` in 1.33.0. `asio_1_32_0` is + retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore. + `asio` also no longer propagates `boost` as it is used independent from `boost` in most cases. + - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3. ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes} @@ -26,6 +33,10 @@ If your SQLite database is corrupted, the migration might fail and require [manual intervention](https://github.com/louislam/uptime-kuma/issues/5281). See the [migration guide](https://github.com/louislam/uptime-kuma/wiki/Migration-From-v1-To-v2) for more information. +- Added `dell-bios-fan-control` package and service. + +- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables. + ## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib} @@ -34,6 +45,10 @@ - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. +- The `nodejs_latest` alias now points to `nodejs_25` instead of `nodejs_24`. + +- `mold` is now wrapped by default. + ### Deprecations {#sec-nixpkgs-release-26.05-lib-deprecations} diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index ca56d8816c3a..26630b78fd73 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -86,7 +86,7 @@ If both the dependency and depending packages aren't compilers or other machine- Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source languages' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler. -Putting this all together, that means that we have dependency types of the form "X→ E", which means that the dependency executes on X and emits code for E; each of X and E can be `build`, `host`, or `target`, and E can be `*` to indicate that the dependency is not a compiler-like package. +Putting this all together, that means that we have dependency types of the form `X → E`, which means that the dependency executes on `X` and emits code for `E`; each of `X` and `E` can be `build`, `host`, or `target`, and `E` can be `*` to indicate that the dependency is not a compiler-like package. Dependency types describe the relationships that a package has with each of its transitive dependencies. You could think of attaching one or more dependency types to each of the formal parameters at the top of a package's `.nix` file, as well as to all of *their* formal parameters, and so on. Triples like `(foo, bar, baz)`, on the other hand, are a property of an instantiated derivation -- you could would attach a triple `(mips-linux, mips-linux, sparc-solaris)` to a `.drv` file in `/nix/store`. @@ -94,17 +94,17 @@ Only nine dependency types matter in practice: #### Possible dependency types {#possible-dependency-types} -| Dependency type | Dependency’s host platform | Dependency’s target platform | -|-----------------|----------------------------|------------------------------| -| build → * | build | (none) | -| build → build | build | build | -| build → host | build | host | -| build → target | build | target | -| host → * | host | (none) | -| host → host | host | host | -| host → target | host | target | -| target → * | target | (none) | -| target → target | target | target | +| Dependency type | Dependency’s host platform | Dependency’s target platform | +|-------------------|----------------------------|------------------------------| +| `build → *` | `build` | (none) | +| `build → build` | `build` | `build` | +| `build → host` | `build` | `host` | +| `build → target` | `build` | `target` | +| `host → *` | `host` | (none) | +| `host → host` | `host` | `host` | +| `host → target` | `host` | `target` | +| `target → *` | `target` | (none) | +| `target → target` | `target` | `target` | Let's use `g++` as an example to make this table clearer. `g++` is a C++ compiler written in C. Suppose we are building `g++` with a `(build, host, target)` platform triple of `(foo, bar, baz)`. This means we are using a `foo`-machine to build a copy of `g++` which will run on a `bar`-machine and emit binaries for the `baz`-machine. @@ -235,7 +235,7 @@ One would think that `localSystem` and `crossSystem` overlap horribly with the t ### Implementation of dependencies {#ssec-cross-dependency-implementation} -The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for "host → target" is called `deps` (where `host`, and `target` values are either `build`, `host`, or `target`), with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `deps` is automatically taken from `pkgs`. (These `pkgs`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time. +The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for `host → target` is called `deps` (where `host`, and `target` values are either `build`, `host`, or `target`), with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `deps` is automatically taken from `pkgs`. (These `pkgs`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time. Now, for most of Nixpkgs's history, there were no `pkgs` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 2a0b239740c0..6013436f2b8a 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -327,14 +327,14 @@ Dependency propagation takes cross compilation into account, meaning that depend To determine the exact rules for dependency propagation, we start by assigning to each dependency a couple of ternary numbers (`-1` for `build`, `0` for `host`, and `1` for `target`) representing its [dependency type](#possible-dependency-types), which captures how its host and target platforms are each "offset" from the depending derivation’s host and target platforms. The following table summarize the different combinations that can be obtained: -| `host → target` | attribute name | offset | typical purpose | -| ------------------- | ------------------- | -------- | --------------------------------------------- | -| `build --> build` | `depsBuildBuild` | `-1, -1` | compilers for build helpers | -| `build --> host` | `nativeBuildInputs` | `-1, 0` | build tools, compilers, setup hooks | -| `build --> target` | `depsBuildTarget` | `-1, 1` | compilers to build stdlibs to run on target | -| `host --> host` | `depsHostHost` | `0, 0` | compilers to build C code at runtime (rare) | -| `host --> target` | `buildInputs` | `0, 1` | libraries | -| `target --> target` | `depsTargetTarget` | `1, 1` | stdlibs to run on target | +| Dependency type | attribute name | offset | typical purpose | +| ----------------- | ------------------- | -------- | --------------------------------------------- | +| `build → build` | `depsBuildBuild` | `-1, -1` | compilers for build helpers | +| `build → host` | `nativeBuildInputs` | `-1, 0` | build tools, compilers, setup hooks | +| `build → target` | `depsBuildTarget` | `-1, 1` | compilers to build stdlibs to run on target | +| `host → host` | `depsHostHost` | `0, 0` | compilers to build C code at runtime (rare) | +| `host → target` | `buildInputs` | `0, 1` | libraries | +| `target → target` | `depsTargetTarget` | `1, 1` | stdlibs to run on target | Algorithmically, we traverse propagated inputs, accumulating every propagated dependency’s propagated dependencies and adjusting them to account for the “shift in perspective” described by the current dependency’s platform offsets. This results in a sort of transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index ad6ff2b380a8..c1876093600d 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -437,6 +437,9 @@ rec { isMacho = { kernel.execFormat = execFormats.macho; }; + isPE = { + kernel.execFormat = execFormats.pe; + }; }; # given two patterns, return a pattern which is their logical AND. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index f2e6d3b452b5..8ea8adab72c9 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -59,7 +59,11 @@ evalConfig() { local attr=$1 shift local script="import ./default.nix { modules = [ $* ];}" - local-nix-instantiate -E "$script" -A "$attr" + if [ "${ABORT_ON_WARN-0}" = "1" ]; then + local-nix-instantiate --option abort-on-warn true -E "$script" -A "$attr" + else + local-nix-instantiate -E "$script" -A "$attr" + fi } reportFailure() { @@ -495,49 +499,49 @@ checkConfigError 'The option .mergedName. in .*\.nix. is already declared in .*\ # - non-merged types # - nestedTypes elemType # attrsWith -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # listOf -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # unique / uniq -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # nullOr -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # functionTo -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # coercedTo # Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType' -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix # either -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ @@ -575,24 +579,24 @@ checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix # Regression of either, due to freeform not beeing checked previously checkConfigOutput '^"foo"$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix checkConfigOutput '^"foo"$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix checkConfigOutput '^"foo"$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix checkConfigOutput '^"foo"$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix checkConfigOutput '^42$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix checkConfigOutput '^42$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix checkConfigOutput '^42$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix checkConfigOutput '^42$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix -NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix +ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix # Value OK: Fail if a warning is emitted -NIX_ABORT_ON_WARN=1 checkConfigOutput "^42$" config.number.int ./freeform-attrsof-either.nix +ABORT_ON_WARN=1 checkConfigOutput "^42$" config.number.int ./freeform-attrsof-either.nix ## types.anything diff --git a/maintainers/README.md b/maintainers/README.md index f06d4f221d51..dee6bde1fae9 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -51,7 +51,7 @@ The maintainer is welcome to come back at any time. When a pull request is made against a package, nixpkgs CI will notify the appropriate maintainer(s) by trying to correlate the files the PR touches with the packages that need rebuilding. This process is subject to error however, so we encourage PR authors to notify the appropriate people. -Maintainers can also invoke the [nixpkgs-merge-bot](https://github.com/nixos/nixpkgs-merge-bot) to merge pull requests targeting packages they are the maintainer of, which satisfy the current security [constraints](https://github.com/NixOS/nixpkgs-merge-bot/blob/main/README.md#constraints). +Maintainers can also invoke the [nixpkgs-merge-bot](../ci/README.md#nixpkgs-merge-bot) to merge pull requests targeting packages they are the maintainer of, which satisfy the current security [constraints](../ci/README.md#merge-bot-constraints). Examples: [#397273](https://github.com/NixOS/nixpkgs/pull/397273#issuecomment-2789382120) and [#377027](https://github.com/NixOS/nixpkgs/pull/377027#issuecomment-2614510869) New maintainers will automatically get invited to join the [NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers) GitHub team. diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 77f68a37f2ff..578c91d2008b 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -49,8 +49,7 @@ "ethercrow": 222467, "groodt": 343415, "kalbasit": 87115, - "mboes": 51356, - "uri-canva": 33242106 + "mboes": 51356 }, "name": "Bazel" }, @@ -61,7 +60,6 @@ "happysalada": 5317234 }, "members": { - "Br1ght0ne": 12615679, "DianaOlympos": 15774340, "adamcstephens": 2071575, "ankhers": 750786, @@ -146,7 +144,6 @@ "peterhoeg": 722550 }, "members": { - "Br1ght0ne": 12615679, "manveru": 3507 }, "name": "crystal-lang" @@ -261,7 +258,6 @@ "thefloweringash": 42933, "tricktron": 16036882, "uncenter": 47499684, - "uri-canva": 33242106, "usertam": 22500027, "veprbl": 245573, "viraptor": 188063, @@ -501,7 +497,6 @@ }, "members": { "cpages": 411324, - "edwtjo": 54799, "minijackson": 1200507, "peterhoeg": 722550, "sephalon": 893474 @@ -529,7 +524,6 @@ "members": { "K900": 386765, "Ma27": 6025220, - "NeQuissimus": 628342, "TredwellGit": 61860346 }, "name": "Linux kernel" @@ -898,9 +892,7 @@ "winterqt": 78392041, "zowoq": 59103226 }, - "members": { - "tjni": 3806110 - }, + "members": {}, "name": "rust" }, "scala": { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7fa4083b18a0..201ac697ce55 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -374,6 +374,11 @@ githubId = 22131756; name = "Aaqa Ishtyaq"; }; + aaravrav = { + name = "aaravrav"; + github = "aaravrav"; + githubId = 3279912; + }; aarnphm = { email = "contact@aarnphm.xyz"; github = "aarnphm"; @@ -800,6 +805,12 @@ githubId = 1141462; name = "Vladyslav Pekker"; }; + agustinmista = { + email = "agustin@mista.me"; + github = "agustinmista"; + githubId = 5265348; + name = "Agustin Mista"; + }; agvantibo = { email = "apicalium@gmail.com"; github = "agvantibo-again"; @@ -1625,6 +1636,13 @@ githubId = 24651767; name = "Felix Andreas"; }; + andreashgk = { + name = "andreashgk"; + email = "andreas@hgk.me"; + github = "andreashgk"; + githubId = 36563463; + keys = [ { fingerprint = "E1C1 693D 0FF7 E8FD 73F2 C145 A894 A279 2F01 5C46"; } ]; + }; andreasvoss = { name = "andreasvoss"; email = "andreas@anvo.dk"; @@ -3112,6 +3130,12 @@ githubId = 354230; name = "Benjamin Esham"; }; + bdim404 = { + email = "i@bdim.moe"; + github = "bdim404"; + githubId = 102711645; + name = "bdim"; + }; bdimcheff = { email = "brandon@dimcheff.com"; github = "bdimcheff"; @@ -3385,12 +3409,6 @@ githubId = 45831883; name = "Brieuc Dubois"; }; - bhipple = { - email = "bhipple@protonmail.com"; - github = "bhipple"; - githubId = 2071583; - name = "Benjamin Hipple"; - }; bhougland = { email = "benjamin.hougland@gmail.com"; github = "bhougland18"; @@ -3748,13 +3766,6 @@ githubId = 140968250; keys = [ { fingerprint = "8321 ED3A 8DB9 99A5 1F3B F80F F268 2914 EA42 DE26"; } ]; }; - Br1ght0ne = { - email = "brightone@protonmail.com"; - github = "Br1ght0ne"; - githubId = 12615679; - name = "Oleksii Filonenko"; - keys = [ { fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; } ]; - }; br337 = { email = "brian.porumb@proton.me"; github = "br337"; @@ -4916,6 +4927,17 @@ githubId = 9336788; name = "Claes Hallström"; }; + claymorwan = { + name = "claymorwan"; + github = "claymorwan"; + githubId = 86072589; + email = "claymorwan@fembois.dev"; + keys = [ + { + fingerprint = "AA7C 29C3 A26A DB2F 80E5 294D CC5E 1DF0 6FB7 8249"; + } + ]; + }; clebs = { email = "borja.clemente@gmail.com"; github = "clebs"; @@ -6440,6 +6462,12 @@ githubId = 17111639; name = "Devin Singh"; }; + devoid = { + name = "Scott Devoid"; + email = "nixpkgs-github@d3void.net"; + github = "devoid"; + githubId = 581597; + }; devplayer0 = { email = "dev@nul.ie"; github = "devplayer0"; @@ -7419,12 +7447,6 @@ githubId = 494483; name = "Michael Francis"; }; - edwtjo = { - email = "ed@cflags.cc"; - github = "edwtjo"; - githubId = 54799; - name = "Edward Tjörnhammar"; - }; eeedean = { github = "eeedean"; githubId = 8173116; @@ -8242,6 +8264,11 @@ githubId = 175898536; keys = [ { fingerprint = "4319 2667 85A9 E6BD 9A84 4BC7 1313 15C2 0524 200C"; } ]; }; + ezratweaver = { + name = "Ezra Weaver"; + github = "ezratweaver"; + githubId = 101545981; + }; ezrizhu = { name = "Ezri Zhu"; email = "me@ezrizhu.com"; @@ -9216,12 +9243,6 @@ githubId = 57430880; name = "Gustavo Araiza"; }; - garbas = { - email = "rok@garbas.si"; - github = "garbas"; - githubId = 20208; - name = "Rok Garbas"; - }; gardspirito = { name = "gardspirito"; email = "nyxoroso@gmail.com"; @@ -9663,6 +9684,12 @@ githubId = 58785758; name = "Tim Lanzinger"; }; + gonsolo = { + email = "gonsolo@gmail.com"; + github = "gonsolo"; + githubId = 2041764; + name = "Andreas Wendleder"; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; @@ -9700,6 +9727,12 @@ githubId = 6375438; keys = [ { fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; } ]; }; + govindsi = { + email = "govind.sk85@gmail.com"; + github = "govindsi"; + githubId = 8924200; + name = "Govind Singh"; + }; gp2112 = { email = "me@guip.dev"; github = "gp2112"; @@ -10614,12 +10647,6 @@ githubId = 137852; name = "Hraban Luyat"; }; - hrdinka = { - email = "c.nix@hrdinka.at"; - github = "hrdinka"; - githubId = 1436960; - name = "Christoph Hrdinka"; - }; hrhino = { email = "hora.rhino@gmail.com"; github = "hrhino"; @@ -11577,12 +11604,6 @@ githubId = 10690970; name = "James Duff"; }; - jagajaga = { - email = "ars.seroka@gmail.com"; - github = "jagajaga"; - githubId = 2179419; - name = "Arseniy Seroka"; - }; jakecleary = { email = "shout@jakecleary.net"; github = "jakecleary"; @@ -13510,6 +13531,12 @@ name = "Kevin Cox"; keys = [ { fingerprint = "B66B 891D D83B 0E67 7D84 FC30 9BB9 2CC1 552E 99AA"; } ]; }; + kevingimbel = { + email = "kevin@gimbel.dev"; + github = "KevinGimbel"; + githubId = 2161714; + name = "Kevin Gimbel"; + }; kevingriffin = { email = "me@kevin.jp"; github = "kevingriffin"; @@ -13931,6 +13958,12 @@ githubId = 36413794; name = "Arek Kalandyk"; }; + korken89 = { + email = "emil.fresk@gmail.com"; + github = "korken89"; + githubId = 913109; + name = "Emil Fresk"; + }; koschi13 = { email = "maximilian.konter@protonmail.com"; github = "koschi13"; @@ -15056,14 +15089,6 @@ githubId = 88983487; name = "Loïc Reynier"; }; - lom = { - email = "legendofmiracles@protonmail.com"; - matrix = "@legendofmiracles:matrix.org"; - github = "legendofmiracles"; - githubId = 30902201; - name = "legendofmiracles"; - keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ]; - }; lomenzel = { name = "Leonard-Orlando Menzel"; email = "leonard.menzel@tutanota.com"; @@ -15215,12 +15240,6 @@ githubId = 5341193; name = "Leon Schuermann"; }; - lsix = { - email = "lsix@lancelotsix.com"; - github = "lsix"; - githubId = 724339; - name = "Lancelot SIX"; - }; ltavard = { email = "laure.tavard@univ-grenoble-alpes.fr"; github = "ltavard"; @@ -15278,6 +15297,12 @@ githubId = 15693688; name = "Lucas Eduardo Wendt"; }; + lucasfa = { + name = "Lucas Fehlau Arbulu"; + githubId = 23667494; + github = "LucasFA"; + matrix = "@lucasfa:matrix.org"; + }; lucastso10 = { email = "lucastso10@gmail.com"; github = "lucastso10"; @@ -15290,6 +15315,12 @@ githubId = 1104419; name = "Lucas Hoffmann"; }; + luckshiba = { + email = "luckshiba@protonmail.com"; + github = "luckshiba"; + githubId = 43530291; + name = "LuckShiba"; + }; lucperkins = { email = "lucperkins@gmail.com"; github = "lucperkins"; @@ -17123,6 +17154,12 @@ githubId = 5378535; name = "Milo Gertjejansen"; }; + milomc123 = { + email = "contact@milo.zip"; + github = "milomc123"; + githubId = 33701036; + name = "Milo Mc"; + }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; @@ -18356,12 +18393,6 @@ githubId = 1771772; name = "Alexander Ben Nasrallah"; }; - nequissimus = { - email = "tim@nequissimus.com"; - github = "NeQuissimus"; - githubId = 628342; - name = "Tim Steinbach"; - }; nerdypepper = { email = "nerdy@peppe.rs"; github = "oppiliappan"; @@ -18850,6 +18881,12 @@ githubId = 41154684; name = "nokazn"; }; + nolith = { + github = "nolith"; + githubId = 78752; + name = "Alessio Caiazza"; + matrix = "@alessio:caiazza.info"; + }; nomaterials = { email = "nomaterials@gmail.com"; github = "no-materials"; @@ -19206,6 +19243,12 @@ email = "nyu@nyuku.ru"; githubId = 97425873; }; + nyxonios = { + name = "nyxonios"; + github = "Nyxonios"; + email = "martin.n.seller@gmail.com"; + githubId = 18164197; + }; nzbr = { email = "nixos@nzbr.de"; github = "nzbr"; @@ -20175,11 +20218,12 @@ name = "pentane"; keys = [ { fingerprint = "4231 75F6 8360 68C8 2ACB AEDA 63F4 EC2F FE55 0874"; } ]; }; - perchun = { + PerchunPak = { name = "Perchun Pak"; email = "nixpkgs@perchun.it"; github = "PerchunPak"; githubId = 68118654; + keys = [ { fingerprint = "BBB5 1142 959D 8549 A3D2 F6C5 313F 67D1 EAB7 70F9"; } ]; }; peret = { name = "Peter Retzlaff"; @@ -22143,6 +22187,11 @@ githubId = 13792812; name = "James Leitch"; }; + rickyelopez = { + github = "rickyelopez"; + githubId = 31072564; + name = "Ricky"; + }; rickynils = { email = "rickynils@gmail.com"; github = "rickynils"; @@ -23140,12 +23189,6 @@ github = "SandaruKasa"; githubId = 50824690; }; - sander = { - email = "s.vanderburg@tudelft.nl"; - github = "svanderburg"; - githubId = 1153271; - name = "Sander van der Burg"; - }; sandptel = { email = "sandppatel15@gmail.com"; github = "sandptel"; @@ -24882,7 +24925,7 @@ stepbrobd = { name = "Yifei Sun"; email = "ysun@hey.com"; - matrix = "@stepbrobd:matrix.org"; + matrix = "@ysun:beeper.com"; github = "stepbrobd"; githubId = 81826728; }; @@ -26366,14 +26409,6 @@ githubId = 36288711; name = "Tim Keller"; }; - tjni = { - email = "43ngvg@masqt.com"; - matrix = "@tni:matrix.org"; - name = "Theodore Ni"; - github = "tjni"; - githubId = 3806110; - keys = [ { fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; } ]; - }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; @@ -27139,12 +27174,6 @@ githubId = 771193; name = "Matej Urbas"; }; - uri-canva = { - email = "uri@canva.com"; - github = "uri-canva"; - githubId = 33242106; - name = "Uri Baghin"; - }; urlordjames = { email = "urlordjames@gmail.com"; github = "urlordjames"; @@ -27887,6 +27916,12 @@ name = "Han Verstraete"; keys = [ { fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; } ]; }; + wenbin-liu = { + name = "wenbin-liu"; + email = "wenbin_liu@outlook.com"; + github = "wenbin-liu"; + githubId = 25171141; + }; wenjinnn = { name = "wenjin"; email = "hewenjin94@outlook.com"; @@ -28779,6 +28814,12 @@ githubId = 40352765; name = "Yoctocell"; }; + YodaDaCoda = { + email = "pickeringw@gmail.com"; + github = "YodaDaCoda"; + githubId = 365349; + name = "William Brockhus"; + }; yogansh = { email = "yogansh@yogansh.tech"; github = "YoganshSharma"; @@ -29004,12 +29045,6 @@ githubId = 62440012; name = "Zain Kergaye"; }; - zakame = { - email = "zakame@zakame.net"; - github = "zakame"; - githubId = 110625; - name = "Zak B. Elep"; - }; zakkor = { email = "edward.dalbon@gmail.com"; github = "zakkor"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1766ae022e3a..d7bd0f8d3e0b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -79,7 +79,6 @@ with lib.maintainers; bazel = { members = [ mboes - uri-canva cbley olebedev groodt @@ -342,6 +341,10 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + feel-co = { + github = "feel-co"; + }; + flutter = { enableFeatureFreezePing = false; github = "flutter"; @@ -396,7 +399,6 @@ with lib.maintainers; gitlab = { members = [ - globin krav leona talyz @@ -491,7 +493,6 @@ with lib.maintainers; jetbrains = { members = [ - edwtjo leona theCapypara thiagokokada @@ -531,7 +532,6 @@ with lib.maintainers; aanderse cpages dschrempf - edwtjo kazenyuk minijackson peterhoeg @@ -547,8 +547,6 @@ with lib.maintainers; libretro = { members = [ aanderse - edwtjo - hrdinka thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; @@ -788,7 +786,6 @@ with lib.maintainers; members = [ sgo marcusramberg - zakame ]; scope = "Maintain the Perl interpreter and Perl packages."; shortName = "Perl"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 2ff367f20ebd..d7fe84cbf70e 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -922,7 +922,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 - [frp](https://github.com/fatedier/frp), a fast reverse proxy to help you expose a local server behind a NAT or firewall to the Internet. Available as - [services.frp](#opt-services.frp.enable). + `services.frp`. - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as `programs.river`. diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 0f7e00d6cb11..706b4839a640 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -10,7 +10,11 @@ -- Create the first release note entry in this section! +- [knot-resolver](https://www.knot-resolver.cz/) in version 6. Available as `services.knot-resolver`. A module for knot-resolver 5 was already available as `services.kresd`. + +- [ImmichFrame](https://immichframe.dev/), display your photos from Immich as a digital photo frame. Available as `services.immichframe`. + +- [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`. ## Backward Incompatibilities {#sec-release-26.05-incompatibilities} @@ -22,4 +26,6 @@ -- Create the first release note entry in this section! +- `services.frp` now supports multiple instances through `services.frp.instances` to make it possible to run multiple frp clients or servers at the same time. + +- `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix. diff --git a/nixos/lib/binfmt-magics.nix b/nixos/lib/binfmt-magics.nix new file mode 100644 index 000000000000..0d8ae95d73d1 --- /dev/null +++ b/nixos/lib/binfmt-magics.nix @@ -0,0 +1,112 @@ +{ + armv6l-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; + }; + armv7l-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; + }; + aarch64-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; + }; + aarch64_be-linux = { + magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + i386-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + i486-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + i586-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + i686-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + x86_64-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + alpha-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + sparc64-linux = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + sparc-linux = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + powerpc-linux = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + powerpc64-linux = { + magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + powerpc64le-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00''; + }; + mips-linux = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + }; + mipsel-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; + }; + mips64-linux = { + magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + mips64el-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + mips64-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + }; + mips64el-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; + }; + riscv32-linux = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + riscv64-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + loongarch64-linux = { + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + wasm32-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; + wasm64-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; + s390x-linux = { + magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + }; + x86_64-windows.magicOrExtension = "MZ"; + i686-windows.magicOrExtension = "MZ"; +} diff --git a/nixos/lib/test-driver/src/test_driver/vlan.py b/nixos/lib/test-driver/src/test_driver/vlan.py index 03ecbe25e8a2..89ca33165b4d 100644 --- a/nixos/lib/test-driver/src/test_driver/vlan.py +++ b/nixos/lib/test-driver/src/test_driver/vlan.py @@ -1,12 +1,43 @@ +import datetime as dt +import fcntl import io import os -import pty +import select import subprocess +import typing from pathlib import Path from test_driver.logger import AbstractLogger +def readline_with_timeout( + readable: typing.IO[str], timeout: dt.timedelta +) -> typing.Generator[str]: + """ + Read a line from `readable` within the given `timeout`, otherwise raises `TimeoutError`. + + Note: while the generator is running, `readable` will be in nonblocking mode. + """ + fd = readable.fileno() + og_flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, og_flags | os.O_NONBLOCK) + + try: + while True: + ready, _, _ = select.select([readable], [], [], timeout.total_seconds()) + if len(ready) == 0: + raise TimeoutError() + + # Under the hood, `readline` may read more than one line from the file descriptor, + # so we cannot just return to the `select`, as it may block, despite there being more + # lines buffered. So, read all the lines before returning to the select. This only + # works if the file descriptor is in non-blocking mode! + while line := readable.readline(): + yield line + finally: + fcntl.fcntl(fd, fcntl.F_SETFL, og_flags) + + class VLan: """This class handles a VLAN that the run-vm scripts identify via its number handles. The network's lifetime equals the object's lifetime. @@ -33,33 +64,62 @@ class VLan: os.environ[f"QEMU_VDE_SOCKET_{self.nr}"] = str(self.socket_dir) self.logger.info("start vlan") - pty_master, pty_slave = pty.openpty() - # The --hub is required for the scenario determined by - # nixos/tests/networking.nix vlan-ping. - # VLAN Tagged traffic (802.1Q) seams to be blocked if a vde_switch is - # used without the hub mode (flood packets to all ports). self.process = subprocess.Popen( - ["vde_switch", "-s", self.socket_dir, "--dirmode", "0700", "--hub"], - stdin=pty_slave, + [ + "vde_switch", + "--sock", + self.socket_dir, + "--dirmode", + "0700", + # The --hub is required for the scenario determined by + # nixos/tests/networkd-and-scripted.nix vlan-ping. + # VLAN Tagged traffic (802.1Q) seems to be blocked if a vde_switch is + # used without the hub mode (flood packets to all ports). + "--hub", + ], + bufsize=1, # Line buffered. + stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - shell=False, + stderr=None, # Do not swallow stderr. + text=True, ) self.pid = self.process.pid - self.fd = os.fdopen(pty_master, "w") - self.fd.write("version\n") - # TODO: perl version checks if this can be read from - # an if not, dies. we could hang here forever. Fix it. + assert self.process.stdin is not None + self.process.stdin.write("showinfo\n") + + # showinfo's output looks like this: + # + # ``` + # vde$ showinfo + # 0000 DATA END WITH '.' + # VDE switch V.2.3.3 + # (C) Virtual Square Team (coord. R. Davoli) 2005,2006,2007 - GPLv2 + # + # pid 82406 MAC 00:ff:62:25:47:55 uptime 45 + # . + # 1000 Success + # ``` + # + # We read past all the output until we get to the `1000 Success`. + # This serves 2 purposes: + # 1. It's a nice sanity check that `vde_switch` is actually working. + # 2. By the time we're done, `vde_switch` will have created the + # `ctl` socket in `socket_dir`, so we don't have to wait for it to exist. assert self.process.stdout is not None - self.process.stdout.readline() - if not (self.socket_dir / "ctl").exists(): - self.logger.error("cannot start vde_switch") + for line in readline_with_timeout( + self.process.stdout, timeout=dt.timedelta(seconds=5) + ): + if "1000 Success" in line: + break + + assert (self.socket_dir / "ctl").exists(), "cannot start vde_switch" self.logger.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") def stop(self) -> None: self.logger.info(f"kill vlan (pid {self.pid})") - self.fd.close() + assert self.process.stdin is not None + self.process.stdin.close() self.process.terminate() diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 08678f5a6d00..5a3e09261059 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -533,6 +533,14 @@ let units = import ./systemd-network-units.nix { inherit lib systemdUtils; }; }; }; + + /* + Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from: + - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix + and + - https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh + */ + binfmtMagics = import ./binfmt-magics.nix; }; in utils diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 12b4a6453449..449a08a97b61 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -119,7 +119,7 @@ in pkgs = lib.mkOption { defaultText = lib.literalExpression '' import "''${nixos}/.." { - inherit (cfg) config overlays localSystem crossSystem; + inherit (config.nixpkgs) config overlays localSystem crossSystem; } ''; type = pkgsType; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 50323f0dd888..febd3a3548b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./programs/direnv.nix ./programs/dmrconfig.nix ./programs/droidcam.nix + ./programs/dsearch.nix ./programs/dublin-traceroute.nix ./programs/ecryptfs.nix ./programs/environment.nix @@ -340,6 +341,7 @@ ./programs/vivid.nix ./programs/vscode.nix ./programs/wavemon.nix + ./programs/wayland/dms-shell.nix ./programs/wayland/dwl.nix ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix @@ -605,6 +607,7 @@ ./services/development/zammad.nix ./services/display-managers/cosmic-greeter.nix ./services/display-managers/default.nix + ./services/display-managers/dms-greeter.nix ./services/display-managers/gdm.nix ./services/display-managers/greetd.nix ./services/display-managers/lemurs.nix @@ -648,6 +651,7 @@ ./services/hardware/buffyboard.nix ./services/hardware/ddccontrol.nix ./services/hardware/deepcool-digital-linux.nix + ./services/hardware/dell-bios-fan-control.nix ./services/hardware/display.nix ./services/hardware/fancontrol.nix ./services/hardware/freefall.nix @@ -1228,6 +1232,7 @@ ./services/networking/keepalived/default.nix ./services/networking/keybase.nix ./services/networking/kismet.nix + ./services/networking/knot-resolver.nix ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix @@ -1399,6 +1404,7 @@ ./services/networking/trickster.nix ./services/networking/twingate.nix ./services/networking/ucarp.nix + ./services/networking/udp-over-tcp.nix ./services/networking/umurmur.nix ./services/networking/unbound.nix ./services/networking/unifi.nix @@ -1628,8 +1634,10 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix + ./services/web-apps/immich-kiosk.nix ./services/web-apps/immich-public-proxy.nix ./services/web-apps/immich.nix + ./services/web-apps/immichframe.nix ./services/web-apps/invidious.nix ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix @@ -1727,6 +1735,7 @@ ./services/web-apps/suwayomi-server.nix ./services/web-apps/szurubooru.nix ./services/web-apps/trilium.nix + ./services/web-apps/tt-rss.nix ./services/web-apps/tuliprox.nix ./services/web-apps/umami.nix ./services/web-apps/vikunja.nix diff --git a/nixos/modules/programs/bandwhich.nix b/nixos/modules/programs/bandwhich.nix index 2136a84c3209..ff1f4801c5bb 100644 --- a/nixos/modules/programs/bandwhich.nix +++ b/nixos/modules/programs/bandwhich.nix @@ -9,7 +9,6 @@ let cfg = config.programs.bandwhich; in { - meta.maintainers = with lib.maintainers; [ Br1ght0ne ]; options = { programs.bandwhich = { diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix new file mode 100644 index 000000000000..c6d7509c91dd --- /dev/null +++ b/nixos/modules/programs/dsearch.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + types + ; + + cfg = config.programs.dsearch; +in +{ + options.programs.dsearch = { + enable = mkEnableOption "dsearch, a fast filesystem search service with fuzzy matching"; + + package = mkPackageOption pkgs "dsearch" { }; + + systemd = { + enable = mkEnableOption "systemd user service for dsearch" // { + default = true; + }; + + target = mkOption { + type = types.str; + default = "default.target"; + description = '' + The systemd target that will automatically start the dsearch service. + + By default, dsearch starts with the user session (`default.target`). + You can change this to `graphical-session.target` if you only want + it to run in graphical sessions. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.packages = [ cfg.package ]; + + systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix index f50e7a9dcea9..d40c445b2f6b 100644 --- a/nixos/modules/programs/nh.nix +++ b/nixos/modules/programs/nh.nix @@ -10,6 +10,7 @@ in { meta.maintainers = with lib.maintainers; [ NotAShelf + mdaniels5757 viperML ]; diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 0fcf75d75c1a..713cc69b0040 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -29,7 +29,12 @@ let setw -g pane-base-index ${toString cfg.baseIndex} set -g history-limit ${toString cfg.historyLimit} - ${optionalString cfg.newSession "new-session"} + ${optionalString cfg.newSession '' + # Use -A to make new-session idempotent: attach if session "0" exists, + # otherwise create it. This prevents duplicate sessions when multiple + # configs (e.g., system and user) both enable newSession. + new-session -A -s 0 + ''} ${optionalString cfg.reverseSplit '' bind v split-window -h diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix new file mode 100644 index 000000000000..a49330fddcf5 --- /dev/null +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -0,0 +1,202 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + types + optional + optionals + ; + + cfg = config.programs.dms-shell; + + optionalPackages = + optionals cfg.enableSystemMonitoring [ pkgs.dgop ] + ++ optionals cfg.enableClipboard [ + pkgs.cliphist + pkgs.wl-clipboard + ] + ++ optionals cfg.enableVPN [ + pkgs.glib + pkgs.networkmanager + ] + ++ optional cfg.enableBrightnessControl pkgs.brightnessctl + ++ optional cfg.enableColorPicker pkgs.hyprpicker + ++ optional cfg.enableDynamicTheming pkgs.matugen + ++ optional cfg.enableAudioWavelength pkgs.cava + ++ optional cfg.enableCalendarEvents pkgs.khal + ++ optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia; +in +{ + options.programs.dms-shell = { + enable = mkEnableOption "DankMaterialShell, a complete desktop shell for Wayland compositors"; + + package = mkPackageOption pkgs "dms-shell" { }; + + systemd = { + target = mkOption { + type = types.str; + default = "graphical-session.target"; + description = '' + The systemd target that will automatically start the DankMaterialShell service. + + Common targets include: + - `graphical-session.target` for most desktop environments + - `wayland-session.target` for Wayland-specific sessions + ''; + }; + + restartIfChanged = mkOption { + type = types.bool; + default = true; + description = '' + Whether to restart the dms.service when the DankMaterialShell package or + configuration changes. This ensures the latest version is always running + after a system rebuild. + ''; + }; + }; + + enableSystemMonitoring = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for system monitoring widgets. + This includes process list viewers and system resource monitors. + + Requires: dgop + ''; + }; + + enableClipboard = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for clipboard management widgets. + This enables clipboard history and clipboard manager functionality. + + Requires: cliphist, wl-clipboard + ''; + }; + + enableVPN = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for VPN widgets. + This enables VPN status monitoring and management through NetworkManager. + + Requires: glib, networkmanager + ''; + }; + + enableBrightnessControl = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for brightness and backlight control. + This enables screen brightness adjustment widgets. + + Requires: brightnessctl + ''; + }; + + enableColorPicker = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for color picking functionality. + This enables on-screen color picker tools. + + Requires: hyprpicker + ''; + }; + + enableDynamicTheming = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for dynamic theming support. + This enables automatic theme generation based on wallpapers and other sources. + + Requires: matugen + ''; + }; + + enableAudioWavelength = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for audio wavelength visualization. + This enables audio spectrum and waveform visualizer widgets. + + Requires: cava + ''; + }; + + enableCalendarEvents = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for calendar events support. + This enables calendar widgets that display events and reminders via khal. + + Requires: khal + ''; + }; + + enableSystemSound = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for system sound support. + This enables audio playback for system notifications and events. + + Requires: qtmultimedia + ''; + }; + + quickshell = { + package = mkPackageOption pkgs "quickshell" { }; + }; + }; + + config = mkIf cfg.enable { + environment.etc."xdg/quickshell/dms".source = "${cfg.package}/share/quickshell/dms"; + + systemd.packages = [ cfg.package ]; + + systemd.user.services.dms = { + wantedBy = [ cfg.systemd.target ]; + restartTriggers = optional cfg.systemd.restartIfChanged "${cfg.package}/share/quickshell/dms"; + path = lib.mkForce [ ]; + }; + + environment.systemPackages = [ + cfg.package + cfg.quickshell.package + pkgs.ddcutil + pkgs.libsForQt5.qt5ct + pkgs.kdePackages.qt6ct + ] + ++ optionalPackages; + + fonts.packages = with pkgs; [ + fira-code + inter + material-symbols + ]; + + hardware.graphics.enable = lib.mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/modules/programs/wayland/niri.nix b/nixos/modules/programs/wayland/niri.nix index b571326acd9b..58b36fe42ab8 100644 --- a/nixos/modules/programs/wayland/niri.nix +++ b/nixos/modules/programs/wayland/niri.nix @@ -23,9 +23,10 @@ in { environment.systemPackages = [ cfg.package - ] + ]; + # Required for xdg-desktop-portal-gnome's FileChooser to work properly - ++ lib.optionals cfg.useNautilus [ + services.dbus.packages = lib.mkIf cfg.useNautilus [ pkgs.nautilus ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 5733f0b4bf9c..8b9a1c998520 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -290,9 +290,6 @@ in (mkRemovedOptionModule [ "services" "sourcehut" ] '' The sourcehut packages and the corresponding module have been removed due to being broken and unmaintained. '') - (mkRemovedOptionModule [ "services" "tt-rss" ] '' - The tt-rss package and module have been removed, since upstream development ceased 2025-11-01 and the source is no longer available officially. - '') (mkRemovedOptionModule [ "services" "tvheadend" ] "The tvheadend package and the corresponding module have been removed as nobody was willing to maintain them and they were stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version." ) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index ed00c3ada42f..7ec3cab55c99 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -206,5 +206,4 @@ in ) cfg.params; }; - meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index c3c0a1a4975d..89f96a2fbb59 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -128,11 +128,9 @@ in lib.mkIf config.confinement.enable { serviceConfig = { ReadOnlyPaths = [ "+/" ]; - RuntimeDirectory = [ "confinement/${mkPathSafeName name}" ]; - RootDirectory = "/run/confinement/${mkPathSafeName name}"; - InaccessiblePaths = [ - "-+/run/confinement/${mkPathSafeName name}" - ]; + RuntimeDirectory = [ "confinement/%n" ]; + RootDirectory = "/run/confinement/%n"; + InaccessiblePaths = [ "-+/run/confinement/%n" ]; PrivateMounts = lib.mkDefault true; # https://github.com/NixOS/nixpkgs/issues/14645 is a future attempt diff --git a/nixos/modules/services/audio/pulseaudio.nix b/nixos/modules/services/audio/pulseaudio.nix index b4ef09f49760..8f1bfb98cd08 100644 --- a/nixos/modules/services/audio/pulseaudio.nix +++ b/nixos/modules/services/audio/pulseaudio.nix @@ -36,6 +36,7 @@ let a = cfg.tcp.anonymousClients.allowedIpRanges; in lib.optional (a != [ ]) ''auth-ip-acl=${lib.concatStringsSep ";" a}''; + port = lib.optional (!(isNull cfg.tcp.port)) "port=${toString cfg.tcp.port}"; in pkgs.writeTextFile { name = "default.pa"; @@ -44,7 +45,7 @@ let ${addModuleIf cfg.zeroconf.publish.enable "module-zeroconf-publish"} ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"} ${addModuleIf cfg.tcp.enable ( - lib.concatStringsSep " " ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon) + lib.concatStringsSep " " ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon ++ port) )} ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"} ${addModuleIf config.services.jack.jackd.enable "module-jack-source"} @@ -205,6 +206,19 @@ in # TODO: enable by default? tcp = { enable = lib.mkEnableOption "tcp streaming support"; + openFirewall = lib.mkEnableOption "Open firewall for the specified port"; + + port = lib.mkOption { + type = lib.types.nullOr lib.types.port; + description = '' + TCP connection port. The default `null` value, means + pulseaudio will try to use the default 4713 port, but if it is + occupied, it will fallback to a random port. + ''; + # Per https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Network/#directconnection + example = 4713; + default = null; + }; anonymousClients = { allowAll = lib.mkEnableOption "all anonymous clients to stream to the server"; @@ -226,6 +240,12 @@ in config = lib.mkIf cfg.enable ( lib.mkMerge [ { + assertions = [ + { + assertion = cfg.tcp.openFirewall -> (!isNull cfg.tcp.port); + message = "If you wish to open the firewall for the Pulseaudio's tcp.port, set the port explicitly"; + } + ]; environment.etc."pulse/client.conf".source = clientConf; environment.systemPackages = [ overriddenPackage ]; @@ -280,6 +300,9 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; }) + (lib.mkIf cfg.tcp.openFirewall { + networking.firewall.allowedTCPPorts = [ cfg.tcp.port ]; + }) (lib.mkIf (!cfg.systemWide) { environment.etc = { diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c92ec2508490..157a6c6b84e3 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -479,12 +479,12 @@ in isSystemUser = true; group = redisName name; } - ) enabledServers; + ) (lib.filterAttrs (name: conf: conf.user == redisName name) enabledServers); users.groups = lib.mapAttrs' ( name: conf: lib.nameValuePair (redisName name) { } - ) enabledServers; + ) (lib.filterAttrs (name: conf: conf.group == redisName name) enabledServers); systemd.services = lib.mapAttrs' ( name: conf: diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 53bb1ab59830..3ff94c3d4b96 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -229,6 +229,7 @@ in SystemCallFilter = [ "@system-service" "~@privileged" + "mincore" ]; }; diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 99326ad5a24e..9f13a2eb7c76 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -328,9 +328,19 @@ in enable = true; package = kdePackages.kwallet-pam; }; + # "kde" must not have fingerprint authentication otherwise it can block password login. + # See https://github.com/NixOS/nixpkgs/issues/239770 and https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/163. + fprintAuth = false; + p11Auth = false; + }; + kde-fingerprint = lib.mkIf config.services.fprintd.enable { + fprintAuth = true; + p11Auth = false; + }; + kde-smartcard = lib.mkIf config.security.pam.p11.enable { + p11Auth = true; + fprintAuth = false; }; - kde-fingerprint = lib.mkIf config.services.fprintd.enable { fprintAuth = true; }; - kde-smartcard = lib.mkIf config.security.pam.p11.enable { p11Auth = true; }; }; security.wrappers = { diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix new file mode 100644 index 000000000000..1355291516fa --- /dev/null +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -0,0 +1,261 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + mkEnableOption + mkOption + mkIf + mkDefault + mkPackageOption + literalExpression + getExe + makeBinPath + optionalString + concatMapStringsSep + ; + + cfg = config.services.displayManager.dms-greeter; + cfgAutoLogin = config.services.displayManager.autoLogin; + + greeterScript = pkgs.writeShellScriptBin "dms-greeter-start" '' + export PATH=$PATH:${ + makeBinPath [ + cfg.quickshell.package + config.programs.${cfg.compositor.name}.package + ] + } + exec ${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ + --command ${cfg.compositor.name} \ + -p ${cfg.package}/share/quickshell/dms \ + --cache-dir /var/lib/dms-greeter \ + ${ + optionalString ( + cfg.compositor.customConfig != "" + ) "-C ${pkgs.writeText "dms-greeter-compositor-config" cfg.compositor.customConfig}" + } \ + ${optionalString cfg.logs.save ">> ${cfg.logs.path} 2>&1"} + ''; + + configFilesFromHome = + if cfg.configHome != null then + [ + "${cfg.configHome}/.config/DankMaterialShell/settings.json" + "${cfg.configHome}/.local/state/DankMaterialShell/session.json" + "${cfg.configHome}/.cache/DankMaterialShell/dms-colors.json" + ] + else + [ ]; +in +{ + options.services.displayManager.dms-greeter = { + enable = mkEnableOption "DankMaterialShell greeter"; + + package = mkPackageOption pkgs "dms-shell" { }; + + compositor = { + name = mkOption { + type = types.enum [ + "niri" + "hyprland" + "sway" + ]; + example = "niri"; + description = '' + The Wayland compositor to run the greeter in. + + The specified compositor must be enabled via its corresponding + `programs..enable` option. + + Supported compositors: + - niri: A scrollable-tiling Wayland compositor + - hyprland: A dynamic tiling Wayland compositor + - sway: An i3-compatible Wayland compositor + ''; + }; + + customConfig = mkOption { + type = types.lines; + default = ""; + example = '' + # Niri example + input { + keyboard { + xkb { + layout "us" + } + } + } + ''; + description = '' + Custom compositor configuration to use for the greeter session. + + This configuration is written to a file and passed to the compositor + when launching the greeter. The format and available options depend + on the selected compositor. + + Leave empty to use the system's default compositor configuration. + ''; + }; + }; + + configFiles = mkOption { + type = types.listOf types.path; + default = [ ]; + example = literalExpression '' + [ + "/home/user/.config/DankMaterialShell/settings.json" + "/home/user/.local/state/DankMaterialShell/session.json" + ] + ''; + description = '' + List of DankMaterialShell configuration files to copy into the greeter + data directory at `/var/lib/dms-greeter`. + + This is useful for preserving user preferences like wallpapers, themes, + and other settings in the greeter screen. + + ::: {.tip} + Use {option}`configHome` instead if your configuration files are in + standard XDG locations. + ::: + ''; + }; + + configHome = mkOption { + type = types.nullOr types.str; + default = null; + example = "/home/alice"; + description = '' + Path to a user's home directory from which to copy DankMaterialShell + configuration files. + + When set, the following files will be automatically copied to the greeter: + - `~/.config/DankMaterialShell/settings.json` + - `~/.local/state/DankMaterialShell/session.json` + - `~/.cache/DankMaterialShell/dms-colors.json` + + If your configuration files are in non-standard locations, use the + {option}`configFiles` option instead. + ''; + }; + + quickshell = { + package = mkPackageOption pkgs "quickshell" { }; + }; + + logs = { + save = mkEnableOption "saving logs from the DMS greeter to a file"; + + path = mkOption { + type = types.path; + default = "/tmp/dms-greeter.log"; + example = "/var/log/dms-greeter.log"; + description = '' + File path where DMS greeter logs will be saved. + + This is useful for debugging greeter issues. Logs will include + output from both the greeter and the compositor. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = config.programs.${cfg.compositor.name}.enable or false; + message = '' + DankMaterialShell greeter: The compositor "${cfg.compositor.name}" is not enabled. + + Please enable the compositor via: + programs.${cfg.compositor.name}.enable = true; + ''; + } + ]; + + services.greetd = { + enable = true; + settings = { + default_session = { + user = "dms-greeter"; + command = getExe greeterScript; + }; + initial_session = mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) { + inherit (cfgAutoLogin) user command; + }; + }; + }; + + environment.systemPackages = [ cfg.package ]; + + fonts.packages = with pkgs; [ + fira-code + inter + material-symbols + ]; + + systemd.tmpfiles.settings."10-dms-greeter"."/var/lib/dms-greeter".d = { + user = "dms-greeter"; + group = "dms-greeter"; + mode = "0750"; + }; + + systemd.services.greetd.preStart = + let + allConfigFiles = cfg.configFiles ++ configFilesFromHome; + in + '' + set -euo pipefail + + cd /var/lib/dms-greeter || exit 1 + + ${concatMapStringsSep "\n" (f: '' + if [[ -f "${f}" ]]; then + cp "${f}" . || true + fi + '') allConfigFiles} + + # Handle session.json wallpaper path + if [[ -f session.json ]]; then + if wallpaper=$(${getExe pkgs.jq} -r '.wallpaperPath' session.json 2>/dev/null); then + if [[ -f "$wallpaper" ]]; then + cp "$wallpaper" wallpaper.jpg || true + mv session.json session.orig.json + ${getExe pkgs.jq} '.wallpaperPath = "/var/lib/dms-greeter/wallpaper.jpg"' \ + session.orig.json > session.json || true + fi + fi + fi + + # Rename colors file if it exists + [[ -f dms-colors.json ]] && mv dms-colors.json colors.json || true + + # Fix ownership of all files + chown -R "dms-greeter:dms-greeter" . || true + ''; + + users.groups.dms-greeter = { }; + users.users.dms-greeter = { + description = "DankMaterialShell greeter user"; + isSystemUser = true; + home = "/var/lib/dms-greeter"; + homeMode = "0750"; + createHome = true; + group = "dms-greeter"; + extraGroups = [ "video" ]; + }; + + security.pam.services.dms-greeter = { }; + + hardware.graphics.enable = mkDefault true; + services.libinput.enable = mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/modules/services/hardware/dell-bios-fan-control.nix b/nixos/modules/services/hardware/dell-bios-fan-control.nix new file mode 100644 index 000000000000..66a02714b9e0 --- /dev/null +++ b/nixos/modules/services/hardware/dell-bios-fan-control.nix @@ -0,0 +1,49 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.hardware.dell-bios-fan-control; +in +{ + meta.maintainers = with lib.maintainers; [ rickyelopez ]; + + options.services.hardware.dell-bios-fan-control = { + enable = lib.mkEnableOption "One-shot service to disable dell bios fan control on startup"; + package = lib.mkPackageOption pkgs "dell-bios-fan-control" { }; + }; + + config = lib.mkIf cfg.enable { + boot.kernelModules = [ "i8k" ]; + environment.systemPackages = [ cfg.package ]; + # see ref in aur: https://aur.archlinux.org/cgit/aur.git/tree/dell-bios-fan-control.service?h=dell-bios-fan-control-git + systemd.services.dell-bios-fan-control = { + description = "Disables BIOS control of fans at boot."; + wants = [ "dell-bios-fan-control-resume.service" ]; + wantedBy = [ "multi-user.target" ]; + before = [ "i8kmon.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${lib.getExe cfg.package} 0"; + ExecStop = "${lib.getExe cfg.package} 1"; + }; + }; + + # see ref in aur: https://aur.archlinux.org/cgit/aur.git/tree/dell-bios-fan-control-resume.service?h=dell-bios-fan-control-git + systemd.services.dell-bios-fan-control-resume = { + description = "Restart dell-bios-fan-control on resume."; + wants = [ "dell-bios-fan-control.service" ]; + wantedBy = [ "suspend.target" ]; + after = [ "suspend.target" ]; + serviceConfig = { + Type = "oneshot"; + # re: sleep, see: https://github.com/NixOS/nixpkgs/pull/439978#discussion_r2404279441 + ExecStartPre = "${pkgs.coreutils}/bin/sleep 30"; + ExecStart = "${config.systemd.package}/bin/systemctl restart dell-bios-fan-control.service"; + }; + }; + }; +} diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 55099dc4bffb..9f20b08f8b55 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -189,7 +189,7 @@ ]; services.udev.extraRules = '' - KERNEL=="nvidia", RUN+="${lib.getExe' config.systemd.package "systemctl"} restart nvidia-container-toolkit-cdi-generator.service'" + KERNEL=="nvidia", RUN+="${lib.getExe' config.systemd.package "systemctl"} --no-block restart nvidia-container-toolkit-cdi-generator.service'" ''; virtualisation = { diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index e21b4f881e7f..247377eaeb31 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -42,6 +42,20 @@ in options = { enable = mkEnableOption "Wyoming Piper server"; + zeroconf = { + enable = mkEnableOption "zeroconf discovery" // { + default = true; + }; + + name = mkOption { + type = str; + default = "piper"; + description = '' + The advertised name for zeroconf discovery. + ''; + }; + }; + voice = mkOption { type = str; example = "en-us-ryan-medium"; @@ -95,10 +109,6 @@ in apply = toString; }; - streaming = mkEnableOption "audio streaming on sentence boundaries" // { - default = true; - }; - useCUDA = mkOption { type = bool; default = pkgs.config.cudaSupport; @@ -168,8 +178,9 @@ in "--noise-w-scale" options.noiseWidth ] - ++ lib.optionals options.streaming [ - "--streaming" + ++ lib.optionals options.zeroconf.enable [ + "--zeroconf" + options.zeroconf.name ] ++ lib.optionals options.useCUDA [ "--use-cuda" diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index d02cc7484991..dbf714bfb84e 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -114,6 +114,7 @@ in RestrictAddressFamilies = [ "AF_INET" "AF_INET6" + "AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix index 2fefcd6b68a2..94af3aafdbb8 100644 --- a/nixos/modules/services/mail/dkimproxy-out.nix +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -119,5 +119,4 @@ in }; }; - meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index e67ca27dadfe..57f62bcfccfe 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -148,5 +148,4 @@ in }; }; - meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/matrix/mautrix-discord.nix b/nixos/modules/services/matrix/mautrix-discord.nix index f14e7d90196d..f0796ca1df84 100644 --- a/nixos/modules/services/matrix/mautrix-discord.nix +++ b/nixos/modules/services/matrix/mautrix-discord.nix @@ -13,6 +13,7 @@ let settingsFile = "${dataDir}/config.yaml"; settingsFileUnformatted = format.generate "discord-config-unsubstituted.yaml" cfg.settings; + default_token = "This value is generated when generating the registration"; in { options = { @@ -415,66 +416,61 @@ in rm -f '${settingsFile}' old_umask=$(umask) umask 0177 - envsubst \ - -o '${settingsFile}' \ - -i '${settingsFileUnformatted}' - config_has_tokens=$(yq '.appservice | has("as_token") and has("hs_token")' '${settingsFile}') - registration_already_exists=$([[ -f '${registrationFile}' ]] && echo "true" || echo "false") - echo "There are tokens in the config: $config_has_tokens" - echo "Registration already existed: $registration_already_exists" - # tokens not configured from config/environment file, and registration file - # is already generated, override tokens in config to make sure they are not lost - if [[ $config_has_tokens == "false" && $registration_already_exists == "true" ]]; then - echo "Copying as_token, hs_token from registration into configuration" - yq -sY '.[0].appservice.as_token = .[1].as_token - | .[0].appservice.hs_token = .[1].hs_token - | .[0]' '${settingsFile}' '${registrationFile}' \ - > '${settingsFile}.tmp' + + envsubst -o '${settingsFile}' -i '${settingsFileUnformatted}' + + # Check if config has tokens or uses defaults + as_token=$(yq -r '.appservice.as_token' '${settingsFile}') + hs_token=$(yq -r '.appservice.hs_token' '${settingsFile}') + config_has_tokens=$([[ "$as_token" != "${default_token}" && "$as_token" != "null" && "$hs_token" != "${default_token}" && "$hs_token" != "null" ]] && echo "true" || echo "false") + + if [[ -f '${registrationFile}' ]]; then + registration_exists="true" + else + registration_exists="false" + fi + + echo "Config has tokens: $config_has_tokens, Registration exists: $registration_exists" + + # If config has default tokens but registration exists, restore tokens from registration + if [[ $config_has_tokens == "false" && $registration_exists == "true" ]]; then + echo "Restoring tokens from existing registration" + yq -sY '.[0].appservice.as_token = .[1].as_token | .[0].appservice.hs_token = .[1].hs_token | .[0]' \ + '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' mv '${settingsFile}.tmp' '${settingsFile}' fi - # make sure --generate-registration does not affect config.yaml + + # If config has default tokens and no registration exists, generate new tokens + if [[ $config_has_tokens == "false" && $registration_exists == "false" ]]; then + echo "Generating new tokens for first-time setup" + # Generate random tokens (64 character alphanumeric strings) + new_as_token=$(LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 64) + new_hs_token=$(LC_ALL=C tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 64) + + # Save generated tokens to config + yq -Y ".appservice.as_token = \"$new_as_token\" | .appservice.hs_token = \"$new_hs_token\"" \ + '${settingsFile}' > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + + # Verify tokens were replaced + if [[ $(yq -r '.appservice.as_token' '${settingsFile}') == "${default_token}" ]]; then + echo "ERROR: Failed to replace default tokens" + exit 1 + fi + echo "Successfully generated and saved new tokens" + fi + + # Generate registration file with tokens from config cp '${settingsFile}' '${settingsFile}.tmp' echo "Generating registration file" - mautrix-discord \ - --generate-registration \ - --config='${settingsFile}.tmp' \ - --registration='${registrationFile}' + mautrix-discord --generate-registration --config='${settingsFile}.tmp' --registration='${registrationFile}' rm '${settingsFile}.tmp' - # no tokens configured, and new were just generated by generate registration for first time - if [[ $config_has_tokens == "false" && $registration_already_exists == "false" ]]; then - echo "Copying newly generated as_token, hs_token from registration into configuration" - yq -sY '.[0].appservice.as_token = .[1].as_token - | .[0].appservice.hs_token = .[1].hs_token - | .[0]' '${settingsFile}' '${registrationFile}' \ - > '${settingsFile}.tmp' - mv '${settingsFile}.tmp' '${settingsFile}' - fi - # make sure --generate-registration does not affect config.yaml - cp '${settingsFile}' '${settingsFile}.tmp' - echo "Generating registration file" - mautrix-discord \ - --generate-registration \ - --config='${settingsFile}.tmp' \ - --registration='${registrationFile}' - rm '${settingsFile}.tmp' - # no tokens configured, and new were just generated by generate registration for first time - if [[ $config_has_tokens == "false" && $registration_already_exists == "false" ]]; then - echo "Copying newly generated as_token, hs_token from registration into configuration" - yq -sY '.[0].appservice.as_token = .[1].as_token - | .[0].appservice.hs_token = .[1].hs_token - | .[0]' '${settingsFile}' '${registrationFile}' \ - > '${settingsFile}.tmp' - mv '${settingsFile}.tmp' '${settingsFile}' - fi - # Make sure correct tokens are in the registration file - if [[ $config_has_tokens == "true" || $registration_already_exists == "true" ]]; then - echo "Copying as_token, hs_token from configuration to the registration file" - yq -sY '.[1].as_token = .[0].appservice.as_token - | .[1].hs_token = .[0].appservice.hs_token - | .[1]' '${settingsFile}' '${registrationFile}' \ - > '${registrationFile}.tmp' - mv '${registrationFile}.tmp' '${registrationFile}' - fi + + # Ensure registration file has the same tokens as config (mautrix-discord may regenerate them) + yq -sY '.[1].as_token = .[0].appservice.as_token | .[1].hs_token = .[0].appservice.hs_token | .[1]' \ + '${settingsFile}' '${registrationFile}' > '${registrationFile}.tmp' + mv '${registrationFile}.tmp' '${registrationFile}' + umask $old_umask chown :mautrix-discord-registration '${registrationFile}' chmod 640 '${registrationFile}' diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index ceee3e080eb5..fc5b371a1dc5 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -340,7 +340,7 @@ in }; mailer = { ENABLED = true; - MAILER_TYPE = "sendmail"; + PROTOCOL = "sendmail"; FROM = "do-not-reply@example.org"; SENDMAIL_PATH = "''${pkgs.system-sendmail}/bin/sendmail"; }; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 975421e05162..225ebd910ff7 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -50,7 +50,7 @@ in - `ollama`: default behavior; usually equivalent to `ollama-cpu` - if `nixpkgs.config.rocmSupport` is enabled, is equivalent to `ollama-rocm` - if `nixpkgs.config.cudaSupport` is enabled, is equivalent to `ollama-cuda` - - otherwise defaults to `false` + - otherwise defaults to `ollama-cpu` - `ollama-cpu`: disable GPU; only use CPU - `ollama-rocm`: supported by most modern AMD GPUs - may require overriding gpu type with `services.ollama.rocmOverrideGfx` diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index b848a2a61eae..bce6d68047f8 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -56,7 +56,7 @@ in ''; description = '' Extra environment variables for Open-WebUI. - For more details see + For more details see ''; }; diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 86f33143d27b..0fd7e40e38d4 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -642,7 +642,7 @@ in let nginxHasSSL = with config.services.nginx.virtualHosts."${cfg.hostname}"; - onlySSL || enableSSL || addSSL || forceSSL; + onlySSL || addSSL || forceSSL; in '' set -euo pipefail diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index c4212b4d7bd4..1c3cbd9a7a3a 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -6,7 +6,6 @@ ... }: let - inherit (lib) maintainers; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.options) @@ -205,6 +204,7 @@ in systemd.services.scrutiny = { description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds"; + enableStrictShellChecks = true; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ] ++ lib.optional cfg.influxdb.enable "influxdb2.service"; wants = lib.optional cfg.influxdb.enable "influxdb2.service"; @@ -217,7 +217,7 @@ in ${genJqSecretsReplacementSnippet cfg.settings "/run/scrutiny/config.yaml"} ''; postStart = '' - for i in $(seq 300); do + for _ in $(seq 300); do if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then echo "Scrutiny is ready (port is open)" exit 0 @@ -251,6 +251,7 @@ in systemd = { services.scrutiny-collector = { description = "Scrutiny Collector Service"; + enableStrictShellChecks = true; after = lib.optional cfg.enable "scrutiny.service"; wants = lib.optional cfg.enable "scrutiny.service"; environment = { diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 773387939a7c..826e387383a6 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -20,11 +20,11 @@ let ${lib.optionalString (cfg.username != "") "login=${cfg.username}"} ${ if cfg.protocol == "nsupdate" then - "/run/${RuntimeDirectory}/ddclient.key" + "password=/run/${RuntimeDirectory}/ddclient.key" else if (cfg.passwordFile != null) then "password=@password_placeholder@" else if (cfg.secretsFile != null) then - "@secrets_placeholder@" + "password=@secrets_placeholder@" else "" } diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index f59074688b6c..6c86d169c6a2 100644 --- a/nixos/modules/services/networking/frp.nix +++ b/nixos/modules/services/networking/frp.nix @@ -7,95 +7,130 @@ let cfg = config.services.frp; settingsFormat = pkgs.formats.toml { }; - configFile = settingsFormat.generate "frp.toml" cfg.settings; - isClient = (cfg.role == "client"); - isServer = (cfg.role == "server"); + enabledInstances = lib.filterAttrs (name: conf: conf.enable) cfg.instances; in { + imports = [ + (lib.mkRenamedOptionModule + [ "services" "frp" "enable" ] + [ "services" "frp" "instances" "" "enable" ] + ) + (lib.mkRenamedOptionModule [ "services" "frp" "role" ] [ "services" "frp" "instances" "" "role" ]) + (lib.mkRenamedOptionModule + [ "services" "frp" "settings" ] + [ "services" "frp" "instances" "" "settings" ] + ) + ]; + options = { services.frp = { - enable = lib.mkEnableOption "frp"; + instances = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + enable = lib.mkEnableOption "frp"; - package = lib.mkPackageOption pkgs "frp" { }; + role = lib.mkOption { + type = lib.types.enum [ + "server" + "client" + ]; + description = '' + The frp consists of `client` and `server`. The server is usually + deployed on the machine with a public IP address, and + the client is usually deployed on the machine + where the Intranet service to be penetrated resides. + ''; + }; - role = lib.mkOption { - type = lib.types.enum [ - "server" - "client" - ]; - description = '' - The frp consists of `client` and `server`. The server is usually - deployed on the machine with a public IP address, and - the client is usually deployed on the machine - where the Intranet service to be penetrated resides. - ''; - }; - - settings = lib.mkOption { - type = settingsFormat.type; + settings = lib.mkOption { + type = settingsFormat.type; + default = { }; + description = '' + Frp configuration, for configuration options + see the example of [client](https://github.com/fatedier/frp/blob/dev/conf/frpc_full_example.toml) + or [server](https://github.com/fatedier/frp/blob/dev/conf/frps_full_example.toml) on github. + ''; + example = { + serverAddr = "x.x.x.x"; + serverPort = 7000; + proxies = [ + { + name = "ssh"; + type = "tcp"; + localIP = "127.0.0.1"; + localPort = 22; + remotePort = 6000; + } + ]; + }; + }; + }; + } + ); default = { }; description = '' - Frp configuration, for configuration options - see the example of [client](https://github.com/fatedier/frp/blob/dev/conf/frpc_full_example.toml) - or [server](https://github.com/fatedier/frp/blob/dev/conf/frps_full_example.toml) on github. + Frp instances. ''; - example = { - serverAddr = "x.x.x.x"; - serverPort = 7000; - }; }; + + package = lib.mkPackageOption pkgs "frp" { }; }; }; - config = - let - serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ]; - executableFile = if isClient then "frpc" else "frps"; - in - lib.mkIf cfg.enable { - systemd.services = { - frp = { - wants = lib.optionals isClient [ "network-online.target" ]; - after = if isClient then [ "network-online.target" ] else [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - description = "A fast reverse proxy frp ${cfg.role}"; - serviceConfig = { - Type = "simple"; - Restart = "on-failure"; - RestartSec = 15; - ExecStart = "${cfg.package}/bin/${executableFile} --strict_config -c ${configFile}"; - DynamicUser = true; - # Hardening - CapabilityBoundingSet = serviceCapability; - AmbientCapabilities = serviceCapability; - PrivateDevices = true; - ProtectHostname = true; - ProtectClock = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ] - ++ lib.optionals isClient [ "AF_UNIX" ]; - LockPersonality = true; - MemoryDenyWriteExecute = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - PrivateMounts = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" ]; - } - // lib.optionalAttrs isServer { - StateDirectory = "frp"; - StateDirectoryMode = "0700"; - UMask = "0007"; - }; + config = lib.mkIf (enabledInstances != { }) { + systemd.services = lib.mapAttrs' ( + instance: options: + let + serviceName = "frp" + lib.optionalString (instance != "") ("-" + instance); + configFile = settingsFormat.generate "${serviceName}.toml" options.settings; + isClient = (options.role == "client"); + isServer = (options.role == "server"); + serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ]; + executableFile = if isClient then "frpc" else "frps"; + in + lib.nameValuePair serviceName { + wants = lib.optionals isClient [ "network-online.target" ]; + after = if isClient then [ "network-online.target" ] else [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "A fast reverse proxy frp ${options.role} for instance ${instance}"; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 15; + ExecStart = "${cfg.package}/bin/${executableFile} --strict_config -c ${configFile}"; + DynamicUser = true; + # Hardening + CapabilityBoundingSet = serviceCapability; + AmbientCapabilities = serviceCapability; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ] + ++ lib.optionals isClient [ "AF_UNIX" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + } + // lib.optionalAttrs isServer { + StateDirectory = "frp"; + StateDirectoryMode = "0700"; + UMask = "0007"; }; - }; - }; + } + ) enabledInstances; + }; meta.maintainers = with lib.maintainers; [ zaldnoay ]; } diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix new file mode 100644 index 000000000000..9ae940182a30 --- /dev/null +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -0,0 +1,160 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.knot-resolver; + # pkgs.writers.yaml_1_1.generate with additional kresctl validate + configFile = + pkgs.runCommandLocal "knot-resolver.yaml" + { + nativeBuildInputs = [ pkgs.remarshal_0_17 ]; + value = builtins.toJSON cfg.settings; + passAsFile = [ "value" ]; + } + '' + json2yaml "$valuePath" "$out" + ${cfg.managerPackage}/bin/kresctl validate "$out" + ''; +in +{ + meta.maintainers = [ + lib.maintainers.vcunat # upstream developer + ] + ++ lib.teams.flyingcircus.members; + + ###### interface + options.services.knot-resolver = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable knot-resolver (version 6) domain name server. + DNSSEC validation is turned on by default. + If you want to use knot-resolver 5, please use services.kresd. + ''; + }; + package = lib.mkPackageOption pkgs "knot-resolver_6" { + example = "knot-resolver_6.override { extraFeatures = true; }"; + }; + managerPackage = lib.mkPackageOption pkgs "knot-resolver-manager_6" { }; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = (pkgs.formats.yaml { }).type; + options = { + network.listen = lib.mkOption { + type = lib.types.listOf ( + lib.types.submodule { + freeformType = (pkgs.formats.yaml { }).type; + } + ); + description = "List of interfaces to listen to and its configuration."; + default = [ + { + interface = [ "127.0.0.1" ]; + kind = "dns"; + freebind = false; + } + ] + ++ lib.optionals config.networking.enableIPv6 [ + { + interface = [ "::1" ]; + kind = "dns"; + freebind = false; + } + ]; + defaultText = lib.literalExpression '' + [ + { + interface = [ "127.0.0.1" ]; + kind = "dns"; + freebind = false; + } + ] + ++ lib.optionals config.networking.enableIPv6 [ + { + interface = [ "::1" ]; + kind = "dns"; + freebind = false; + } + ]; + ''; + }; + workers = lib.mkOption { + type = lib.types.oneOf [ + (lib.types.enum [ "auto" ]) + lib.types.ints.unsigned + ]; + default = 1; + description = '' + The number of running kresd (Knot Resolver daemon) workers. If set to 'auto', it is equal to number of CPUs available. + ''; + }; + }; + }; + default = { }; + description = '' + Nix-based (RFC 42) configuration for Knot Resolver. + For configuration reference (described as YAML) see + + ''; + }; + }; + + ###### implementation + config = lib.mkIf cfg.enable { + users.users.knot-resolver = { + isSystemUser = true; + group = "knot-resolver"; + description = "Knot-resolver daemon user"; + }; + users.groups.knot-resolver = { }; + networking.resolvconf.useLocalResolver = lib.mkDefault true; + + assertions = [ + { + assertion = lib.versionAtLeast cfg.package.version "6.0.0"; + message = '' + services.knot-resolver only works with knot-resolver 6 or later. + Please use services.kresd for knot-resolver 5. + ''; + } + ]; + + environment = { + etc."knot-resolver/config.yaml".source = configFile; + systemPackages = [ + # We just avoid including the other binaries, e.g. supervisorctl. + (pkgs.runCommandLocal "knot-resolver-cmds" { } '' + mkdir -p "$out/bin" + ln -s '${cfg.managerPackage}/bin/kresctl' "$out/bin/" + '') + ]; + }; + + systemd.packages = [ cfg.package ]; # the unit gets patched a bit just below + systemd.services."knot-resolver" = { + wantedBy = [ "multi-user.target" ]; + path = [ (lib.getBin cfg.package) ]; + stopIfChanged = false; + reloadTriggers = [ + configFile + ]; + serviceConfig = { + ExecStart = "${cfg.managerPackage}/bin/knot-resolver"; + ExecReload = "${cfg.managerPackage}/bin/kresctl reload"; + + StateDirectory = "knot-resolver"; + StateDirectoryMode = "0770"; + + RuntimeDirectory = "knot-resolver"; + RuntimeDirectoryMode = "0770"; + + CacheDirectory = "knot-resolver"; + CacheDirectoryMode = "0770"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 5c7facbcb530..0dc8050c2e29 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -66,13 +66,14 @@ in type = lib.types.bool; default = false; description = '' - Whether to enable knot-resolver domain name server. + Whether to enable knot-resolver (version 5) domain name server. DNSSEC validation is turned on by default. You can run `kresd-cli 1` and give commands interactively to kresd@1.service. + If you want to user knot-resolver 6, please use services.knot-resolver. ''; }; - package = lib.mkPackageOption pkgs "knot-resolver" { - example = "knot-resolver.override { extraFeatures = true; }"; + package = lib.mkPackageOption pkgs "knot-resolver_5" { + example = "knot-resolver_5.override { extraFeatures = true; }"; }; extraConfig = lib.mkOption { type = lib.types.lines; @@ -134,6 +135,15 @@ in ###### implementation config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = lib.versionOlder cfg.package.version "6.0.0"; + message = '' + services.kresd only works with knot-resolver 5. + Please use services.knot-resolver for knot-resolver 6 and newer. + ''; + } + ]; environment = { etc."knot-resolver/kresd.conf".source = configFile; # not required systemPackages = [ diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 46d9d084d7d7..6100f71563f4 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -1047,6 +1047,4 @@ in }; }; - - meta.maintainers = with lib.maintainers; [ hrdinka ]; } diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index 852dcc8ff431..2b46fda95420 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -292,5 +292,4 @@ in ) cfg.redsocks; }; - meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 1301c3648011..d4457560dbf1 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -381,6 +381,19 @@ in ''; }; + generateHostKeys = lib.mkOption { + type = lib.types.bool; + default = config.services.openssh.enable; + defaultText = lib.literalExpression "services.openssh.enable"; + description = '' + Whether to generate SSH host keys. + + This can be enabled explicitly if you want to generate host keys but + don't want to enable the SSH daemon. + ''; + example = true; + }; + banner = lib.mkOption { type = lib.types.nullOr lib.types.lines; default = null; @@ -669,115 +682,232 @@ in ###### implementation - config = lib.mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { - users.users.sshd = { - isSystemUser = true; - group = "sshd"; - description = "SSH privilege separation user"; - }; - users.groups.sshd = { }; - - services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli"; - services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server"; - - environment.etc = - authKeysFiles - // authPrincipalsFiles - // { - "ssh/moduli".source = cfg.moduliFile; - "ssh/sshd_config".source = sshconf; + users.users.sshd = { + isSystemUser = true; + group = "sshd"; + description = "SSH privilege separation user"; }; + users.groups.sshd = { }; - systemd.tmpfiles.settings."ssh-root-provision" = { - "/root"."d-" = { - user = "root"; - group = ":root"; - mode = ":700"; - }; - "/root/.ssh"."d-" = { - user = "root"; - group = ":root"; - mode = ":700"; - }; - "/root/.ssh/authorized_keys"."f^" = { - user = "root"; - group = ":root"; - mode = ":600"; - argument = "ssh.authorized_keys.root"; - }; - }; + services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli"; + services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server"; - systemd = { - sockets.sshd = lib.mkIf cfg.startWhenNeeded { - description = "SSH Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = - if cfg.listenAddresses != [ ] then - lib.concatMap ( - { addr, port }: - if port != null then [ "${addr}:${toString port}" ] else map (p: "${addr}:${toString p}") cfg.ports - ) cfg.listenAddresses - else - cfg.ports; - socketConfig.Accept = true; - # Prevent brute-force attacks from shutting down socket - socketConfig.TriggerLimitIntervalSec = 0; - }; + environment.etc = + authKeysFiles + // authPrincipalsFiles + // { + "ssh/moduli".source = cfg.moduliFile; + "ssh/sshd_config".source = sshconf; + }; - services."sshd@" = { - description = "SSH per-connection Daemon"; - after = [ - "network.target" - "sshd-keygen.service" - ]; - wants = [ "sshd-keygen.service" ]; - stopIfChanged = false; - path = [ cfg.package ]; - environment.LD_LIBRARY_PATH = nssModulesPath; - - serviceConfig = { - ExecStart = lib.concatStringsSep " " [ - "-${lib.getExe' cfg.package "sshd"}" - "-i" - "-D" - "-f /etc/ssh/sshd_config" - ]; - KillMode = "process"; - StandardInput = "socket"; - StandardError = "journal"; + systemd.tmpfiles.settings."ssh-root-provision" = { + "/root"."d-" = { + user = "root"; + group = ":root"; + mode = ":700"; + }; + "/root/.ssh"."d-" = { + user = "root"; + group = ":root"; + mode = ":700"; + }; + "/root/.ssh/authorized_keys"."f^" = { + user = "root"; + group = ":root"; + mode = ":600"; + argument = "ssh.authorized_keys.root"; }; }; - services.sshd = lib.mkIf (!cfg.startWhenNeeded) { - description = "SSH Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - "sshd-keygen.service" - ]; - wants = [ "sshd-keygen.service" ]; - stopIfChanged = false; - path = [ cfg.package ]; - environment.LD_LIBRARY_PATH = nssModulesPath; + systemd = { + sockets.sshd = lib.mkIf cfg.startWhenNeeded { + description = "SSH Socket"; + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = + if cfg.listenAddresses != [ ] then + lib.concatMap ( + { addr, port }: + if port != null then [ "${addr}:${toString port}" ] else map (p: "${addr}:${toString p}") cfg.ports + ) cfg.listenAddresses + else + cfg.ports; + socketConfig.Accept = true; + # Prevent brute-force attacks from shutting down socket + socketConfig.TriggerLimitIntervalSec = 0; + }; - restartTriggers = [ config.environment.etc."ssh/sshd_config".source ]; - - serviceConfig = { - Type = "notify-reload"; - Restart = "always"; - ExecStart = lib.concatStringsSep " " [ - (lib.getExe' cfg.package "sshd") - "-D" - "-f" - "/etc/ssh/sshd_config" + services."sshd@" = { + description = "SSH per-connection Daemon"; + after = [ + "network.target" + "sshd-keygen.service" ]; - KillMode = "process"; + wants = lib.mkIf cfg.generateHostKeys [ "sshd-keygen.service" ]; + stopIfChanged = false; + path = [ cfg.package ]; + environment.LD_LIBRARY_PATH = nssModulesPath; + + serviceConfig = { + ExecStart = lib.concatStringsSep " " [ + "-${lib.getExe' cfg.package "sshd"}" + "-i" + "-D" + "-f /etc/ssh/sshd_config" + ]; + KillMode = "process"; + StandardInput = "socket"; + StandardError = "journal"; + }; + }; + + services.sshd = lib.mkIf (!cfg.startWhenNeeded) { + description = "SSH Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "sshd-keygen.service" + ]; + wants = lib.mkIf cfg.generateHostKeys [ "sshd-keygen.service" ]; + stopIfChanged = false; + path = [ cfg.package ]; + environment.LD_LIBRARY_PATH = nssModulesPath; + + restartTriggers = [ config.environment.etc."ssh/sshd_config".source ]; + + serviceConfig = { + Type = "notify-reload"; + Restart = "always"; + ExecStart = lib.concatStringsSep " " [ + (lib.getExe' cfg.package "sshd") + "-D" + "-f" + "/etc/ssh/sshd_config" + ]; + KillMode = "process"; + }; }; }; - services.sshd-keygen = { + networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall cfg.ports; + + security.pam.services.sshd = lib.mkIf (cfg.settings.UsePAM == true) { + startSession = true; + showMotd = true; + unixAuth = if cfg.settings.PasswordAuthentication == true then true else false; + }; + + # These values are merged with the ones defined externally, see: + # https://github.com/NixOS/nixpkgs/pull/10155 + # https://github.com/NixOS/nixpkgs/pull/41745 + services.openssh.authorizedKeysFiles = + lib.optional cfg.authorizedKeysInHomedir "%h/.ssh/authorized_keys" + ++ [ "/etc/ssh/authorized_keys.d/%u" ]; + + services.openssh.settings.AuthorizedPrincipalsFile = lib.mkIf ( + authPrincipalsFiles != { } + ) "/etc/ssh/authorized_principals.d/%u"; + + services.openssh.extraConfig = lib.mkOrder 0 ( + lib.concatStringsSep "\n" ( + [ + "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}" + "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}" + ] + ++ lib.map (port: ''Port ${toString port}'') cfg.ports + ++ lib.map ( + { port, addr, ... }: + ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}'' + ) cfg.listenAddresses + ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}" + ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}'' + ++ [ + "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}" + ] + ++ lib.optional (cfg.authorizedKeysCommand != "none") '' + AuthorizedKeysCommand ${cfg.authorizedKeysCommand} + AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser} + '' + ++ lib.map (k: "HostKey ${k.path}") cfg.hostKeys + ) + ); + + system.checks = [ + (pkgs.runCommand "check-sshd-config" + { + nativeBuildInputs = [ validationPackage ]; + } + '' + ${lib.concatMapStringsSep "\n" ( + lport: "sshd -G -T -C lport=${toString lport} -f ${sshconf} > /dev/null" + ) cfg.ports} + ${lib.concatMapStringsSep "\n" ( + la: + lib.concatMapStringsSep "\n" ( + port: + "sshd -G -T -C ${lib.escapeShellArg "laddr=${la.addr},lport=${toString port}"} -f ${sshconf} > /dev/null" + ) (if la.port != null then [ la.port ] else cfg.ports) + ) cfg.listenAddresses} + touch $out + '' + ) + ]; + + assertions = [ + { + assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true; + message = "cannot enable X11 forwarding without setting xauth location"; + } + { + assertion = + (builtins.match "(.*\n)?(\t )*[Kk][Ee][Rr][Bb][Ee][Rr][Oo][Ss][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") + != null + -> cfgc.package.withKerberos; + message = "cannot enable Kerberos authentication without using a package with Kerberos support"; + } + { + assertion = + (builtins.match "(.*\n)?(\t )*[Gg][Ss][Ss][Aa][Pp][Ii][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") + != null + -> cfgc.package.withKerberos; + message = "cannot enable GSSAPI authentication without using a package with Kerberos support"; + } + ( + let + duplicates = + # Filter out the groups with more than 1 element + lib.filter (l: lib.length l > 1) ( + # Grab the groups, we don't care about the group identifiers + lib.attrValues ( + # Group the settings that are the same in lower case + lib.groupBy lib.strings.toLower (lib.attrNames cfg.settings) + ) + ); + formattedDuplicates = lib.concatMapStringsSep ", " ( + dupl: "(${lib.concatStringsSep ", " dupl})" + ) duplicates; + in + { + assertion = lib.length duplicates == 0; + message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}''; + } + ) + ] + ++ lib.forEach cfg.listenAddresses ( + { addr, ... }: + { + assertion = addr != null; + message = "addr must be specified in each listenAddresses entry"; + } + ); + }) + + (lib.mkIf cfg.generateHostKeys { + systemd.services.sshd-keygen = { description = "SSH Host Keys Generation"; + wantedBy = [ "multi-user.target" ]; unitConfig = { ConditionFileNotEmpty = map (k: "|!${k.path}") cfg.hostKeys; }; @@ -802,119 +932,7 @@ in fi ''); }; - }; - - networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall cfg.ports; - - security.pam.services.sshd = lib.mkIf cfg.settings.UsePAM { - startSession = true; - showMotd = true; - unixAuth = if cfg.settings.PasswordAuthentication == true then true else false; - }; - - # These values are merged with the ones defined externally, see: - # https://github.com/NixOS/nixpkgs/pull/10155 - # https://github.com/NixOS/nixpkgs/pull/41745 - services.openssh.authorizedKeysFiles = - lib.optional cfg.authorizedKeysInHomedir "%h/.ssh/authorized_keys" - ++ [ "/etc/ssh/authorized_keys.d/%u" ]; - - services.openssh.settings.AuthorizedPrincipalsFile = lib.mkIf ( - authPrincipalsFiles != { } - ) "/etc/ssh/authorized_principals.d/%u"; - - services.openssh.extraConfig = lib.mkOrder 0 ( - lib.concatStringsSep "\n" ( - [ - "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}" - "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}" - ] - ++ lib.map (port: ''Port ${toString port}'') cfg.ports - ++ lib.map ( - { port, addr, ... }: - ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}'' - ) cfg.listenAddresses - ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}" - ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}'' - ++ [ - "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}" - ] - ++ lib.optional (cfg.authorizedKeysCommand != "none") '' - AuthorizedKeysCommand ${cfg.authorizedKeysCommand} - AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser} - '' - ++ lib.map (k: "HostKey ${k.path}") cfg.hostKeys - ) - ); - - system.checks = [ - (pkgs.runCommand "check-sshd-config" - { - nativeBuildInputs = [ validationPackage ]; - } - '' - ${lib.concatMapStringsSep "\n" ( - lport: "sshd -G -T -C lport=${toString lport} -f ${sshconf} > /dev/null" - ) cfg.ports} - ${lib.concatMapStringsSep "\n" ( - la: - lib.concatMapStringsSep "\n" ( - port: - "sshd -G -T -C ${lib.escapeShellArg "laddr=${la.addr},lport=${toString port}"} -f ${sshconf} > /dev/null" - ) (if la.port != null then [ la.port ] else cfg.ports) - ) cfg.listenAddresses} - touch $out - '' - ) - ]; - - assertions = [ - { - assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true; - message = "cannot enable X11 forwarding without setting xauth location"; - } - { - assertion = - (builtins.match "(.*\n)?(\t )*[Kk][Ee][Rr][Bb][Ee][Rr][Oo][Ss][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") - != null - -> cfgc.package.withKerberos; - message = "cannot enable Kerberos authentication without using a package with Kerberos support"; - } - { - assertion = - (builtins.match "(.*\n)?(\t )*[Gg][Ss][Ss][Aa][Pp][Ii][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") - != null - -> cfgc.package.withKerberos; - message = "cannot enable GSSAPI authentication without using a package with Kerberos support"; - } - ( - let - duplicates = - # Filter out the groups with more than 1 element - lib.filter (l: lib.length l > 1) ( - # Grab the groups, we don't care about the group identifiers - lib.attrValues ( - # Group the settings that are the same in lower case - lib.groupBy lib.strings.toLower (lib.attrNames cfg.settings) - ) - ); - formattedDuplicates = lib.concatMapStringsSep ", " ( - dupl: "(${lib.concatStringsSep ", " dupl})" - ) duplicates; - in - { - assertion = lib.length duplicates == 0; - message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}''; - } - ) - ] - ++ lib.forEach cfg.listenAddresses ( - { addr, ... }: - { - assertion = addr != null; - message = "addr must be specified in each listenAddresses entry"; - } - ); - }; + }) + ]; } diff --git a/nixos/modules/services/networking/udp-over-tcp.nix b/nixos/modules/services/networking/udp-over-tcp.nix new file mode 100644 index 000000000000..d4a63406f1e4 --- /dev/null +++ b/nixos/modules/services/networking/udp-over-tcp.nix @@ -0,0 +1,281 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + attrNames + escapeShellArgs + filterAttrs + getExe' + last + literalExpression + maintainers + mapAttrs' + mkOption + mkPackageOption + optionals + splitString + toInt + types + ; + + cfg = config.services.udp-over-tcp; + + commonOptions = { + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the appropriate ports in the firewall. + ''; + }; + + # Options and descriptions as indicated by `tcp2udp --help` and `udp2tcp --help`. + forward = mkOption { + type = types.str; + description = '' + The IP and port to forward all traffic to. + ''; + }; + recvBufferSize = mkOption { + type = types.nullOr types.ints.positive; + description = '' + If given, sets the SO_RCVBUF option on the TCP socket to the given number of bytes. + Changes the size of the operating system's receive buffer associated with the socket. + ''; + default = null; + }; + sendBufferSize = mkOption { + type = types.nullOr types.ints.positive; + description = '' + If given, sets the SO_SNDBUF option on the TCP socket to the given number of bytes. + Changes the size of the operating system's send buffer associated with the socket. + ''; + default = null; + }; + recvTimeout = mkOption { + type = types.nullOr types.ints.positive; + description = '' + An application timeout on receiving data from the TCP socket. + ''; + default = null; + }; + fwmark = mkOption { + type = types.nullOr types.ints.u32; + description = '' + If given, sets the SO_MARK option on the TCP socket. + ''; + default = null; + }; + nodelay = mkOption { + type = types.bool; + description = '' + Enables TCP_NODELAY on the TCP socket. + ''; + default = false; + }; + }; + tcp2udpSubmodule = { + options = commonOptions // { + threads = mkOption { + type = types.nullOr types.ints.positive; + description = '' + Sets the number of worker threads to use. + The default value is the number of cores available to the system. + ''; + default = null; + }; + bind = mkOption { + type = types.nullOr types.str; + description = '' + Which local IP to bind the UDP socket to. + ''; + default = null; + }; + }; + }; + udp2tcpSubmodule = { + options = commonOptions; + }; + + configToService = type: buildCmdline: listen: conf: { + name = "${type}-${listen}"; + value = { + description = "${type} tunnel from ${listen} to ${conf.forward}"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + + serviceConfig = { + Type = "exec"; + ExecStart = "${getExe' cfg.package type} " + escapeShellArgs (buildCmdline listen conf); + + DynamicUser = true; + User = "udp-over-tcp"; + + # CAP_NET_BIND_SERVICE in case we are binding to ports < 1024, CAP_NET_ADMIN only covers addresses. + # CAP_NET_ADMIN for setting SO_MARK on the socket. + AmbientCapabilities = [ + "CAP_NET_ADMIN" + "CAP_NET_BIND_SERVICE" + ]; + CapabilityBoundingSet = [ + "CAP_NET_ADMIN" + "CAP_NET_BIND_SERVICE" + ]; + + Restart = "on-failure"; + RestartSec = 10; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + }; + }; + }; + + buildCommonCmdline = + listen: conf: + optionals (conf.recvBufferSize != null) [ + "--recv-buffer" + conf.recvBufferSize + ] + ++ optionals (conf.sendBufferSize != null) [ + "--send-buffer" + conf.sendBufferSize + ] + ++ optionals (conf.recvTimeout != null) [ + "--tcp-recv-timeout" + conf.recvTimeout + ] + ++ optionals (conf.fwmark != null) [ + "--fwmark" + conf.fwmark + ] + ++ optionals conf.nodelay [ + "--nodelay" + ]; + buildTcp2udpCmdline = + listen: conf: + [ + "--tcp-listen" + listen + "--udp-forward" + conf.forward + ] + ++ optionals (conf.threads != null) [ + "--threads" + conf.threads + ] + ++ optionals (conf.bind != null) [ + "--udp-bind" + conf.bind + ] + ++ buildCommonCmdline listen conf; + buildUdp2tcpCmdline = + listen: conf: + [ + "--udp-listen" + listen + "--tcp-forward" + conf.forward + ] + ++ buildCommonCmdline listen conf; + + getFirewallPorts = + instances: + map (e: toInt (last (splitString ":" e))) ( + attrNames (filterAttrs (_: e: e.openFirewall) instances) + ); +in +{ + options.services.udp-over-tcp = { + package = mkPackageOption pkgs "udp-over-tcp" { }; + tcp2udp = mkOption { + type = types.attrsOf (types.submodule tcp2udpSubmodule); + example = literalExpression '' + { + "0.0.0.0:443" = { + forward = "127.0.0.1:51820"; + openFirewall = true; + }; + "0.0.0.0:444" = { + threads = 2; + forward = "127.0.0.1:51821"; + bind = "127.0.0.1"; + recvBufferSize = 16384; + sendBufferSize = 16384; + recvTimeout = 10; + fwmark = 1337; + nodelay = true; + }; + } + ''; + description = '' + Mapping of TCP listening ports to UDP forwarding ports or configurations. + ''; + default = { }; + }; + udp2tcp = mkOption { + type = types.attrsOf (types.submodule udp2tcpSubmodule); + example = literalExpression '' + { + "0.0.0.0:51820" = { + forward = "10.0.0.1:443"; + openFirewall = true; + }; + "0.0.0.0:51821" = { + forward = "10.0.0.1:444"; + recvBufferSize = 16384; + sendBufferSize = 16384; + recvTimeout = 10; + fwmark = 1337; + nodelay = true; + }; + } + ''; + description = '' + Mapping of UDP listening ports to TCP forwarding ports or configurations. + ''; + default = { }; + }; + }; + + config = { + systemd.services = + (mapAttrs' (configToService "tcp2udp" buildTcp2udpCmdline) cfg.tcp2udp) + // (mapAttrs' (configToService "udp2tcp" buildUdp2tcpCmdline) cfg.udp2tcp); + + networking.firewall.allowedTCPPorts = getFirewallPorts cfg.tcp2udp; + networking.firewall.allowedUDPPorts = getFirewallPorts cfg.udp2tcp; + }; + + meta.maintainers = with maintainers; [ timschumi ]; +} diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 79bba0314d84..5bcc5e5c38d8 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -183,8 +183,10 @@ let } # finally start daemon + # shellcheck disable=SC2086 exec wpa_supplicant $args ''; + enableStrictShellChecks = true; }; systemctl = "/run/current-system/systemd/bin/systemctl"; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index d58ed0f7c7e4..fd0dccbb306f 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -54,7 +54,6 @@ let in { meta.maintainers = with lib.maintainers; [ - Br1ght0ne happysalada ]; meta.doc = ./meilisearch.md; diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index 508a1ece72c0..c28c9b456b4a 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -91,7 +91,7 @@ in ''; }; - enableKepubify = mkEnableOption "kebup conversion support"; + enableKepubify = mkEnableOption "kepub conversion support"; enableBookUploading = mkOption { type = types.bool; diff --git a/nixos/modules/services/web-apps/immich-kiosk.nix b/nixos/modules/services/web-apps/immich-kiosk.nix new file mode 100644 index 000000000000..97aef228d73b --- /dev/null +++ b/nixos/modules/services/web-apps/immich-kiosk.nix @@ -0,0 +1,132 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.immich-kiosk; + format = pkgs.formats.json { }; + secretsReplacement = utils.genJqSecretsReplacement { + loadCredential = true; + } cfg.settings "/run/immich-kiosk/config.yaml"; +in +{ + meta.maintainers = with lib.maintainers; [ tlvince ]; + + options.services.immich-kiosk = { + enable = lib.mkEnableOption "Immich Kiosk slideshow service"; + + package = lib.mkPackageOption pkgs "immich-kiosk" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to open the firewall for the immich-kiosk port. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + options = { + immich_url = lib.mkOption { + type = lib.types.str; + default = config.services.immich.settings.server.externalDomain; + defaultText = lib.literalExpression "config.services.immich.settings.server.externalDomain"; + description = '' + URL of the immich instance. + ''; + }; + + kiosk.port = lib.mkOption { + type = lib.types.port; + default = 3000; + description = '' + Port on which immich-kiosk will listen. + ''; + }; + }; + }; + default = { }; + description = '' + Configuration for immich-kiosk. See + + for available options. Secret values can be loaded from files using + `._secret = "/path/to/secret";`. + ''; + example = lib.literalExpression '' + { + immich_url = "https://immich.example.com"; + immich_api_key._secret = "/run/secrets/immich-kiosk-api-key"; + albums = [ + "4fa933cf-051f-4621-9ac7-8d06776c261c" + "6466548c-4995-4fb5-ab1f-f63cc9ff3e5f" + ]; + duration = 30; + layout = "splitview"; + disable_ui = true; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.immich-kiosk = { + description = "Immich Kiosk slideshow service"; + after = [ "immich-server.service" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = secretsReplacement.script; + + serviceConfig = { + DynamicUser = true; + ExecStart = lib.getExe cfg.package; + Group = "immich-kiosk"; + LoadCredential = secretsReplacement.credentials; + Restart = "on-failure"; + RestartSec = 10; + RuntimeDirectory = "immich-kiosk"; + RuntimeDirectoryMode = "0700"; + SyslogIdentifier = "immich-kiosk"; + Type = "simple"; + User = "immich-kiosk"; + WorkingDirectory = "/run/immich-kiosk"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.kiosk.port ]; + }; +} diff --git a/nixos/modules/services/web-apps/immichframe.nix b/nixos/modules/services/web-apps/immichframe.nix new file mode 100644 index 000000000000..cbe7d57bab7b --- /dev/null +++ b/nixos/modules/services/web-apps/immichframe.nix @@ -0,0 +1,142 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.immichframe; + format = pkgs.formats.json { }; + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; +in +{ + options.services.immichframe = { + enable = mkEnableOption "ImmichFrame"; + package = lib.mkPackageOption pkgs "immichframe" { }; + + port = mkOption { + type = types.port; + default = 3000; + description = "The port that ImmichFrame will listen on."; + }; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + Accounts = mkOption { + type = types.listOf ( + types.submodule { + freeformType = format.type; + options = { + ImmichServerUrl = mkOption { + type = types.str; + example = "http://photos.example.com"; + description = "The URL of your Immich server."; + }; + ApiKey = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + API key to talk to the Immich server. + Warning: it will be world-readable in /nix/store. + Consider using {option}`ApiKeyFile` instead. + + See + + for details on what permissions this key needs. + ''; + }; + ApiKeyFile = mkOption { + type = types.nullOr types.externalPath; + default = null; + description = '' + File containing an API key to talk to the Immich server. + + See + + for details on what permissions this key needs. + ''; + }; + }; + } + ); + + description = '' + Accounts configuration, multiple are permitted. See + . + ''; + }; + }; + }; + default = { }; + description = '' + Configuration for ImmichFrame. See + for + options and defaults. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = lib.imap0 (i: account: { + assertion = lib.xor (account.ApiKey == null) (account.ApiKeyFile == null); + message = "Exactly one of {option}`services.immichframe.settings.Accounts[${toString i}].ApiKey` and {option}`services.immichframe.settings.Accounts[${toString i}].ApiKeyFile` must be specified"; + }) cfg.settings.Accounts; + + systemd.services.immichframe = + let + accountsWithApiKeyFiles = lib.filter (account: account.ApiKeyFile != null) cfg.settings.Accounts; + apiKeyFileToId = lib.listToAttrs ( + lib.imap0 ( + index: account: lib.nameValuePair account.ApiKeyFile "api-key-${toString index}" + ) accountsWithApiKeyFiles + ); + settingsPatchWithCredentialPaths = { + Accounts = map ( + account: + account + // ( + if account.ApiKeyFile != null then + { + ApiKeyFile = "/run/credentials/${config.systemd.services.immichframe.name}/${ + apiKeyFileToId.${account.ApiKeyFile} + }"; + } + else + { } + ) + ) cfg.settings.Accounts; + }; + settingsWithFixedSecretPaths = lib.recursiveUpdate cfg.settings settingsPatchWithCredentialPaths; + in + { + description = "Display your photos from Immich as a digital photo frame"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + IMMICHFRAME_CONFIG_PATH = pkgs.runCommand "Config" { } '' + mkdir $out + ln -s ${format.generate "Settings.json" settingsWithFixedSecretPaths} $out/Settings.json + ''; + }; + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} --urls=http://localhost:${toString cfg.port}"; + LoadCredential = lib.concatMapAttrsStringSep ":" ( + apiKeyFile: id: "${id}:${apiKeyFile}" + ) apiKeyFileToId; + DynamicUser = true; + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ jfly ]; +} diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 5fd4a5d059a6..930b58daf2df 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -466,7 +466,7 @@ in defaultText = literalExpression "true"; description = '' Create the database and database user locally. - This currently only applies if database type "mysql" is selected. + This currently only applies if database type "mysql" or "postgres" is selected. ''; }; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f5ffd2c46a81..6e50d5e517a1 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -264,7 +264,7 @@ let $decoded = json_decode(nix_read_secret($credential_name), true); if (json_last_error() !== JSON_ERROR_NONE) { - error_log(sprintf("Cannot decode %s, because: %s", $file, json_last_error_msg())); + error_log(sprintf("Cannot decode %s, because: %s", $credential_name, json_last_error_msg())); exit(1); } diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index f7eaf8d788a9..1fae59517aba 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -12,9 +12,7 @@ let configFile = format.generate "pretalx.cfg" cfg.settings; - finalPackage = cfg.package.override { - inherit (cfg) plugins; - }; + inherit (cfg) finalPackage; pythonEnv = finalPackage.python.buildEnv.override { extraLibs = @@ -41,6 +39,22 @@ in package = lib.mkPackageOption pkgs "pretalx" { }; + finalPackage = lib.mkOption { + type = lib.types.package; + default = cfg.package.override { + inherit (cfg) plugins; + }; + defaultText = '' + config.services.package.override { + inherit (config.services.pretalx) plugins; + } + ''; + readOnly = true; + description = '' + The effective pretalx package used. This is the base package with the selected plugins applied. + ''; + }; + group = lib.mkOption { type = lib.types.str; default = "pretalx"; @@ -220,8 +234,8 @@ in }; static = lib.mkOption { type = lib.types.path; - default = "${cfg.package.static}/"; - defaultText = lib.literalExpression "\${config.services.pretalx.package}.static}/"; + default = "${finalPackage.static}/"; + defaultText = "\${config.services.pretalx.finalPackage.static}/"; readOnly = true; description = '' Path to the directory that contains static files. @@ -299,7 +313,7 @@ in }; config = lib.mkIf cfg.enable { - # https://docs.pretalx.org/administrator/installation.html + # https://docs.pretalx.org/administrator/installation/ environment.systemPackages = [ (pkgs.writeScriptBin "pretalx-manage" '' @@ -331,7 +345,7 @@ in recommendedTlsSettings = lib.mkDefault true; upstreams.pretalx.servers."unix:/run/pretalx/pretalx.sock" = { }; virtualHosts.${cfg.nginx.domain} = { - # https://docs.pretalx.org/administrator/installation.html#step-7-ssl + # https://docs.pretalx.org/administrator/installation/#step-8-reverse-proxy extraConfig = '' more_set_headers "Referrer-Policy: same-origin"; more_set_headers "X-Content-Type-Options: nosniff"; @@ -442,7 +456,7 @@ in preStart = let versionString = lib.concatStringsSep "\n" ( - [ "pretalx-${cfg.package.version}" ] + [ "pretalx-${finalPackage.version}" ] ++ map (plugin: "${plugin.pname}-${plugin.version}") cfg.plugins ); in diff --git a/nixos/modules/services/web-apps/szurubooru.nix b/nixos/modules/services/web-apps/szurubooru.nix index 90d4bf1a74ee..a8fb063a770c 100644 --- a/nixos/modules/services/web-apps/szurubooru.nix +++ b/nixos/modules/services/web-apps/szurubooru.nix @@ -299,12 +299,14 @@ in ]); script = '' - export SZURUBOORU_SECRET="$(<${cfg.server.settings.secretFile})" - export SZURUBOORU_DATABASE_PASSWORD="$(<${cfg.database.passwordFile})" + export SZURUBOORU_SECRET="$(<$CREDENTIALS_DIRECTORY/secret)" + export SZURUBOORU_DATABASE_PASSWORD="$(<$CREDENTIALS_DIRECTORY/database)" ${lib.optionalString (cfg.server.settings.smtp.passFile != null) '' - export SZURUBOORU_SMTP_PASS=$(<${cfg.server.settings.smtp.passFile}) + export SZURUBOORU_SMTP_PASS=$(<$CREDENTIALS_DIRECTORY/smtp) ''} install -m0640 ${cfg.server.package.src}/config.yaml.dist ${cfg.dataDir}/config.yaml.dist + touch ${cfg.dataDir}/config.yaml + chmod 0640 ${cfg.dataDir}/config.yaml envsubst -i ${configFile} -o ${cfg.dataDir}/config.yaml sed 's|script_location = |script_location = ${cfg.server.package.src}/|' ${cfg.server.package.src}/alembic.ini > ${cfg.dataDir}/alembic.ini alembic upgrade head @@ -312,6 +314,14 @@ in ''; serviceConfig = { + LoadCredential = [ + "secret:${cfg.server.settings.secretFile}" + "database:${cfg.database.passwordFile}" + ] + ++ (lib.optionals (cfg.server.settings.smtp.passFile != null) [ + "smtp:${cfg.server.settings.smtp.passFile}" + ]); + User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix new file mode 100644 index 000000000000..607b99537f30 --- /dev/null +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -0,0 +1,714 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; +let + cfg = config.services.tt-rss; + + inherit (cfg) phpPackage; + + configVersion = 26; + + dbPort = + if cfg.database.port == null then + (if cfg.database.type == "pgsql" then 5432 else 3306) + else + cfg.database.port; + + poolName = "tt-rss"; + + mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; + + tt-rss-config = + let + password = + if (cfg.database.password != null) then + "'${(escape [ "'" "\\" ] cfg.database.password)}'" + else if (cfg.database.passwordFile != null) then + "file_get_contents('${cfg.database.passwordFile}')" + else + null; + in + pkgs.writeText "config.php" '' + + ''; + }; + + forceArticlePurge = mkOption { + type = types.int; + default = 0; + description = '' + When this option is not 0, users ability to control feed purging + intervals is disabled and all articles (which are not starred) + older than this amount of days are purged. + ''; + }; + + enableGZipOutput = mkOption { + type = types.bool; + default = true; + description = '' + Selectively gzip output to improve wire performance. This requires + PHP Zlib extension on the server. + Enabling this can break tt-rss in several httpd/php configurations, + if you experience weird errors and tt-rss failing to start, blank pages + after login, or content encoding errors, disable it. + ''; + }; + + phpPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.php; + defaultText = "pkgs.php"; + description = '' + php package to use for php fpm and update daemon. + ''; + }; + + plugins = mkOption { + type = types.listOf types.str; + default = [ + "auth_internal" + "note" + ]; + description = '' + List of plugins to load automatically for all users. + System plugins have to be specified here. Please enable at least one + authentication plugin here (auth_*). + Users may enable other user plugins from Preferences/Plugins but may not + disable plugins specified in this list. + Disabling auth_internal in this list would automatically disable + reset password link on the login form. + ''; + }; + + pluginPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + List of plugins to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the `plugins.local` directory. + ''; + }; + + themePackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + List of themes to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the `themes.local` directory. + ''; + }; + + logDestination = mkOption { + type = types.enum [ + "" + "sql" + "syslog" + ]; + default = "sql"; + description = '' + Log destination to use. Possible values: sql (uses internal logging + you can read in Preferences -> System), syslog - logs to system log. + Setting this to blank uses PHP logging (usually to http server + error.log). + ''; + }; + + updateDaemon = { + commandFlags = mkOption { + type = types.str; + default = "--quiet"; + description = '' + Command-line flags passed to the update daemon. + The default --quiet flag mutes all logging, including errors. + ''; + }; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines to append to `config.php`. + ''; + }; + }; + }; + + imports = [ + (mkRemovedOptionModule [ "services" "tt-rss" "checkForUpdates" ] '' + This option was removed because setting this to true will cause TT-RSS + to be unable to start if an automatic update of the code in + services.tt-rss.root leads to a database schema upgrade that is not + supported by the code active in the Nix store. + '') + ]; + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.database.password != null -> cfg.database.passwordFile == null; + message = "Cannot set both password and passwordFile"; + } + { + assertion = + cfg.database.createLocally -> cfg.database.name == cfg.user && cfg.database.user == cfg.user; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.tt-rss.database.createLocally` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } + ]; + + services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { + ${poolName} = { + inherit (cfg) user; + inherit phpPackage; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; + }; + }; + + # NOTE: No configuration is done if not using virtual host + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + ${cfg.virtualHost} = { + root = "${cfg.root}/www"; + + locations."/" = { + index = "index.php"; + }; + + # some clients might still access this old path directly, forward them to the API instead + # e.g. https://apps.apple.com/de/app/tiny-reader-rss/id689519762 at version 2.2.0 + locations."~* /feed-icons/(\\d+)\\.ico" = { + return = "302 /public.php?op=feed_icon&id=$1"; + }; + + locations."~ \\.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; + fastcgi_index index.php; + ''; + }; + }; + }; + }; + + systemd.tmpfiles.rules = [ + "d '${cfg.root}' 0555 ${cfg.user} tt_rss - -" + "d '${cfg.root}/lock' 0755 ${cfg.user} tt_rss - -" + "d '${cfg.root}/cache' 0755 ${cfg.user} tt_rss - -" + "d '${cfg.root}/cache/upload' 0755 ${cfg.user} tt_rss - -" + "d '${cfg.root}/cache/images' 0755 ${cfg.user} tt_rss - -" + "d '${cfg.root}/cache/export' 0755 ${cfg.user} tt_rss - -" + "d '${cfg.root}/cache/feed-icons' 0755 ${cfg.user} tt_rss - -" + "L+ '${cfg.root}/www' - - - - ${servedRoot}" + ]; + + systemd.services = { + phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { + restartTriggers = [ servedRoot ]; + }; + + tt-rss = { + description = "Tiny Tiny RSS feeds update daemon"; + + preStart = '' + ${phpPackage}/bin/php ${cfg.root}/www/update.php --update-schema --force-yes + ''; + + serviceConfig = { + User = "${cfg.user}"; + Group = "tt_rss"; + ExecStart = "${phpPackage}/bin/php ${cfg.root}/www/update.php --daemon ${cfg.updateDaemon.commandFlags}"; + Restart = "on-failure"; + RestartSec = "60"; + SyslogIdentifier = "tt-rss"; + }; + + wantedBy = [ "multi-user.target" ]; + requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.target"; + after = [ + "network.target" + ] + ++ optional mysqlLocal "mysql.service" + ++ optional pgsqlLocal "postgresql.target"; + }; + }; + + services.mysql = mkIf mysqlLocal { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + services.postgresql = mkIf pgsqlLocal { + enable = mkDefault true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensureDBOwnership = true; + } + ]; + }; + + users.users.tt_rss = optionalAttrs (cfg.user == "tt_rss") { + description = "tt-rss service user"; + isSystemUser = true; + group = "tt_rss"; + }; + + users.groups.tt_rss = { }; + }; +} diff --git a/nixos/modules/services/x11/xscreensaver.nix b/nixos/modules/services/x11/xscreensaver.nix index b9523ef2ae53..dbd1a89b5ffd 100644 --- a/nixos/modules/services/x11/xscreensaver.nix +++ b/nixos/modules/services/x11/xscreensaver.nix @@ -13,6 +13,22 @@ in enable = lib.mkEnableOption "xscreensaver user service"; package = lib.mkPackageOption pkgs "xscreensaver" { }; + + hooks = lib.mkOption { + type = with lib.types; attrsOf lines; + description = '' + An attrset of events and commands to run upon each event. + Refer to for supported events. + ''; + defaultText = lib.literalExpression "{ }"; + default = { }; + example = lib.literalExpression '' + # Reconfigure autorandr on screen wake up + { + "RUN" = "''${lib.getExe pkgs.autorandr} --change --ignore-lid"; + }; + ''; + }; }; config = lib.mkIf cfg.enable { @@ -25,14 +41,48 @@ in source = "${pkgs.xscreensaver}/libexec/xscreensaver/xscreensaver-auth"; }; - systemd.user.services.xscreensaver = { - enable = true; - description = "XScreenSaver"; - after = [ "graphical-session-pre.target" ]; - partOf = [ "graphical-session.target" ]; - wantedBy = [ "graphical-session.target" ]; - path = [ cfg.package ]; - serviceConfig.ExecStart = "${cfg.package}/bin/xscreensaver -no-splash"; + systemd.user.services = { + xscreensaver = { + enable = true; + description = "XScreenSaver"; + after = [ "graphical-session-pre.target" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + path = [ cfg.package ]; + serviceConfig.ExecStart = "${cfg.package}/bin/xscreensaver -no-splash"; + }; + + xscreensaver-hooks = lib.mkIf (cfg.enable && cfg.hooks != { }) { + enable = true; + description = "Run commands on XScreenSaver events"; + after = [ + "graphical-session.target" + "xscreensaver.service" + ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + path = [ cfg.package ]; + serviceConfig = { + Restart = "always"; + }; + script = + let + handlers = lib.concatMapAttrsStringSep "\n" (event: action: '' + "${event}") + ( ${action} + ) + ;; + '') cfg.hooks; + in + '' + xscreensaver-command -watch | while read event rest; do + echo "XScreenSaver handler script got \"$event\"" + case $event in + ${handlers} + esac + done + ''; + }; }; }; diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 5edd09290bbf..c9346c33deff 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -54,124 +55,7 @@ let else interpreter; - # Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from: - # - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix - # and - # - https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh - # TODO: maybe put these in a JSON file? - magics = { - armv6l-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; - }; - armv7l-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; - }; - aarch64-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff''; - }; - aarch64_be-linux = { - magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - i386-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - i486-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - i586-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - i686-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - x86_64-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - alpha-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - sparc64-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - sparc-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - powerpc-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - powerpc64-linux = { - magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - powerpc64le-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00''; - }; - mips-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; - }; - mipsel-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; - }; - mips64-linux = { - magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - mips64el-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - mips64-linuxabin32 = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; - }; - mips64el-linuxabin32 = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; - }; - riscv32-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - riscv64-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - loongarch64-linux = { - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; - }; - wasm32-wasi = { - magicOrExtension = ''\x00asm''; - mask = ''\xff\xff\xff\xff''; - }; - wasm64-wasi = { - magicOrExtension = ''\x00asm''; - mask = ''\xff\xff\xff\xff''; - }; - s390x-linux = { - magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; - }; - x86_64-windows.magicOrExtension = "MZ"; - i686-windows.magicOrExtension = "MZ"; - }; - + magics = utils.binfmtMagics; in { imports = [ diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index e611d9040f8b..efc04ad75abc 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -647,6 +647,8 @@ in "sha512" "af_alg" "algif_skcipher" + "cryptd" + "input_leds" # for capslock LED on most keyboards in case decryption requires password ]; description = '' A list of cryptographic kernel modules needed to decrypt the root device(s). @@ -1135,8 +1137,6 @@ in boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" - "cryptd" - "input_leds" ] ++ luks.cryptoModules # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3c827c3d6627..7fb5c2259062 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -181,9 +181,10 @@ let "machines.target" "systemd-machined.service" ] - ++ [ + ++ optionals cfg.package.withNspawn [ "systemd-nspawn@.service" - + ] + ++ [ # Misc. "systemd-sysctl.service" "systemd-machine-id-commit.service" diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index 7b7197cb0c10..c51b40325cfd 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -87,6 +87,7 @@ in contents."/etc/unl0kr.conf".source = settingsFormat.generate "unl0kr.conf" cfg.settings; storePaths = with pkgs; [ libinput + libinput.out xkeyboard_config (lib.getExe' cfg.package "unl0kr") "${cfg.package}/libexec/unl0kr-agent" diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index a88eb8b0ca64..2a6d00296303 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1926,7 +1926,7 @@ in # Udev attributes for systemd to name the device and to create a .device target. systemdAttrs = n: - ''NAME:="${n}", ENV{INTERFACE}="${n}", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/${n}", TAG+="systemd"''; + ''NAME:="${n}", ENV{ID_NET_NAME}="${n}", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/${n}", TAG+="systemd"''; in flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) ( device: diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index a4ae4e2c7ffc..dc1ec27c967f 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -394,6 +394,11 @@ in The backend used to setup virtual network firewall rules. ''; }; + + dbus = { + enable = mkEnableOption "exposing libvirtd APIs over D-Bus"; + package = mkPackageOption pkgs "libvirt-dbus" { }; + }; }; ###### implementation @@ -426,15 +431,28 @@ in boot.kernelModules = [ "tun" ]; - users.groups.libvirtd.gid = config.ids.gids.libvirtd; - - # libvirtd runs qemu as this user and group by default - users.extraGroups.qemu-libvirtd.gid = config.ids.gids.qemu-libvirtd; - users.extraUsers.qemu-libvirtd = { - uid = config.ids.uids.qemu-libvirtd; - isNormalUser = false; - group = "qemu-libvirtd"; - }; + users = lib.mkMerge [ + { + # libvirtd runs qemu as this user and group by default + users.qemu-libvirtd = { + uid = config.ids.uids.qemu-libvirtd; + isNormalUser = false; + group = "qemu-libvirtd"; + }; + groups = { + libvirtd.gid = config.ids.gids.libvirtd; + qemu-libvirtd.gid = config.ids.gids.qemu-libvirtd; + }; + } + (lib.mkIf cfg.dbus.enable { + users.libvirtdbus = { + isSystemUser = true; + group = "libvirtdbus"; + description = "Libvirt D-Bus bridge"; + }; + groups.libvirtdbus = { }; + }) + ]; security.wrappers.qemu-bridge-helper = { setuid = true; @@ -449,7 +467,7 @@ in services.firewalld.packages = [ cfg.package ]; - systemd.packages = [ cfg.package ]; + systemd.packages = [ cfg.package ] ++ lib.optional cfg.dbus.enable cfg.dbus.package; systemd.services.libvirtd-config = { description = "Libvirt Virtual Machine Management Daemon - configuration"; @@ -629,5 +647,7 @@ in (mkIf cfg.nss.enable (mkOrder 430 [ "libvirt" ])) (mkIf cfg.nss.enableGuest (mkOrder 432 [ "libvirt_guest" ])) ]; + + services.dbus.packages = lib.optional cfg.dbus.enable cfg.dbus.package; }; } diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 24337cb6f8d7..5b3576c97acd 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -30,7 +30,7 @@ let }; imageFile = mkOption { - type = with types; nullOr package; + type = with types; nullOr pathInStore; default = null; description = '' Path to an image file to load before running the image. This can diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 5f01142b4a13..21a0e083d871 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -24,23 +24,25 @@ let inherit (cfg.package) meta; preferLocalBuild = true; } - '' - mkdir -p $out/bin - ln -s ${cfg.package}/bin/podman $out/bin/docker + ( + '' + mkdir -p $out/bin + ln -s ${cfg.package}/bin/podman $out/bin/docker - mkdir -p $man/share/man/man1 - for f in ${cfg.package.man}/share/man/man1/*; do - basename=$(basename $f | sed s/podman/docker/g) - ln -s $f $man/share/man/man1/$basename - done - '' - + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - export HOME=$(mktemp -d) # work around `docker ` - installShellCompletion --cmd docker \ - --bash <($out/bin/docker completion bash) \ - --zsh <($out/bin/docker completion zsh) \ - --fish <($out/bin/docker completion fish) - ''; + mkdir -p $man/share/man/man1 + for f in ${cfg.package.man}/share/man/man1/*; do + basename=$(basename $f | sed s/podman/docker/g) + ln -s $f $man/share/man/man1/$basename + done + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME=$(mktemp -d) # work around `docker ` + installShellCompletion --cmd docker \ + --bash <($out/bin/docker completion bash) \ + --zsh <($out/bin/docker completion zsh) \ + --fish <($out/bin/docker completion fish) + '' + ); in { diff --git a/nixos/modules/virtualisation/rosetta.nix b/nixos/modules/virtualisation/rosetta.nix index 765fa13d1d86..6a7cf86f5e60 100644 --- a/nixos/modules/virtualisation/rosetta.nix +++ b/nixos/modules/virtualisation/rosetta.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -72,8 +73,7 @@ in # The required flags for binfmt are documented by Apple: # https://developer.apple.com/documentation/virtualization/running_intel_binaries_in_linux_vms_with_rosetta - magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00''; - mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + inherit (utils.binfmtMagics.x86_64-linux) magicOrExtension mask; fixBinary = true; matchCredentials = true; preserveArgvZero = true; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 66b0aeb83c7a..86197d2e53f5 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -95,6 +95,12 @@ in type = lib.types.bool; description = "Whether to load vboxsf"; }; + + use3rdPartyModules = lib.mkOption { + default = true; + type = lib.types.bool; + description = "Whether to use the kernel modules provided by VirtualBox instead of the ones from the upstream kernel."; + }; }; ###### implementation @@ -111,7 +117,7 @@ in environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; - boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; + boot.extraModulePackages = lib.mkIf cfg.use3rdPartyModules [ kernel.virtualboxGuestAdditions ]; systemd.services.virtualbox = { description = "VirtualBox Guest Services"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e54cceea4f2d..dea336cb1173 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -752,9 +752,11 @@ in iftop = runTest ./iftop.nix; image-contents = handleTest ./image-contents.nix { }; immich = runTest ./web-apps/immich.nix; + immich-kiosk = runTest ./web-apps/immich-kiosk.nix; immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix; immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; + immichframe = runTest ./web-apps/immichframe.nix; incron = runTest ./incron.nix; incus = import ./incus { inherit runTestOn; @@ -1302,6 +1304,7 @@ in public-inbox = runTest ./public-inbox.nix; pufferpanel = runTest ./pufferpanel.nix; pulseaudio = discoverTests (import ./pulseaudio.nix); + pulseaudio-tcp = runTest ./pulseaudio-tcp.nix; pykms = runTest ./pykms.nix; pyload = runTest ./pyload.nix; qbittorrent = runTest ./qbittorrent.nix; @@ -1457,9 +1460,7 @@ in syncthing-guiPassword = runTest ./syncthing/guiPassword.nix; syncthing-guiPasswordFile = runTest ./syncthing/guiPasswordFile.nix; syncthing-init = runTest ./syncthing/init.nix; - # FIXME: Test has been failing since 2025-07-06: - # https://github.com/NixOS/nixpkgs/issues/447674 - # syncthing-many-devices = runTest ./syncthing/many-devices.nix; + syncthing-many-devices = runTest ./syncthing/many-devices.nix; syncthing-no-settings = runTest ./syncthing/no-settings.nix; syncthing-relay = runTest ./syncthing/relay.nix; sysfs = runTest ./sysfs.nix; @@ -1581,6 +1582,7 @@ in trickster = runTest ./trickster.nix; trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix; tsm-client-gui = runTest ./tsm-client-gui.nix; + tt-rss = runTest ./web-apps/tt-rss.nix; ttyd = runTest ./web-servers/ttyd.nix; tuliprox = runTest ./tuliprox.nix; tuned = runTest ./tuned.nix; @@ -1595,6 +1597,7 @@ in tzupdate = runTest ./tzupdate.nix; ucarp = runTest ./ucarp.nix; udisks2 = runTest ./udisks2.nix; + udp-over-tcp = runTest ./udp-over-tcp.nix; ulogd = runTest ./ulogd/ulogd.nix; umami = runTest ./web-apps/umami.nix; umurmur = runTest ./umurmur.nix; diff --git a/nixos/tests/angrr.nix b/nixos/tests/angrr.nix index e4bca782a1ac..2c2baefd8e86 100644 --- a/nixos/tests/angrr.nix +++ b/nixos/tests/angrr.nix @@ -32,38 +32,38 @@ # Creates some auto gc roots # Use /run/current-system so that we do not need to build anything new - machine.succeed("nix build /run/current-system --out-link /tmp/root-auto-gc-root-1") - machine.succeed("nix build /run/current-system --out-link /tmp/root-auto-gc-root-2") - machine.succeed("su normal --command 'nix build /run/current-system --out-link /tmp/user-auto-gc-root-1'") - machine.succeed("su normal --command 'nix build /run/current-system --out-link /tmp/user-auto-gc-root-2'") + machine.succeed("nix build /run/current-system --out-link /tmp/result-root-auto-gc-root-1") + machine.succeed("nix build /run/current-system --out-link /tmp/result-root-auto-gc-root-2") + machine.succeed("su normal --command 'nix build /run/current-system --out-link /tmp/result-user-auto-gc-root-1'") + machine.succeed("su normal --command 'nix build /run/current-system --out-link /tmp/result-user-auto-gc-root-2'") machine.systemctl("start nix-gc.service") # Not auto gc root will be removed - machine.succeed("readlink /tmp/root-auto-gc-root-1") - machine.succeed("readlink /tmp/root-auto-gc-root-2") - machine.succeed("readlink /tmp/user-auto-gc-root-1") - machine.succeed("readlink /tmp/user-auto-gc-root-2") + machine.succeed("readlink /tmp/result-root-auto-gc-root-1") + machine.succeed("readlink /tmp/result-root-auto-gc-root-2") + machine.succeed("readlink /tmp/result-user-auto-gc-root-1") + machine.succeed("readlink /tmp/result-user-auto-gc-root-2") # Change time to 8 days after (greater than 7d) machine.succeed("date -s '8 days'") # Touch GC roots `-2` - machine.succeed("touch /tmp/root-auto-gc-root-2 --no-dereference") - machine.succeed("touch /tmp/user-auto-gc-root-2 --no-dereference") + machine.succeed("touch /tmp/result-root-auto-gc-root-2 --no-dereference") + machine.succeed("touch /tmp/result-user-auto-gc-root-2 --no-dereference") machine.systemctl("start nix-gc.service") # Only GC roots `-1` are removed - machine.succeed("test ! -f /tmp/root-auto-gc-root-1") - machine.succeed("readlink /tmp/root-auto-gc-root-2") - machine.succeed("test ! -f /tmp/user-auto-gc-root-1") - machine.succeed("readlink /tmp/user-auto-gc-root-2") + machine.succeed("test ! -e /tmp/result-root-auto-gc-root-1") + machine.succeed("readlink /tmp/result-root-auto-gc-root-2") + machine.succeed("test ! -e /tmp/result-user-auto-gc-root-1") + machine.succeed("readlink /tmp/result-user-auto-gc-root-2") # Change time again machine.succeed("date -s '8 days'") machine.systemctl("start nix-gc.service") # All auto GC roots are removed - machine.succeed("test ! -f /tmp/root-auto-gc-root-2") - machine.succeed("test ! -f /tmp/user-auto-gc-root-2") + machine.succeed("test ! -e /tmp/result-root-auto-gc-root-2") + machine.succeed("test ! -e /tmp/result-user-auto-gc-root-2") # Direnv integration test machine.succeed("mkdir /tmp/test-direnv") @@ -74,7 +74,7 @@ # The root will be removed if we does not use the direnv recently machine.succeed("date -s '8 days'") machine.systemctl("start nix-gc.service") - machine.succeed("test ! -f /tmp/test-direnv/.direnv/gc-root") + machine.succeed("test ! -e /tmp/test-direnv/.direnv/gc-root") # Recreate the root machine.succeed("nix build /run/current-system --out-link /tmp/test-direnv/.direnv/gc-root") diff --git a/nixos/tests/blint.nix b/nixos/tests/blint.nix index cf66da6ab93c..ea0a14cb4b1f 100644 --- a/nixos/tests/blint.nix +++ b/nixos/tests/blint.nix @@ -7,10 +7,12 @@ { name = "owasp blint test"; - meta.maintainers = with lib; [ - maintainers.ethancedwards8 - teams.ngi - ]; + meta.maintainers = + with lib; + [ + maintainers.ethancedwards8 + ] + ++ teams.ngi.members; nodes.machine = { environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 0b216c439bda..97658291d4e3 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -3,7 +3,6 @@ name = "caddy"; meta = with pkgs.lib.maintainers; { maintainers = [ - Br1ght0ne stepbrobd ]; }; diff --git a/nixos/tests/corteza.nix b/nixos/tests/corteza.nix index 514bb5339fc8..35b19a74ef9b 100644 --- a/nixos/tests/corteza.nix +++ b/nixos/tests/corteza.nix @@ -4,7 +4,7 @@ let in { name = "corteza"; - meta.maintainers = [ lib.teams.ngi.members ]; + meta.maintainers = lib.teams.ngi.members; nodes.machine = { services.corteza = { diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix index 82eb6923c5c8..ffb43d85367f 100644 --- a/nixos/tests/dep-scan.nix +++ b/nixos/tests/dep-scan.nix @@ -7,10 +7,12 @@ { name = "owasp dep-scan test"; - meta.maintainers = with lib; [ - maintainers.ethancedwards8 - teams.ngi - ]; + meta.maintainers = + with lib; + [ + maintainers.ethancedwards8 + ] + ++ teams.ngi.members; nodes.machine = { environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 73658b67fb13..d30c48132d89 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -4,7 +4,6 @@ name = "docker-registry"; meta = with pkgs.lib.maintainers; { maintainers = [ - globin ironpinguin cafkafk ]; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index eb92d6e21b91..4279e190a213 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -4,7 +4,6 @@ name = "docker"; meta = with pkgs.lib.maintainers; { maintainers = [ - nequissimus offline ]; }; diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index 6e94771b1ff1..ba030cb0c3d9 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -1,9 +1,6 @@ { pkgs, ... }: { name = "environment"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; nodes.machine = { pkgs, lib, ... }: diff --git a/nixos/tests/geoserver.nix b/nixos/tests/geoserver.nix index 3e9416961e90..9f1369ecb95e 100644 --- a/nixos/tests/geoserver.nix +++ b/nixos/tests/geoserver.nix @@ -19,7 +19,7 @@ in name = "geoserver"; meta = { - maintainers = with lib; [ teams.geospatial.members ]; + maintainers = lib.teams.geospatial.members; }; nodes = { @@ -76,9 +76,11 @@ in _, stdout = machine.execute(f"cat {log_file}") print(stdout.replace("\\n", "\n")) assert "GDAL Native Library loaded" in stdout, "gdal" - assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf" assert "Unable to load library 'netcdf'" not in stdout, "netcdf" + # libjpeg-turbo is disabled as of 2.28.1. + # assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" + ''; } diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index 622f4b6dac05..dc0412f7de2f 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -1,9 +1,6 @@ { pkgs, ... }: { name = "hub"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; nodes.hub = { pkgs, ... }: diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index ce2edac32386..1a9c1605ec43 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -30,7 +30,6 @@ in { name = "gitlab"; meta.maintainers = with lib.maintainers; [ - globin yayayayaka ]; diff --git a/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix index 133189f1e769..b5d1a31f3c60 100644 --- a/nixos/tests/k3s/auto-deploy-charts.nix +++ b/nixos/tests/k3s/auto-deploy-charts.nix @@ -27,9 +27,57 @@ import ../make-test-python.nix ( pkgs.runCommand "k3s-test-chart.tgz" { nativeBuildInputs = [ pkgs.kubernetes-helm ]; + chart = builtins.toJSON { + name = "k3s-test-chart"; + version = "0.1.0"; + }; + values = builtins.toJSON { + restartPolicy = "Never"; + runCommand = ""; + image = { + repository = "foo"; + tag = "1.0.0"; + }; + }; + job = builtins.toJSON { + apiVersion = "batch/v1"; + kind = "Job"; + metadata = { + name = "{{ .Release.Name }}"; + namespace = "{{ .Release.Namespace }}"; + }; + spec = { + template = { + spec = { + containers = [ + { + name = "test"; + image = "{{ .Values.image.repository }}:{{ .Values.image.tag }}"; + command = [ "sh" ]; + args = [ + "-c" + "{{ .Values.runCommand }}" + ]; + } + ]; + restartPolicy = "{{ .Values.restartPolicy }}"; + }; + }; + }; + }; + passAsFile = [ + "values" + "chart" + "job" + ]; } '' - helm package ${./k3s-test-chart} + mkdir -p chart/templates + cp "$chartPath" chart/Chart.yaml + cp "$valuesPath" chart/values.yaml + cp "$jobPath" chart/templates/job.json + + helm package chart mv ./*.tgz $out ''; # The common Helm chart that is used in this test diff --git a/nixos/tests/k3s/k3s-test-chart/Chart.yaml b/nixos/tests/k3s/k3s-test-chart/Chart.yaml deleted file mode 100644 index 9cc0ae87678f..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: k3s-test-chart -description: A Helm chart that is used in k3s NixOS tests. - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" diff --git a/nixos/tests/k3s/k3s-test-chart/templates/job.yaml b/nixos/tests/k3s/k3s-test-chart/templates/job.yaml deleted file mode 100644 index 029453e56219..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/templates/job.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ .Release.Name | quote }} - namespace: {{ .Release.Namespace | quote }} -spec: - template: - spec: - containers: - - name: test - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - command: ["sh"] - args: ["-c", "{{ .Values.runCommand }}"] - restartPolicy: {{ .Values.restartPolicy | quote }} diff --git a/nixos/tests/k3s/k3s-test-chart/values.yaml b/nixos/tests/k3s/k3s-test-chart/values.yaml deleted file mode 100644 index cca4a557fd90..000000000000 --- a/nixos/tests/k3s/k3s-test-chart/values.yaml +++ /dev/null @@ -1,5 +0,0 @@ -restartPolicy: "Never" -runCommand: "" -image: - repository: foo - tag: 1.0.0 diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix index 6ff5c604e78f..dd35560c0c8f 100644 --- a/nixos/tests/kafka/base.nix +++ b/nixos/tests/kafka/base.nix @@ -11,9 +11,6 @@ let }: (import ../make-test-python.nix { inherit name; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; nodes = { kafka = diff --git a/nixos/tests/kernel-generic/default.nix b/nixos/tests/kernel-generic/default.nix index 60337d82bb70..fe0907d6d32c 100644 --- a/nixos/tests/kernel-generic/default.nix +++ b/nixos/tests/kernel-generic/default.nix @@ -46,7 +46,6 @@ let name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { maintainers = [ - nequissimus atemu ma27 ]; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index d7df4c560177..8ec9efe4700b 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -16,6 +16,7 @@ touch /tmp/qemu_hook_is_working ''}"; libvirtd.nss.enable = true; + libvirtd.dbus.enable = true; }; boot.supportedFilesystems = [ "zfs" ]; networking.hostId = "deadbeef"; # needed for zfs @@ -72,5 +73,15 @@ with subtest("test if hooks are linked and run"): virthost.succeed("ls /var/lib/libvirt/hooks/qemu.d/is_working") virthost.succeed("ls /tmp/qemu_hook_is_working") + + with subtest("check libvirt over dbus"): + # The service is activated on-demand and shouldn't be active yet + virthost.fail("systemctl is-active libvirt-dbus.service") + + # Get the hostname property of the Test connection (this will activate the service) + virthost.succeed("busctl get-property org.libvirt /org/libvirt/Test org.libvirt.Connect Hostname") + + # Now the service should be active + virthost.succeed("systemctl is-active libvirt-dbus.service") ''; } diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix index 24824a30cd4b..80b50fb62742 100644 --- a/nixos/tests/lomiri-camera-app.nix +++ b/nixos/tests/lomiri-camera-app.nix @@ -244,12 +244,12 @@ in machine.send_key("alt-f10") machine.sleep(5) machine.wait_for_text("${feedLabel}") - machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result + machine.succeed("xdotool mousemove 510 720 click 1") # open up QR decode result # OCR is struggling to recognise the text. Click the clipboard button, check what got copied machine.sleep(5) machine.screenshot("lomiri-barcode_decode") - machine.succeed("xdotool mousemove 540 590 click 1") + machine.succeed("xdotool mousemove 540 640 click 1") machine.wait_until_succeeds("env DISPLAY=:0 xclip -selection clipboard -o | grep -q '${feedQrContent}'") ''; } diff --git a/nixos/tests/matrix/mautrix-discord.nix b/nixos/tests/matrix/mautrix-discord.nix index 2609005c0ccc..1e53baac7af2 100644 --- a/nixos/tests/matrix/mautrix-discord.nix +++ b/nixos/tests/matrix/mautrix-discord.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let homeserverUrl = "http://homeserver:8008"; in @@ -60,9 +60,8 @@ in displayname = "Discord bridge bot"; avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC"; }; - # These will be generated automatically - as_token = "generate"; - hs_token = "generate"; + # Don't override as_token/hs_token - let them use the default placeholder + # which will trigger automatic generation database = { type = "sqlite3"; @@ -86,6 +85,7 @@ in environment.systemPackages = [ pkgs.nettools + pkgs.yq ]; }; @@ -156,7 +156,45 @@ in with subtest("verify registration file was created"): homeserver.wait_until_succeeds("test -f /var/lib/mautrix-discord/discord-registration.yaml") - homeserver.succeed("ls -la /var/lib/mautrix-discord/") + + # Verify tokens were generated and are not default values + config_as_token = homeserver.succeed("yq -r '.appservice.as_token' /var/lib/mautrix-discord/config.yaml").strip() + config_hs_token = homeserver.succeed("yq -r '.appservice.hs_token' /var/lib/mautrix-discord/config.yaml").strip() + reg_as_token = homeserver.succeed("yq -r '.as_token' /var/lib/mautrix-discord/discord-registration.yaml").strip() + reg_hs_token = homeserver.succeed("yq -r '.hs_token' /var/lib/mautrix-discord/discord-registration.yaml").strip() + + print(f"Config as_token: {config_as_token[:20]}...") + print(f"Config hs_token: {config_hs_token[:20]}...") + + # Verify tokens are not the default placeholder or "generate" + assert config_as_token not in ["This value is generated when generating the registration", "generate"], \ + f"Config as_token was not replaced: {config_as_token}" + assert config_hs_token not in ["This value is generated when generating the registration", "generate"], \ + f"Config hs_token was not replaced: {config_hs_token}" + + # Verify tokens match between config and registration + assert config_as_token == reg_as_token, \ + f"as_token mismatch: config={config_as_token[:20]}... vs reg={reg_as_token[:20]}..." + assert config_hs_token == reg_hs_token, \ + f"hs_token mismatch: config={config_hs_token[:20]}... vs reg={reg_hs_token[:20]}..." + + print("Tokens generated and synchronized correctly") + + with subtest("verify tokens persist after service restart"): + # Restart the registration service to simulate rebuild + homeserver.succeed("systemctl restart mautrix-discord-registration.service") + homeserver.wait_for_unit("mautrix-discord-registration.service") + + # Verify tokens were preserved + config_as_token_2 = homeserver.succeed("yq -r '.appservice.as_token' /var/lib/mautrix-discord/config.yaml").strip() + config_hs_token_2 = homeserver.succeed("yq -r '.appservice.hs_token' /var/lib/mautrix-discord/config.yaml").strip() + + assert config_as_token_2 == config_as_token, \ + f"as_token changed after restart: {config_as_token[:20]}... -> {config_as_token_2[:20]}..." + assert config_hs_token_2 == config_hs_token, \ + f"hs_token changed after restart: {config_hs_token[:20]}... -> {config_hs_token_2[:20]}..." + + print("Tokens persisted correctly after restart") with subtest("verify bridge connects to homeserver"): # Give the bridge a moment to connect diff --git a/nixos/tests/meilisearch.nix b/nixos/tests/meilisearch.nix index 9a27fd05800c..ea7959a22619 100644 --- a/nixos/tests/meilisearch.nix +++ b/nixos/tests/meilisearch.nix @@ -12,7 +12,6 @@ let in { name = "meilisearch"; - meta.maintainers = with lib.maintainers; [ Br1ght0ne ]; nodes.machine = { ... }: diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index f84a79949e63..a81fdf4faf33 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -6,7 +6,6 @@ in { lib, pkgs, ... }: { name = "minecraft-server"; - meta.maintainers = with lib.maintainers; [ nequissimus ]; node.pkgsReadOnly = false; diff --git a/nixos/tests/mitmproxy.nix b/nixos/tests/mitmproxy.nix index fe571bc430d0..1a3d98d7fcf2 100644 --- a/nixos/tests/mitmproxy.nix +++ b/nixos/tests/mitmproxy.nix @@ -9,7 +9,7 @@ let in { name = "mitmproxy"; - meta.maintainers = [ lib.teams.ngi.members ]; + meta.maintainers = lib.teams.ngi.members; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix index cff589f2807e..78106b61d778 100644 --- a/nixos/tests/nominatim.nix +++ b/nixos/tests/nominatim.nix @@ -10,10 +10,7 @@ in { name = "nominatim"; meta = { - maintainers = with lib.teams; [ - geospatial.members - ngi.members - ]; + maintainers = with lib.teams; geospatial.members ++ ngi.members; }; nodes = { diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index a59f49312c23..4bf584338c49 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -224,6 +224,23 @@ in ]; }; + server-null-pam = + { pkgs, ... }: + { + services.openssh = { + enable = true; + package = pkgs.opensshPackages.openssh.override { + withPAM = false; + }; + settings = { + UsePAM = null; + }; + }; + users.users.root.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + }; + server-sftp = { pkgs, ... }: { @@ -250,6 +267,15 @@ in }; }; + server-no-sshd-with-key = + { pkgs, ... }: + { + services.openssh.generateHostKeys = true; + users.users.root.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + }; + client = { ... }: { @@ -270,12 +296,18 @@ in server_match_rule.wait_for_unit("sshd", timeout=30) server_no_openssl.wait_for_unit("sshd", timeout=30) server_no_pam.wait_for_unit("sshd", timeout=30) + server_null_pam.wait_for_unit("sshd", timeout=30) + server_null_pam.fail("journalctl -u sshd.service | grep 'Unsupported option UsePAM'") server_sftp.wait_for_unit("sshd", timeout=30) server_lazy.wait_for_unit("sshd.socket", timeout=30) server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30) server_lazy_socket.wait_for_unit("sshd.socket", timeout=30) + # sshd-keygen is a oneshot unit, so just wait for multi-user.target, which + # pulls it in. + server_no_sshd_with_key.wait_for_unit("multi-user.target", timeout=30) + with subtest("manual-authkey"): client.succeed( '${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f /root/.ssh/id_ed25519 -N ""' @@ -378,6 +410,16 @@ in timeout=30 ) + with subtest("null-pam"): + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-null-pam true", + timeout=30 + ) + with subtest("sftp"): server_sftp.succeed( "mkdir -p /srv/sftp/uploads" @@ -408,6 +450,19 @@ in server_sftp.wait_for_file("/srv/sftp/uploads/test-file") + with subtest("keygen without sshd"): + client.fail( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@server-no-sshd-with-key true", + timeout=30 + ) + server_no_sshd_with_key.succeed("test -e /etc/ssh/ssh_host_ed25519_key") + server_no_sshd_with_key.succeed("test -e /etc/ssh/ssh_host_ed25519_key.pub") + server_no_sshd_with_key.fail("pgrep sshd") + + # Validate the above check for sshd using pgrep does pass on a server + # that should have sshd running, just to prove it's a useful test. + server.succeed("pgrep sshd") + # None of the per-connection units should have failed. server_lazy.fail("systemctl is-failed 'sshd@*.service'") ''; diff --git a/nixos/tests/pulseaudio-tcp.nix b/nixos/tests/pulseaudio-tcp.nix new file mode 100644 index 000000000000..8dd352d3a198 --- /dev/null +++ b/nixos/tests/pulseaudio-tcp.nix @@ -0,0 +1,87 @@ +{ pkgs, lib, ... }: + +{ + name = "pulseaudio-tcp"; + + meta.maintainers = + pkgs.pulseaudio.meta.maintainers + ++ (with lib.maintainers; [ + aleksana + doronbehar + ]); + + nodes = { + server = { + virtualisation.vlans = [ 1 ]; + + networking.useNetworkd = true; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.pulseaudio = { + enable = true; + tcp = { + enable = true; + port = 4713; + openFirewall = true; + anonymousClients.allowedIpRanges = [ "10.0.0.2" ]; + }; + systemWide = true; + extraConfig = '' + load-module module-pipe-sink file=/tmp/audio_check sink_name=virtual_server_sink + set-default-sink virtual_server_sink + ''; + }; + + systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ]; + }; + client = { + virtualisation.vlans = [ 1 ]; + + networking.useNetworkd = true; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.2/24"; + }; + + services.pulseaudio = { + enable = true; + extraClientConf = '' + default-server = tcp:10.0.0.1:4713 + ''; + }; + }; + }; + + testScript = # python + '' + start_all() + server.wait_for_unit("pulseaudio.service") + + # port is open + server.wait_for_open_port(4713) + client.wait_for_open_port(4713, "10.0.0.1") + + # client can see server + client.succeed('pactl info | grep "Server String" | grep -q "tcp"') + client.succeed('pactl list sinks short | grep -q "virtual_server_sink"') + + # server sink pipe is in place + server.succeed('[ -e "/tmp/audio_check" ]') + + # try to read something from it, it should not work as we haven't played anything + server.fail('timeout 1s head -c 1 /tmp/audio_check') + + # client start to play something + client.execute("pacat -p --latency-msec=100 --channels=1 /dev/zero >/dev/null 2>&1 &") + + server.sleep(1) + + # server sink has received data now, in a normal setup it should be able to play + server.succeed('timeout 1s head -c 100 /tmp/audio_check') + ''; +} diff --git a/nixos/tests/qgis.nix b/nixos/tests/qgis.nix index 1a7b75891b96..86e4369756be 100644 --- a/nixos/tests/qgis.nix +++ b/nixos/tests/qgis.nix @@ -15,7 +15,7 @@ import ./make-test-python.nix ( { name = "qgis"; meta = { - maintainers = with lib; [ teams.geospatial.members ]; + maintainers = lib.teams.geospatial.members; }; nodes = { diff --git a/nixos/tests/qownnotes.nix b/nixos/tests/qownnotes.nix index aafdd080be70..28ca9a949090 100644 --- a/nixos/tests/qownnotes.nix +++ b/nixos/tests/qownnotes.nix @@ -55,8 +55,8 @@ machine.wait_for_text("Nextcloud") machine.send_key("ret") - # OCR can't detect "App metric" anymore, so we will wait for another text - machine.wait_for_text("Open network settings") + # OCR can't detect "App metric" or "Open network settings" anymore, so we will wait for another text + machine.wait_for_text("usage data") machine.send_key("ret") # Doesn't work for non-root diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix index 0010d3141e33..fd9c72915943 100644 --- a/nixos/tests/roundcube.nix +++ b/nixos/tests/roundcube.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "roundcube"; - meta = with pkgs.lib.maintainers; { - maintainers = [ globin ]; + meta = { + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index 585abc599a97..04ee0a2bf95d 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -10,9 +10,6 @@ in { pkgs, ... }: { name = "shadow"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; nodes.shadow = { pkgs, ... }: diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix index 40e0f0be620e..abbbc6361e88 100644 --- a/nixos/tests/slipshow.nix +++ b/nixos/tests/slipshow.nix @@ -25,11 +25,9 @@ start_all() # it may take around a minute to compile the file and serve it - machine.succeed("slipshow serve /etc/slipshow/bbslides.md &>/dev/null &") + machine.succeed("slipshow serve -p 6000 /etc/slipshow/bbslides.md &>/dev/null &") - # slipshow serves defaultly on :8080 and unfortunately cannot - # be changed currently - machine.wait_for_open_port(8080) - machine.succeed("curl -i 0.0.0.0:8080") + machine.wait_for_open_port(6000) + machine.succeed("curl -i 0.0.0.0:6000") ''; } diff --git a/nixos/tests/syncthing/many-devices.nix b/nixos/tests/syncthing/many-devices.nix index 0c704b3d4048..b69c06181c9a 100644 --- a/nixos/tests/syncthing/many-devices.nix +++ b/nixos/tests/syncthing/many-devices.nix @@ -138,12 +138,26 @@ let (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ - --retry 1000 --retry-delay 1 --retry-all-errors \ + --retry 5 --retry-delay 1 --retry-all-errors \ "$@" } - curl -d ${lib.escapeShellArg (builtins.toJSON { deviceID = IDsToDelete.device; })} \ + curl -d ${ + lib.escapeShellArg ( + builtins.toJSON { + deviceID = IDsToDelete.device; + name = "DeleteMe"; + } + ) + } \ -X POST 127.0.0.1:8384/rest/config/devices - curl -d ${lib.escapeShellArg (builtins.toJSON { id = IDsToDelete.folder; })} \ + curl -d ${ + lib.escapeShellArg ( + builtins.toJSON { + id = IDsToDelete.folder; + path = "/var/lib/syncthing/DeleteMe"; + } + ) + } \ -X POST 127.0.0.1:8384/rest/config/folders ''; in diff --git a/nixos/tests/systemd-confinement/concurrent-runner.py b/nixos/tests/systemd-confinement/concurrent-runner.py new file mode 100644 index 000000000000..58cf9f7ff4d9 --- /dev/null +++ b/nixos/tests/systemd-confinement/concurrent-runner.py @@ -0,0 +1,131 @@ +import click +import socket +import sys + +from hypothesis import given, settings, strategies as st +from subprocess import run +from time import sleep + + +@st.composite +def client_actions(draw, size: int = 10): + """ + Generate a string describing a set of actions to perform. + + This is specifically "stringly-typed" so that when looking at the output of + a failed test run, it's easy to visually identify what's wrong. + + The string may consist of the following characters: + + ' ' - Sleep for one tick (0.1s) + '[' - Start the client + ']' - Stop the client + 'R' - Run a subprocess in the client + + So for example the string " [ R ] " would mean: + + * Sleep for two ticks (" ") + * Start the client ("[") + * Sleep for two ticks (" ") + * Run the subprocess ("R") + * Sleep for one tick (" ") + * Stop the client ("]") + * Sleep for two ticks (" ") + + Exactly the same encoding as above is used for the network protocol, so for + debugging issues, all you need to know is the representation above. + """ + assert size > 1 + start = None + stop = None + runs = set() + + if draw(st.booleans()): + start = draw(st.integers(min_value=0, max_value=size - 2)) + stop = draw(st.integers(min_value=start + 1, max_value=size - 1)) + if start + 1 < stop: + runs = draw(st.sets( + st.integers(min_value=start + 1, max_value=stop - 1), + max_size=stop - start, + )) + + out = '' + for index in range(size): + if start is not None and index == start: + out += '[' + elif stop is not None and index == stop: + out += ']' + elif index in runs: + out += 'R' + else: + out += ' ' + return out + + +@click.group() +def cli() -> None: + pass + + +@cli.command('driver') +@settings(deadline=None, max_examples=20) +@given(st.lists(client_actions(), max_size=5)) +def test_driver(client_actions: list[str]) -> None: + clients: list[None | socket.socket] = [None] * len(client_actions) + for index in range(max(map(len, client_actions), default=0)): + for n, actions in enumerate(client_actions): + client = clients[n] + try: + action = actions[index] + except IndexError: + continue + match action: + case '[': + client = socket.socket(socket.AF_INET6) + client.settimeout(60) + client.connect(('::1', 12345)) + client.send(b'[') + clients[n] = client + case ']': + assert client is not None + client.send(b']') + # At this point if we get ']' back from the client, we know + # that everything went smoothly up to this point because + # otherwise the client would have just thrown an exception + # and the connection would be closed. + assert client.recv(1) == b']' + assert not client.recv(1) + client.close() + clients[n] = None + case 'R': + assert client is not None + client.send(b'R') + case ' ': + if client is not None: + client.send(b' ') + sleep(0.1) + assert all(c is None for c in clients), \ + f'clients still running: {clients!r}' + + +@cli.command('client') +@click.argument('executable') +def test_client(executable: str) -> None: + if not (action := sys.stdin.read(1)): + raise SystemExit(1) + assert action == '[', f'{action!r} != "["' + while action := sys.stdin.read(1): + match action: + case 'R': + run([executable], check=True, stdout=sys.stderr) + case ']': + sys.stdout.write(']') + return + case ' ': + sleep(0.1) + case '': + raise SystemExit(1) + + +if __name__ == '__main__': + cli() diff --git a/nixos/tests/systemd-confinement/default.nix b/nixos/tests/systemd-confinement/default.nix index 90cfcb8ab8af..0f8a0a326e7d 100644 --- a/nixos/tests/systemd-confinement/default.nix +++ b/nixos/tests/systemd-confinement/default.nix @@ -2,7 +2,12 @@ import ../make-test-python.nix { name = "systemd-confinement"; nodes.machine = - { pkgs, lib, ... }: + { + pkgs, + lib, + utils, + ... + }: let testLib = pkgs.python3Packages.buildPythonPackage { name = "confinement-testlib"; @@ -215,122 +220,166 @@ import ../make-test-python.nix { } ); + concurrentRunner = pkgs.writers.writePython3 "concurrent-runner" { + libraries = [ + pkgs.python3Packages.click + pkgs.python3Packages.hypothesis + ]; + } ./concurrent-runner.py; + + concurrentTest = { + systemd.services.concurrent-driver = { + description = "Driver for orchestrating concurrent processes"; + requiredBy = [ "multi-user.target" ]; + after = [ + "network.target" + "concurrent-client.socket" + ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = utils.escapeSystemdExecArgs [ + concurrentRunner + "driver" + ]; + }; + + systemd.sockets.concurrent-client = { + description = "Socket for concurrent processes"; + requiredBy = [ "sockets.target" ]; + socketConfig.ListenStream = 12345; + socketConfig.Accept = true; + }; + + systemd.services."concurrent-client@" = { + description = "Process %I running concurrently with others"; + confinement.enable = true; + serviceConfig.StandardInput = "socket"; + serviceConfig.StandardError = "journal"; + serviceConfig.ExecStart = utils.escapeSystemdExecArgs [ + concurrentRunner + "client" + "${pkgs.fortune}/bin/fortune" + ]; + }; + }; + in { - imports = lib.imap1 mkTestStep ( - parametrisedTests - ++ [ - { - description = "existence of bind-mounted /etc"; - config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; - testScript = '' - assert Path('/etc/passwd').read_text() - ''; - } - ( - let - symlink = pkgs.runCommand "symlink" { - target = pkgs.writeText "symlink-target" "got me"; - } "ln -s \"$target\" \"$out\""; - in + imports = + lib.imap1 mkTestStep ( + parametrisedTests + ++ [ { - description = "check if symlinks are properly bind-mounted"; - config.confinement.packages = lib.singleton symlink; + description = "existence of bind-mounted /etc"; + config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; testScript = '' - assert Path('${symlink}').read_text() == 'got me' + assert Path('/etc/passwd').read_text() ''; } - ) - { - description = "check if StateDirectory works"; - config.serviceConfig.User = "chroot-testuser"; - config.serviceConfig.Group = "chroot-testgroup"; - config.serviceConfig.StateDirectory = "testme"; + ( + let + symlink = pkgs.runCommand "symlink" { + target = pkgs.writeText "symlink-target" "got me"; + } "ln -s \"$target\" \"$out\""; + in + { + description = "check if symlinks are properly bind-mounted"; + config.confinement.packages = lib.singleton symlink; + testScript = '' + assert Path('${symlink}').read_text() == 'got me' + ''; + } + ) + { + description = "check if StateDirectory works"; + config.serviceConfig.User = "chroot-testuser"; + config.serviceConfig.Group = "chroot-testgroup"; + config.serviceConfig.StateDirectory = "testme"; - # We restart on purpose here since we want to check whether the state - # directory actually persists. - config.serviceConfig.Restart = "on-failure"; - config.serviceConfig.RestartMode = "direct"; + # We restart on purpose here since we want to check whether the state + # directory actually persists. + config.serviceConfig.Restart = "on-failure"; + config.serviceConfig.RestartMode = "direct"; - testScript = '' - assert not Path('/tmp/canary').exists() - Path('/tmp/canary').touch() + testScript = '' + assert not Path('/tmp/canary').exists() + Path('/tmp/canary').touch() - if (foo := Path('/var/lib/testme/foo')).exists(): - assert Path('/var/lib/testme/foo').read_text() == 'works' - else: - Path('/var/lib/testme/foo').write_text('works') - print('<4>Exiting with failure to check persistence on restart.') - raise SystemExit(1) - ''; - } - { - description = "check if /bin/sh works"; - testScript = '' - assert Path('/bin/sh').exists() + if (foo := Path('/var/lib/testme/foo')).exists(): + assert Path('/var/lib/testme/foo').read_text() == 'works' + else: + Path('/var/lib/testme/foo').write_text('works') + print('<4>Exiting with failure to check persistence on restart.') + raise SystemExit(1) + ''; + } + { + description = "check if /bin/sh works"; + testScript = '' + assert Path('/bin/sh').exists() - result = run( - ['/bin/sh', '-c', 'echo -n bar'], - capture_output=True, - check=True, - ) - assert result.stdout == b'bar' - ''; - } - { - description = "check if suppressing /bin/sh works"; - config.confinement.binSh = null; - testScript = '' - assert not Path('/bin/sh').exists() - with pytest.raises(FileNotFoundError): - run(['/bin/sh', '-c', 'echo foo']) - ''; - } - { - description = "check if we can set /bin/sh to something different"; - config.confinement.binSh = "${pkgs.hello}/bin/hello"; - testScript = '' - assert Path('/bin/sh').exists() - result = run( - ['/bin/sh', '-g', 'foo'], - capture_output=True, - check=True, - ) - assert result.stdout == b'foo\n' - ''; - } - { - description = "check if only Exec* dependencies are included"; - config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; - testScript = '' - with pytest.raises(FileNotFoundError): - Path(os.environ['FOOBAR']).read_text() - ''; - } - { - description = "check if fullUnit includes all dependencies"; - config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; - config.confinement.fullUnit = true; - testScript = '' - assert Path(os.environ['FOOBAR']).read_text() == 'eek' - ''; - } - { - description = "check if shipped unit file still works"; - config.confinement.mode = "chroot-only"; - rawUnit = '' - [Service] - SystemCallFilter=~kill - SystemCallErrorNumber=ELOOP - ''; - testScript = '' - with pytest.raises(OSError) as excinfo: - os.kill(os.getpid(), signal.SIGKILL) - assert excinfo.value.errno == errno.ELOOP - ''; - } - ] - ); + result = run( + ['/bin/sh', '-c', 'echo -n bar'], + capture_output=True, + check=True, + ) + assert result.stdout == b'bar' + ''; + } + { + description = "check if suppressing /bin/sh works"; + config.confinement.binSh = null; + testScript = '' + assert not Path('/bin/sh').exists() + with pytest.raises(FileNotFoundError): + run(['/bin/sh', '-c', 'echo foo']) + ''; + } + { + description = "check if we can set /bin/sh to something different"; + config.confinement.binSh = "${pkgs.hello}/bin/hello"; + testScript = '' + assert Path('/bin/sh').exists() + result = run( + ['/bin/sh', '-g', 'foo'], + capture_output=True, + check=True, + ) + assert result.stdout == b'foo\n' + ''; + } + { + description = "check if only Exec* dependencies are included"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; + testScript = '' + with pytest.raises(FileNotFoundError): + Path(os.environ['FOOBAR']).read_text() + ''; + } + { + description = "check if fullUnit includes all dependencies"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; + config.confinement.fullUnit = true; + testScript = '' + assert Path(os.environ['FOOBAR']).read_text() == 'eek' + ''; + } + { + description = "check if shipped unit file still works"; + config.confinement.mode = "chroot-only"; + rawUnit = '' + [Service] + SystemCallFilter=~kill + SystemCallErrorNumber=ELOOP + ''; + testScript = '' + with pytest.raises(OSError) as excinfo: + os.kill(os.getpid(), signal.SIGKILL) + assert excinfo.value.errno == errno.ELOOP + ''; + } + ] + ) + ++ [ concurrentTest ]; config.users.groups.chroot-testgroup = { }; config.users.users.chroot-testuser = { diff --git a/nixos/tests/udp-over-tcp.nix b/nixos/tests/udp-over-tcp.nix new file mode 100644 index 000000000000..2f53cffeae86 --- /dev/null +++ b/nixos/tests/udp-over-tcp.nix @@ -0,0 +1,61 @@ +{ lib, ... }: +{ + name = "udp-over-tcp"; + meta.maintainers = [ lib.maintainers.timschumi ]; + + nodes.sender = + { nodes, ... }: + { + services.udp-over-tcp = { + udp2tcp = { + "0.0.0.0:51821" = { + forward = "${nodes.receiver.networking.primaryIPAddress}:444"; + openFirewall = true; + + # Remaining options are not tested for behavior, but to cover options passing. + recvBufferSize = 16384; + sendBufferSize = 16384; + recvTimeout = 10; + fwmark = 1337; + nodelay = true; + }; + }; + }; + }; + + nodes.receiver = + { nodes, ... }: + { + services.udp-over-tcp = { + tcp2udp = { + "0.0.0.0:444" = { + forward = "127.0.0.1:51821"; + openFirewall = true; + + # Remaining options are not tested for behavior, but to cover options passing. + threads = 2; + bind = "127.0.0.1"; + recvBufferSize = 16384; + sendBufferSize = 16384; + recvTimeout = 10; + fwmark = 1337; + nodelay = true; + }; + }; + }; + }; + + testScript = '' + start_all() + + # TODO: Replace unit wait with waiting on an UDP port. + sender.wait_for_unit("udp2tcp-0.0.0.0:51821.service") + receiver.wait_for_open_port(444, "0.0.0.0") + + receiver.succeed("nc -w 10 -u -l 127.0.0.1 51821 > transfer.txt &") + # We need to delay a short time here because detaching exits the shell before the socket is ready. + receiver.execute("sleep 1") + sender.succeed("echo 'Hello World!' | nc -w 1 -u 127.0.0.1 51821") + receiver.succeed("grep 'Hello World!' transfer.txt") + ''; +} diff --git a/nixos/tests/web-apps/immich-kiosk.nix b/nixos/tests/web-apps/immich-kiosk.nix new file mode 100644 index 000000000000..0679d78b636d --- /dev/null +++ b/nixos/tests/web-apps/immich-kiosk.nix @@ -0,0 +1,31 @@ +{ ... }: +{ + name = "immich-kiosk"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; + + services.immich-kiosk = { + enable = true; + settings = { + immich_url = "http://localhost:2283"; + immich_api_key = { + _secret = pkgs.writeText "immich-kiosk-api-key" "dummy-api-key"; + }; + kiosk = { + port = 3100; + demo_mode = true; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("immich-kiosk.service") + machine.wait_for_open_port(3100) + machine.succeed("pgrep -x immich-kiosk") + machine.succeed("jq -r .immich_api_key /run/immich-kiosk/config.yaml | grep dummy-api-key") + ''; +} diff --git a/nixos/tests/web-apps/immichframe.nix b/nixos/tests/web-apps/immichframe.nix new file mode 100644 index 000000000000..f2f590470163 --- /dev/null +++ b/nixos/tests/web-apps/immichframe.nix @@ -0,0 +1,145 @@ +let + apiKeyFile = "/tmp/immich-api.key"; + customInterval = 5; +in +{ + name = "immichframe"; + + enableOCR = true; + + nodes.machine = + { + config, + pkgs, + lib, + ... + }: + { + imports = [ ../common/x11.nix ]; + + # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # memory: compulsory panic_on_oom is enabled". + virtualisation.memorySize = 3000; + + environment.systemPackages = with pkgs; [ + imagemagick + immich-cli + firefox + xdotool + ]; + + fonts.packages = [ pkgs.liberation_ttf ]; + + services.immich = { + enable = true; + port = 2283; + openFirewall = true; + # Disable a bunch of features that aren't needed for this test. + machine-learning.enable = false; + settings = { + backup.database.enabled = false; + machineLearning.enabled = false; + map.enabled = false; + reverseGeocoding.enabled = false; + metadata.faces.import = false; + newVersionCheck.enabled = false; + notifications.smtp.enabled = false; + }; + }; + + services.immichframe = { + enable = true; + port = 8002; + settings = { + General.Interval = customInterval; + Accounts = [ + { + ImmichServerUrl = "http://localhost:${toString config.services.immich.port}"; + ApiKeyFile = apiKeyFile; + } + ]; + }; + }; + }; + + testScript = /* python */ '' + import json + import tempfile + from shlex import quote + + custom_interval = ${toString customInterval} + + machine.wait_for_unit("immich-server.service") + machine.wait_for_open_port(2283) + + # Log in to Immich and create an access key. + machine.succeed(""" + curl --no-progress-meter -f --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up + """) + res = machine.succeed(""" + curl --no-progress-meter -f --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login + """) + token = json.loads(res)['accessToken'] + res = machine.succeed(""" + curl --no-progress-meter -f -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys + """ % token) + key = json.loads(res)['secret'] + machine.succeed(f"immich login http://localhost:2283/api {key}") + res = machine.succeed("immich server-info") + print(res) + + # Create the API key so ImmichFrame can start. + with tempfile.NamedTemporaryFile("w", delete_on_close=False) as f: + f.write(key) + f.close() + machine.copy_from_host(f.name, ${builtins.toJSON apiKeyFile}) + + # We finally have an api key! Make sure ImmichFrame starts up. + machine.wait_for_unit("immichframe.service") + machine.wait_for_open_port(8002) + + # Check ImmichFrame's configuration. + res = machine.succeed("curl --no-progress-meter -f http://localhost:8002/api/Config") + frame_config = json.loads(res) + assert frame_config['interval'] == custom_interval, frame_config + + # At this point, ImmichFrame should not find any images to serve. + res = machine.succeed("curl -f http://localhost:8002/api/Asset") + assets = json.loads(res) + assert len(assets) == 0, assets + + # Repeat to make it easier for OCR to pick up given overlays + image_text = '\\n'.join(['reproduce this moment', 'with NixOS tests <3'] * 6) + + # These settings make it display fine given potential cropping. + common_args = f"-gravity center -font Liberation-Mono -pointsize 50 -annotate 0 {quote(image_text)}" + + # Upload some images to a new album. + album_title = '✨ Reproducible Moments ✨' + machine.succeed(f"magick -size 1920x1080 canvas:white -fill black {common_args} /tmp/white.png") + machine.succeed(f"immich upload -A {quote(album_title)} /tmp/white.png") + machine.succeed(f"magick -size 1920x1080 canvas:black -fill white {common_args} /tmp/black.png") + machine.succeed(f"immich upload -A {quote(album_title)} /tmp/black.png") + res = machine.succeed("immich server-info") + print(res) + + # ImmichFrame should now find some assets. + # Note: we restart ImmichFrame because it has some caching that prevents it + # from immediately seeing the newly uploaded photos. + machine.succeed("systemctl restart immichframe.service") + machine.wait_for_open_port(8002) + res = machine.succeed("curl --no-progress-meter -f http://localhost:8002/api/Asset") + assets = json.loads(res) + assert len(assets) == 2, assets + + # Wait for a photo to be displayed. + machine.wait_for_x() + machine.execute("xterm -e 'firefox --kiosk http://localhost:8002' >&2 &") + machine.wait_for_window("immichFrame") + _, active_window = machine.execute("xdotool getactivewindow") + machine.succeed(f"xdotool windowsize {quote(active_window.strip())} 100% 100%") + machine.wait_for_text('reproduce this moment') + machine.wait_for_text('with NixOS tests') + machine.screenshot("screen") + ''; +} diff --git a/nixos/tests/web-apps/tt-rss.nix b/nixos/tests/web-apps/tt-rss.nix new file mode 100644 index 000000000000..933a6419923c --- /dev/null +++ b/nixos/tests/web-apps/tt-rss.nix @@ -0,0 +1,45 @@ +{ ... }: +{ + name = "tt-rss-nixos"; + + nodes.machine = + { pkgs, ... }: + { + services.tt-rss = { + enable = true; + virtualHost = "localhost"; + selfUrlPath = "http://localhost/"; + pluginPackages = with pkgs; [ + tt-rss-plugin-auth-ldap + tt-rss-plugin-feediron + ]; + plugins = [ + "auth_internal" + "feediron" + "note" + ]; + singleUserMode = true; + themePackages = with pkgs; [ tt-rss-theme-feedly ]; + }; + }; + + testScript = '' + import json + import re + machine.wait_for_unit("tt-rss.service") + + matches = re.search('__csrf_token = "([^"]*)"', machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar -sSfL http://localhost/")) + if matches is None: + assert False, "CSRF token not found" + csrf_token = matches.group(1) + + # Ensure themes are loaded. No API found for these, so it's a crude check. + preference_page = machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar http://localhost/backend.php?op=Pref_Prefs") + assert "feedly" in preference_page + + plugins = json.loads(machine.succeed(f"curl -sSfL --cookie cjar --cookie-jar cjar 'http://localhost/backend.php' -X POST --data-raw 'op=Pref_Prefs&method=getPluginsList&csrf_token={csrf_token}'"))["plugins"] + expected_plugins = ["auth_internal", "auth_ldap", "feediron", "note"]; + found_plugins = [p["name"] for p in plugins if p["name"] in expected_plugins] + assert len(found_plugins) == len(expected_plugins), f"Expected plugins {expected_plugins}, found {found_plugins}" + ''; +} diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 2bc171917cc4..735c200679a2 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -57,7 +57,6 @@ in name = "xmonad"; meta = with pkgs.lib.maintainers; { maintainers = [ - nequissimus ivanbrennan ]; }; diff --git a/nixos/tests/xscreensaver.nix b/nixos/tests/xscreensaver.nix index 27f496cb9def..9b62bdab07d2 100644 --- a/nixos/tests/xscreensaver.nix +++ b/nixos/tests/xscreensaver.nix @@ -1,6 +1,6 @@ { lib, ... }: { - name = "pass-secret-service"; + name = "xscreensaver"; meta.maintainers = with lib.maintainers; [ vancluever ]; @@ -54,9 +54,25 @@ }) ]; }; + + hooks = + { lib, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; + services.xscreensaver = { + enable = true; + hooks = { + "UNBLANK" = ":> /home/alice/xscreensaver-works"; + }; + }; + }; }; - testScript = '' + testScript = /* python */ '' ok.wait_for_x() ok.wait_for_unit("xscreensaver", "alice") _, output_ok = ok.systemctl("status xscreensaver", "alice") @@ -77,5 +93,10 @@ assert 'To prevent the kernel from randomly unlocking' in output_bad_wrapperPrefix assert 'your screen via the out-of-memory killer' in output_bad_wrapperPrefix assert '"xscreensaver-auth" must be setuid root' in output_bad_wrapperPrefix + + hooks.wait_for_x() + hooks.wait_for_unit("xscreensaver", "alice") + hooks.wait_for_unit("xscreensaver-hooks", "alice") + hooks.wait_for_file("/home/alice/xscreensaver-works") ''; } diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix index caf1780d1565..753f37022322 100644 --- a/nixos/tests/xterm.nix +++ b/nixos/tests/xterm.nix @@ -1,9 +1,6 @@ { pkgs, ... }: { name = "xterm"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; nodes.machine = { imports = [ ./common/x11.nix ]; diff --git a/nixos/tests/xxh.nix b/nixos/tests/xxh.nix index a3080bdaf4ef..6d534c979ed7 100644 --- a/nixos/tests/xxh.nix +++ b/nixos/tests/xxh.nix @@ -33,8 +33,8 @@ let in { name = "xxh"; - meta = with lib.maintainers; { - maintainers = [ lom ]; + meta = { + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index b1fc0d3a8604..311406741e85 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -8,7 +8,6 @@ in name = "zookeeper"; meta = with pkgs.lib.maintainers; { maintainers = [ - nequissimus ztzg ]; }; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 4a94df01b627..f6da31796192 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -73,12 +73,12 @@ stdenv.mkDerivation rec { ]; }; - meta = with lib; { + meta = { inherit homepage; description = "Editor for the ${brand} ${type} digital mixer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = [ maintainers.magnetophon ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ magnetophon ]; }; } diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix index 26597ad8e47c..9d3ba9a15347 100644 --- a/pkgs/applications/audio/midas/m32edit.nix +++ b/pkgs/applications/audio/midas/m32edit.nix @@ -5,9 +5,9 @@ callPackage ./generic.nix ( // rec { brand = "Midas"; type = "M32"; - version = "4.4"; - url = "https://cdn.mediavalet.com/aunsw/musictribe/bpXmqFLKmkCfv8Xfp2fzGA/p_73LRnDKUyTLCRF8SiAhg/Original/${type}-Edit_LINUX_${version}.tar.gz"; - hash = "sha256-/rzTIRYP982upiyPlg1B5L+ggSFb5jfmGKAQGhKghaA="; - homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I"; + version = "4.4.1"; + url = "https://cdn.mediavalet.com/aunsw/musictribe/Yd1JkAyxqUeqIxoRM0lWWw/uwBe453FiEKSpqZzdjvYpQ/Original/${type}-Edit_LINUX_${version}.tar.gz"; + hash = "sha256-cEva2Brxo7zm3qppO+BtYIlUqV9t69j+8f6g94C4i3c="; + homepage = "https://www.midasconsoles.com/series.html?category=R-MIDAS-M32SERIES"; } ) diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix index f776bbb404f6..d6da8b4df8f3 100644 --- a/pkgs/applications/audio/midas/x32edit.nix +++ b/pkgs/applications/audio/midas/x32edit.nix @@ -5,9 +5,9 @@ callPackage ./generic.nix ( // rec { brand = "Behringer"; type = "X32"; - version = "4.4"; - url = "https://cdn.mediavalet.com/aunsw/musictribe/or9fQ8syH0ShGn-Pei63wQ/POJZwJV4MkWLkgr0ex3f6Q/Original/${type}-Edit_LINUX_${version}.tar.gz"; - hash = "sha256-OOh0UnaKes8U2vNkavsCQF9021lFMPLX1gU1ENaWZHs="; - homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF"; + version = "4.4.1"; + url = "https://cdn.mediavalet.com/aunsw/musictribe/6-vOpP2lRkyNSDXgZEUbQA/FyIw4jc3bk60nseai05MBQ/Original/${type}-Edit_LINUX_${version}.tar.gz"; + hash = "sha256-HrSPDWnWF2s1U8Khj6VnLptPdcMVyTivewWAIIdArMc="; + homepage = "https://www.behringer.com/product.html?modelCode=0603-ACE"; } ) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 0fb07a0dfa25..f2957e2865c1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,8 +16,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.2.1.8"; # "Android Studio Otter | 2025.2.1 Patch 1" - sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY="; + version = "2025.2.2.7"; # "Android Studio Otter 2 Feature Drop | 2025.2.2" + sha256Hash = "sha256-pvnUDYeFbxOnw2dP9BeKFushnTHmpDrBwmnNWDx8pbQ="; }; betaVersion = { version = "2025.2.2.6"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 2" diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index ccae9ed6c393..f9b283f06169 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -4,6 +4,7 @@ melpaBuild, fetchFromGitHub, replaceVars, + fetchpatch, acm, markdown-mode, basedpyright, @@ -32,13 +33,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2025-06-28"; + version = "0-unstable-2025-11-13"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "3b37a04bd1b6bbcdc2b0ad7a5c388ad027eb7a25"; - hash = "sha256-0pjRihJapljd/9nR7G+FC+gCqD82YGITPK2mcJcI7ZI="; + rev = "426794a45b57d923129dfa1e4ca07c34aa72e69c"; + hash = "sha256-9nNg0yCtEBFNWP7TFGo1SsmtnnufoROyaeIJK0tjoEQ="; }; patches = [ @@ -47,6 +48,13 @@ melpaBuild { (replaceVars ./hardcode-dependencies.patch { python = python.interpreter; }) + + # Revert using quelpa repo to get check inputs + (fetchpatch { + url = "https://github.com/manateelazycat/lsp-bridge/commit/a999c8432817a806ed9ad74b5e918ab9612bd09b.patch"; + revert = true; + hash = "sha256-NK6hooWn78Hk26tcQbIwUiiJuQ/hhlbLK+pgiZT//fI="; + }) ]; packageRequires = [ diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 4c2e7c090428..fed69100a0d7 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -16,24 +16,15 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.11"; + version = "1.8.13"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU="; + hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI="; }; - patches = [ - # Fix build, remove at next version bump - # https://github.com/gottcode/focuswriter/pull/208 - (fetchpatch { - url = "https://github.com/gottcode/focuswriter/commit/dd74ed4559a141653a06e7984c1251b992925775.diff"; - hash = "sha256-1bxa91xnkF1MIQlA8JgwPHW/A80ThbVVdVtusmzd22I="; - }) - ]; - nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index 86d9670b3a7f..a4ec3d82583f 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -16,7 +16,7 @@ "meta": { "isOpenSource": false, "description": "C/C++ IDE from JetBrains", - "maintainers": [ "edwtjo", "mic92", "tymscar" ], + "maintainers": [ "mic92", "tymscar" ], "longDescription": "Enhancing productivity for every C and C++ developer on Linux, macOS and Windows.", "homepage": "https://www.jetbrains.com/clion/" } @@ -73,7 +73,7 @@ "meta": { "isOpenSource": true, "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], + "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } @@ -85,7 +85,7 @@ "meta": { "isOpenSource": false, "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], + "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } @@ -153,7 +153,7 @@ "meta": { "isOpenSource": false, "description": "Ruby IDE from JetBrains", - "maintainers": [ "edwtjo", "tymscar"], + "maintainers": [ "tymscar"], "longDescription": "Ruby IDE from JetBrains", "homepage": "https://www.jetbrains.com/ruby/" } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e85cb6b94c3a..773a3da6c9a8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -87,12 +87,12 @@ final: prev: { Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2025-11-09"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "b3ed3e79c32421ba0e8bed215cc2566da8e56e8a"; - sha256 = "1j9c69qah55rl6rk8969fxacisa2w8hx9bwsf0a0nqf4c04jhqlg"; + rev = "a25018e4f371016aefea267038ac5d083b615da9"; + sha256 = "0jns8fwkhn88cgc1nz1gcwal4nprdzzawmgmm6c0m96r8a37rvrr"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; meta.hydraPlatforms = [ ]; @@ -217,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-11-20"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "126a94855bdea717ce9a90843d10c57ff3094478"; - sha256 = "0a27yqgy94ddbqvkpdq04p0ykw48mf38ijfzhdq34p37jy4rbwgk"; + rev = "d3b6a95642d14222666b47f6f916f3986bca5268"; + sha256 = "0m60543xidcfc04axm7iksrv7w26rb53fiyja171civvvclp9nij"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -412,12 +412,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-11-29"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a41c6c774030695f0eecbb714383a2ac5c1e6cd0"; - sha256 = "1d165r2bmr21cilb1xv9jwzhz70as6syqcvys8qj866chlj0734y"; + rev = "21645280ad06fce01ef109e82d76302dcbe62756"; + sha256 = "11w6rcvc0v64949825pksg89wm5jqha7w1rpn9x0j8r79cd0fdys"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -1142,12 +1142,12 @@ final: prev: { augment-vim = buildVimPlugin { pname = "augment.vim"; - version = "2025-10-21"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "augmentcode"; repo = "augment.vim"; - rev = "96e8d6d16268e9fc2b0b1cc98ec754effa24690e"; - sha256 = "0fkdyr8ak3j7jkccgcndzjkfxgx8mwjhb082lxw12sdaq9amgi6m"; + rev = "2a02b3fbfce61c50e42d877a68c1240d96907779"; + sha256 = "0vr2xhkp00lr8c0vdlcv8a4qni584gyc5xlhc6jpyjf9vnyhb8nq"; }; meta.homepage = "https://github.com/augmentcode/augment.vim/"; meta.hydraPlatforms = [ ]; @@ -1403,12 +1403,12 @@ final: prev: { barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2025-10-20"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "fb4369940a07dda35fa4d7f54cf4a36aa00440e6"; - sha256 = "0pnryr8m5dj1h0ki11b2mzq9wkcd8lg0l0w4pkyrd51a3dfa6wv1"; + rev = "539d73def39c9172b4d4d769f14090e08f37b29d"; + sha256 = "03ricz5qqrrnvplyg36gac255al6jjwycs1yfqsxrmiz6mwjl6my"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -1754,12 +1754,12 @@ final: prev: { blink-indent = buildVimPlugin { pname = "blink.indent"; - version = "2025-11-20"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.indent"; - rev = "2f4ac0d1bc642049d97da909cae02a5a5bd0beab"; - sha256 = "15c4cccflhgwcv11c2bkk7nrvb0497zsalglsyc1pmsvqnbgkrsx"; + rev = "93ff30292d34116444ff9db5264f6ccd34f3f71f"; + sha256 = "1bzsaarf1wn5lcbm4yywpplwx63lij3cm628y9kzafz1mw08kw38"; }; meta.homepage = "https://github.com/Saghen/blink.indent/"; meta.hydraPlatforms = [ ]; @@ -1780,12 +1780,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-11-27"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "8b6642def8fa43bb64fc333a4b745f83db20778b"; - sha256 = "1gqzcp5arcn4r9vy1qagddxcrz24y53ag788hv20c1q3v4f2c200"; + rev = "64e26b597303d9ed175f8ed832df8328731b93cd"; + sha256 = "1pqy4878811pa4gbz5an127yl6i232p6848z68hfych7fjqy5k1w"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1962,12 +1962,12 @@ final: prev: { bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2025-05-24"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "1c13e510e11d08b0259e8e627f128359c5521962"; - sha256 = "067pyk59y9yid58wjwwv6mgghcas8yl86bj121l3z6zdlv6c214m"; + rev = "89294b8930e660936374fb763ac48a1ac51dd29c"; + sha256 = "1iaakbys15aamhkd1r6skybz7pm2z897dc9hf6p5mkfdrmribpf3"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; meta.hydraPlatforms = [ ]; @@ -2001,12 +2001,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2025-11-25"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00"; - sha256 = "05b0fjlf3svc1jq7pq56fhakaa54j21iyp9d8jzczlpls6dr3kvn"; + rev = "193e123cdbc4dd3e86db883d55349e9587f0ded6"; + sha256 = "1xhfzh7q9yqjx7q4wrz1vkgdwp4aqcg27kbj4yqg7d2wh1jwnz6v"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -2222,12 +2222,12 @@ final: prev: { claudecode-nvim = buildVimPlugin { pname = "claudecode.nvim"; - version = "2025-10-19"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "coder"; repo = "claudecode.nvim"; - rev = "1552086ebcce9f4a2ea3b9793018a884d6b60169"; - sha256 = "02wf8g35y40f9xsc8ncnj11r18w35dp6a3cjnax54v9n2karz2ax"; + rev = "6091df0e8edcdc92526cec23bbb42f63c0bb5ff2"; + sha256 = "0d50y9qbcj779hymbkzlfg6si8704qrc0gcpj2f2vx739qh9hr1y"; }; meta.homepage = "https://github.com/coder/claudecode.nvim/"; meta.hydraPlatforms = [ ]; @@ -3483,12 +3483,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-11-25"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "4993e07fac6679d0a5005aa7499e0bad2bd39f19"; - sha256 = "1xz1b8v08l6qmrd98arhq6141sw75hnqf3p48zhc0wsdhphh5f74"; + rev = "ffe26e8df8115c9665d24231f8a49fadb2d611ce"; + sha256 = "14blx1nnw2gpwcgcn6fk4jvhmfhv8xqyx37qmz5idcfzvlrfna58"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3575,12 +3575,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-11-19"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "4383e05a47493d7ff77b058c0548129eb38ec7fb"; - sha256 = "0cv983ji55anbngrr74lwdblir2nycrliq7kbqka3lgnpwwighil"; + rev = "efe563802a550b7f1b7743b007987e97cba22718"; + sha256 = "0q4n002fhjvd7by1x83b6ad9slyycmm87lzba19m05kahjzpf154"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3783,12 +3783,12 @@ final: prev: { csvview-nvim = buildVimPlugin { pname = "csvview.nvim"; - version = "2025-11-08"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "hat0uma"; repo = "csvview.nvim"; - rev = "688bcc7437b577de000f71a2d406271c79e2a545"; - sha256 = "0vwka4ypniz3ql0iwx1655h4l0hhmwr41phjad6xz4kka6m2lngv"; + rev = "860bd8c4edacf709391058e337445217d995dd69"; + sha256 = "1q7f3vyb0b5m5affncxwirj48p5f3mfk5vknvqs95lqb0rg7g9gq"; }; meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; meta.hydraPlatforms = [ ]; @@ -3874,12 +3874,12 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-11-13"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "22b993f79c7aab934c00bfc3437d41f4621974dc"; - sha256 = "18n9gkivhpl1gsbd4yfqv2gp5zm0mgyankybx9ppn6l8jv5byq9r"; + rev = "a43b45423e8494898c353c0604e0b2e4e99bd056"; + sha256 = "0j93wjc1wlh77bgqxbp0c1hgnbshjb9q8dyii0rd9d3a32ng5x0k"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -3939,12 +3939,12 @@ final: prev: { dart-nvim = buildVimPlugin { pname = "dart.nvim"; - version = "2025-11-01"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "iofq"; repo = "dart.nvim"; - rev = "8822aabbfef95eda2b22a8f7ee08912c762ef941"; - sha256 = "1rmh2ql1xx4s212mcmmgv63abagl2z20k2njin9c7y5kcdppcdh0"; + rev = "205f809fbb27d56aff22756a97b5ba6f0c7243c3"; + sha256 = "019n7356f6jazkks7qgbmsvh82nh9kjqng1isyv3ijyv17ikgdll"; }; meta.homepage = "https://github.com/iofq/dart.nvim/"; meta.hydraPlatforms = [ ]; @@ -4773,12 +4773,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-11-27"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "c4f73ef4299aa6c55e264bb4486e5a796e9a5466"; - sha256 = "0d38c41d40nk24s8f8abnc690pmldky4lm9sy73skfhb790nidgk"; + rev = "f6c335926e514750f272b0af6adc937c505eac68"; + sha256 = "18ja972bdvj2c1cpvbik2knzs70g5vrssbrasv5b2f60qss90xag"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4812,12 +4812,12 @@ final: prev: { edge = buildVimPlugin { pname = "edge"; - version = "2025-11-07"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "4145071bb0ea909511fa9a444eec80367b11296f"; - sha256 = "09d64sbjsbl6lb42glni789scggz6h0smy7jm5rpq1h23k0iarsf"; + rev = "b7dfb8e3c42a9393b68e284eac9b7a5973f24fe1"; + sha256 = "16gvgqm0cfa8y9ba357rl30g3jqlrabb1lb3qq6pqf0w3b4xibxn"; }; meta.homepage = "https://github.com/sainnhe/edge/"; meta.hydraPlatforms = [ ]; @@ -4878,12 +4878,12 @@ final: prev: { efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2025-11-03"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "11cc7a346f86b587a42a0348b41aa7c143e4ba1b"; - sha256 = "1a740iqsc7l0cncg923g4h24lcg6rxziznx7yfzbczfgi9cqq9bw"; + rev = "b175e35c5ea133e5bee42d90f91ce8419b4436a3"; + sha256 = "0b6iwxww2czylk44y2rc7xr0xma3s5zvaalvnvpm7xq51wd132sz"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; meta.hydraPlatforms = [ ]; @@ -5009,12 +5009,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-11-12"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "484dd560dccb2d2842685c441ad2b54a54ffef1b"; - sha256 = "1kzl7dvqnjj517jhj3ihqfy0fvqz00yqs48b9a3xpajj6vil1j8j"; + rev = "b10ed9a8b37d6b7448908be98ff8f58f550adc48"; + sha256 = "1j46jqkjd4qqh53h9hm1jn6fnw2rgvcf8ibcdcbpm5xhf4rn6sfs"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -5348,12 +5348,12 @@ final: prev: { flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2025-11-18"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "c7dfaa9ccca008fbc55ca0b4e5d9ef80e0248902"; - sha256 = "07wmfd186paa8zrx3fps8sfc4ifq02d8can0l0m4ysd1b6lqgp4x"; + rev = "539e84f5a652d96917f0afc1341c20f0d59dd789"; + sha256 = "1aq95fajv6abcsgn8khk5yrr2f6xab1xiypz2rfkihddmqba9dys"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -5427,12 +5427,12 @@ final: prev: { fortune-nvim = buildVimPlugin { pname = "fortune.nvim"; - version = "2025-11-28"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "rubiin"; repo = "fortune.nvim"; - rev = "b78de2457a8c4009363941a47e15ff023573c156"; - sha256 = "1z78ynn3q9hlf9gpyb4wk84iakj6nl8v8dwvsymmb8qns7bb16rb"; + rev = "38e33363541c461c49f5be599ec0887fe1febcbf"; + sha256 = "14frhlk3h6v7k4slcxbava8xzs1jnxczb0v1kys23rjw06cm2wds"; }; meta.homepage = "https://github.com/rubiin/fortune.nvim/"; meta.hydraPlatforms = [ ]; @@ -5895,12 +5895,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-11-07"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "81bb94c1d21648245eb14c69461f5c7f8c705752"; - sha256 = "04xqsp0xp941yrskbdw3l003b9l81ar1c3vfjp0xbpwp6sgnz7as"; + rev = "41a18f0c05534c375bafec7ed05cdb409c4abcc6"; + sha256 = "1kmaly8qprf3rrqavjwsaw11bwfgahgww288xkjcfxlkjkpcbkcm"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -6077,12 +6077,12 @@ final: prev: { gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2025-11-07"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "4bfc6983abc249c5943a60d8eb3980a3c2ababe1"; - sha256 = "1s9kh1d8hbmdwsclb098lcr0rh5cj24wb5yrv217idn3bxypxf7z"; + rev = "cc47341018320a2c82262958a1af889e5eeacd6e"; + sha256 = "10da4c86rfcwm77bfn1xpd4i4plafk5phv77vq9mmv46bvclvll0"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; meta.hydraPlatforms = [ ]; @@ -6677,12 +6677,12 @@ final: prev: { img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; - version = "2025-10-11"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "HakonHarnes"; repo = "img-clip.nvim"; - rev = "e7e29f0d07110405adecd576b602306a7edd507a"; - sha256 = "0jfbshjmzqjpnfdzsd5zd2si1c7gax2g2x5lwg8rsj5cacp0zbnb"; + rev = "93fcf50924108262caec66b900077987dfcb7c7f"; + sha256 = "1pb8hgvlqh27gmd0zf8pcji1rjlr04apx263qa633qy3b6lqnv4k"; }; meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; meta.hydraPlatforms = [ ]; @@ -6976,12 +6976,12 @@ final: prev: { jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2025-09-19"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "c3f9b751f30f62824c755efdaf1823cc0c7e3dfb"; - sha256 = "1348qvl92gi3gc15l6x3p5pbz5a27d8smsvx89c23vh1dybh4hx4"; + rev = "eebf7d286375a3aa8acaef63be1a9c92d3b73171"; + sha256 = "0sfg2xwdbi16v064fsz1y0l9k0gwcc9wyvql989bzkpgi8v4vrp0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -7237,12 +7237,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-11-26"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "5d3916195a97928b8f9b79d96029f37d19ba866d"; - sha256 = "0cn8w7hgb577p71jkjc88qwh2w9vcjn3m5l2qvd8avs7aiqslfyv"; + rev = "b48c86f71f0f84a11cb3aab3b850c7409c74245f"; + sha256 = "024j4i1pzplv9984hrq0sz6m2jflnv0vnvj0yrdyfmk8n5lc9bih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -7394,12 +7394,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-11-27"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "508c907ab7543404461be4707b03c61af8420cf9"; - sha256 = "0hr8k2lxqy602a5bw9hcx13accz5qhskwh2yg44f6pwqq05liq65"; + rev = "3723ed8116dcc9d9d614c1651acebce1a8468c95"; + sha256 = "1kffjsz40kf9vvgxqw4hdzvdarrpllxsgvpfmp64ia8b0ln8kl83"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -7797,12 +7797,12 @@ final: prev: { live-preview-nvim = buildVimPlugin { pname = "live-preview.nvim"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "brianhuster"; repo = "live-preview.nvim"; - rev = "774964d8c220e563dc4bbae79dd127c7e0a8ed1a"; - sha256 = "062dsjcm4v54aisfc102z8dv63k9abwbj9nzcc3mrb8xghar5fcg"; + rev = "3e0eb9ea48a6cf8b091c0031830721eeff0efe19"; + sha256 = "1sycn0l1vsp6k1capj51mswa88m27ikswv037xff3zvl15xif3v4"; }; meta.homepage = "https://github.com/brianhuster/live-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -8239,12 +8239,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-11-27"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "bf62f7d173f4b42cd02794c6c5f5a8bd3047a58a"; - sha256 = "0xdi2y6q01zqip5w1f09y1krz6b4ijc9izgf1s9n4lldvxlzfqif"; + rev = "0a5033326f703d99a8788e2d47753d6298195e8a"; + sha256 = "0vl1jhf7rks1hh0fmd58n31rikday1pf310ffn1frd8syrsmp6ay"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -8253,12 +8253,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-11-19"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "7d527c76c43f46294de9c19d39c5a86317809b4b"; - sha256 = "167cbv0cjdnnw5hfmzl909m6cmld6k8k2dklyf7dz77486sdz5h4"; + rev = "0b9bb925c000ae649ff7e7149c8cd00031f4b539"; + sha256 = "0cg174xnzpy1xh5j9gws5dzbfxbg5hzy2g3vf09l12c60nw42rbs"; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -8500,12 +8500,12 @@ final: prev: { mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2025-11-17"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.base16"; - rev = "96b8afc93ad318d321474378be74f9fb0ad6b4e4"; - sha256 = "161nyfw59jz3hnl078qxzpp26z2i4rzi7n742ysn7bkjp0i6k710"; + rev = "91c852a07a4907895cba714fab337aedb6bd9d87"; + sha256 = "10d59zvxzk0pf0zgqnhhgkbdnw5907lclnxnji8w6p080d1z9i53"; }; meta.homepage = "https://github.com/nvim-mini/mini.base16/"; meta.hydraPlatforms = [ ]; @@ -8563,6 +8563,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + mini-cmdline = buildVimPlugin { + pname = "mini.cmdline"; + version = "2025-12-07"; + src = fetchFromGitHub { + owner = "nvim-mini"; + repo = "mini.cmdline"; + rev = "c96216461df3b02abca31a0e360847750357137a"; + sha256 = "0mn5fj81i7393w639cfbm9hz01l6rvnc1as4nlyx2nikml1jkzqy"; + }; + meta.homepage = "https://github.com/nvim-mini/mini.cmdline/"; + meta.hydraPlatforms = [ ]; + }; + mini-colors = buildVimPlugin { pname = "mini.colors"; version = "2025-11-03"; @@ -8721,12 +8734,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-11-08"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hues"; - rev = "5621394352eefaba28a9c7051687abaa1d09ee0b"; - sha256 = "0z6s56lyvbdarjcfn640jzlin1rmvi6f50mfw5k0asiycqj6pqry"; + rev = "8fb10472cc40a1aad428a82a90270c0e87981fe7"; + sha256 = "1wmdx4y171p2qdnl7xl42hr0rdf52ijnbc0kdrj7i3jqppk72q6r"; }; meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.hydraPlatforms = [ ]; @@ -8851,12 +8864,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-11-28"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "c007f4b3822c99b98328bc214589a721c69d1514"; - sha256 = "0f829pdkl70n6f77xqr2h86zmym9j38rkhahp5lsfnmaza8pywh8"; + rev = "e27fcecf6cbffd8ed391bdf0eb746fdb5b9bfa44"; + sha256 = "0by1wik1yz3zhp0lfis7g58qgw3686qrab97v99nlprap45ari72"; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -9514,12 +9527,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-11-19"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "a981ef287503c668434bffa78071d5b9ff92c12f"; - sha256 = "1z7wwbpmjh453ilqk5g20zxrc7vk7wr4vx7l58x5rgclvg1mf4yc"; + rev = "e45d8999b67a4e24307e1f742cb4365b3d2aa105"; + sha256 = "1nrwhlhnmxa2rq4fy0y3pxnywc180q9m5lanhjhana49czjw4igm"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9540,12 +9553,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-11-29"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "3fdd84804c397059d4698fd8933f443058c4858e"; - sha256 = "1wnvavhfnn1vnji7f05nq0hgm09v0yryypgkfzc71mn99vnj39c6"; + rev = "3c1b589a73f4a73fed63d017626acd2c10d0a8f8"; + sha256 = "1siw9z7a5dlw02bnndj978cis2b2c96n1kp4zsag4mcv1nzfnshw"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -9618,12 +9631,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-11-28"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "a24620e541be8814f2357ae334bde947f7dae5a8"; - sha256 = "0fpyfpygzhdcgkpba8lpx1ycqkchphhfiapj8jxh3dvf8javvi7k"; + rev = "300949af63fa48cb6bc8d93822b78cb9dbb4fd75"; + sha256 = "1n3dip9n4r9hldbhm67xpv1g79jp3h1p5yif1pk46hl4zxvpv9wj"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -9933,12 +9946,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-11-24"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "cb80ac4470773c61a17c8f66e5da3096fbd4e615"; - sha256 = "0bcgmkl632s0qjpyisa2022ihw5yy5v2vszr1wdh0m7x2qvcjrvf"; + rev = "a7182093aeb118b03d8dca90c1cba4b47841de3b"; + sha256 = "0xzvwg8n3gwal5i6q29swkdibqbr7lq6zl9dm1hhiykzn698hgnh"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9946,12 +9959,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2025-11-28"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "0cb36a4965293a4daf4bc73524c18e5b1ab8c510"; - sha256 = "0ysj8wajm0shvqmkn5jqrl1hr06wj602vmz20bryizbr5kcn6ddh"; + rev = "d81e11daeddc6aff713258fa422df8c3de5047c7"; + sha256 = "0xw9617fcqjghd6ab03nvrcqsxld8b2xz3l13bfn44mikqkxln2f"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -10180,12 +10193,12 @@ final: prev: { neovim-tips = buildVimPlugin { pname = "neovim-tips"; - version = "2025-11-25"; + version = "2025-11-30"; src = fetchFromGitHub { owner = "saxon1964"; repo = "neovim-tips"; - rev = "b8c02411907ce1a5ded18a922a894a5dfb5c89a5"; - sha256 = "084m1g9pxgkxcsbi6yja3fd71x1r5i0j32bsxjnf63dxyzlf7v20"; + rev = "b2cb1063017a368e935cbdb1d1905737285e8d67"; + sha256 = "13qhxqpj55hyz5lw510lknyr2pdr2pnwbjhp0694imgdj1nq5gzv"; }; meta.homepage = "https://github.com/saxon1964/neovim-tips/"; meta.hydraPlatforms = [ ]; @@ -10362,12 +10375,12 @@ final: prev: { nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-11-18"; + version = "2025-11-30"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "ec187ddbee3fd72953c0e829e0a10c53fc4e2faf"; - sha256 = "1pryhj7kjg3dxyrwg02pgdlbp3jwmd2372fp3n4kwb2vr029r38p"; + rev = "35b7292334eba451f9f94252c7df1509570f864b"; + sha256 = "1xxjz5sz0mc6xfmljxmry39gwzp3gra1xx2dxv90ynzg7v6sbywb"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -10427,12 +10440,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "a133b6b518a3d119e63a185f264a1a445dad44e1"; - sha256 = "0pkn1f9p4wd7p0xnpr9qpkyxjiwgvlrr2wxjvwqp3gpa6n6d2cgv"; + rev = "193999e1dcba8166fc5315f3c05404b51890112a"; + sha256 = "0pw91cywvfmwffwd60v4r9mbgyc0lwpv64s3x1c1rbjiccxm67ai"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -10466,12 +10479,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-11-14"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "d871043474c06995c062413c91c987d0cb602632"; - sha256 = "0fxj5kg0m52xijgifck2k8fkp4m81zhjpx7ld4qrm0bfdqnz7bmx"; + rev = "718f30f547ca36bb4d0619e8ea11f5af4ee813cc"; + sha256 = "011i30xjvn9al5cc81ri4vscdni07asqg722vc43imqn2q472lbz"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -10505,12 +10518,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-11-25"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "1917c86818b5e058f53c2ea0ad38fc57534d62fc"; - sha256 = "0mi27v0gwsjb1nvyrbszijvi8cbm8rlwpqadyhdkg4vxwg6i5ili"; + rev = "5abf61927023ea83031753504adb19630ba80eef"; + sha256 = "1cs0dqyykrfjr3vl7z715f8j2wk83ix07fr1kd3vxz074qw36z4l"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -11012,12 +11025,12 @@ final: prev: { nvim-early-retirement = buildVimPlugin { pname = "nvim-early-retirement"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-early-retirement"; - rev = "cd29cf40af7473530a8598245ba1d348fd5e1fa0"; - sha256 = "18r32cgsa267p3jfynvbn92mb9l5n0ls7fphinvxr29iiaw39yws"; + rev = "82d297f56bccc5c380395b484fe0d1cd37f80d13"; + sha256 = "1hjkwgrv379cbbis1lm1bj1d2j6xb5v6h4yv74hvzsqas58wlm6b"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/"; meta.hydraPlatforms = [ ]; @@ -11077,12 +11090,12 @@ final: prev: { nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "62a690ed1c2f040b6cc40fc901e81302216f3860"; - sha256 = "19xbbipjzm2jbrb12z8xx7hkqjvvcqvdq8ykm05ifbxjxbhjhb1b"; + rev = "946be116814dba45606d2dcf585361a211312550"; + sha256 = "0p1l40r3q2iy0nfhy9g9s7bjs0jqrz46z5zrr6hjim5yw2kf8zgj"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; meta.hydraPlatforms = [ ]; @@ -11168,12 +11181,12 @@ final: prev: { nvim-impairative = buildVimPlugin { pname = "nvim-impairative"; - version = "2024-11-20"; + version = "2025-11-30"; src = fetchFromGitHub { owner = "idanarye"; repo = "nvim-impairative"; - rev = "f591e206e377c90e419ae24edb4fd81a22b6f1d5"; - sha256 = "0z4vlzb42j1263vnxxk3vka8wg0ggn3xkr42gmrw7dviz88l9x04"; + rev = "71825e2e0ba38b9740b7f6fcaf65c607377aaa3c"; + sha256 = "1f9la132m0zh34jncl8pqf0hi94izfw6na65cgy33hpykyrgfpf6"; }; meta.homepage = "https://github.com/idanarye/nvim-impairative/"; meta.hydraPlatforms = [ ]; @@ -11181,12 +11194,12 @@ final: prev: { nvim-java = buildVimPlugin { pname = "nvim-java"; - version = "2025-08-06"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java"; - rev = "3d56b7461facb42f135e25b2636bf220a7f0ed42"; - sha256 = "11yxzx2i24xvn690vnf53q5sz4ls71mf790lzlcs4sndjv80g892"; + rev = "389ef7c938f89730f112054132d6a08c180733af"; + sha256 = "0rpxami1iv2jvyckdkw6r0l1120i266j6631m1m9ir2ag3b3mg2p"; }; meta.homepage = "https://github.com/nvim-java/nvim-java/"; meta.hydraPlatforms = [ ]; @@ -11246,12 +11259,12 @@ final: prev: { nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-11-18"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "943e2398aba6b7e976603708450c6c93c600e830"; - sha256 = "00kcrl9fnvpf26i6agvmgfpdcn39a6c3xkkb26x6k8z964a329ag"; + rev = "f73731b543f5971e0da9665eb1d7ceffe1fde71f"; + sha256 = "17al7y7ff4bw4zfajrybmk0626ng6vv3mwgbcd9lrvz0ap0an6gp"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.hydraPlatforms = [ ]; @@ -11337,12 +11350,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-11-21"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "d1118791070d090777398792a73032a0ca5c79ff"; - sha256 = "06ci3wwq0nkkp2imfk0chniifr037qms1nyv4q3h37b18qyikwpm"; + rev = "ebe535956106c60405b02220246e135910f6853d"; + sha256 = "0qvx4rmm2jryslaba6889pyv66b2a7awi67bq5b9c8kbsb2qdlfg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -11389,12 +11402,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-11-27"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "07f4e93de92e8d4ea7ab99602e3a8c9ac0fb778a"; - sha256 = "1lk50fksfr407hi5nh18ra6r034wz7d60h1cxl4ssf18jk77w0xk"; + rev = "a2bd1cf7b0446a7414aaf373cea5e4ca804c9c69"; + sha256 = "09qqii1cz0vxw9wrym4lxp91bx7wkijm6m8fg45i56nbypdfchc4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11571,12 +11584,12 @@ final: prev: { nvim-origami = buildVimPlugin { pname = "nvim-origami"; - version = "2025-11-25"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-origami"; - rev = "8fb4e6b0ece721d08553d6eb9438bd19a0e77ab0"; - sha256 = "0r6jwfywlgaaas2jgrhpbflrn2h545xjzhyjwdc8jvmg36j8z43v"; + rev = "ca985b4101c4a6e899bed30bd3ec01ecf27fd003"; + sha256 = "03h6a90wfvia2j3s6y4rrph25xssi7vjlsfpg2fj77sxp3i5zglx"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-origami/"; meta.hydraPlatforms = [ ]; @@ -11688,12 +11701,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "93c618239be15efc84c2aa9c6809e6f2846b3a7a"; - sha256 = "122zj5q7ck2k6q5zmj41i3bwx7hjzwlivg3akhgpph1wj5ds0vi6"; + rev = "3a9fbae9b8afa3567f6f3c761407c5b4dcafb5df"; + sha256 = "1f3j763qhbvxa7n4gwjhm1g75fyps6a4sg6wbb8q1g28prwp5dl5"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -11701,12 +11714,12 @@ final: prev: { nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "394a3499aa671e2bebfa1d7d6f810e3ddb5f73c3"; - sha256 = "00ngfjpc2v22wv8xrqb987v3wk348kiqdb520islajjab3ni0c6r"; + rev = "34dd57ef6b7eb28cf7c02b25a3ad76357bfa88a3"; + sha256 = "152hffm28iqk2yy1jrh5rs764ismvvj0bqxvs9yggn58dl5fjpji"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -11805,12 +11818,12 @@ final: prev: { nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "f56f16a686cccb957db2be61a1dba4a85b32a934"; - sha256 = "1m0jhbkwxbpsxbjmvfi35fjy1l68f7dn2w6v29jns9gayn4v0yky"; + rev = "fee510b092581a24881f72d64c0efa3fd744c556"; + sha256 = "00cih33v96028k17irm6f5q6mkiv3pa1qf4glxgydy3pbrmih5ai"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; meta.hydraPlatforms = [ ]; @@ -11870,12 +11883,12 @@ final: prev: { nvim-tinygit = buildVimPlugin { pname = "nvim-tinygit"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-tinygit"; - rev = "10cbbd9e7729f0172bce186007a4f477cce2d1bf"; - sha256 = "1c156afjayq7aib0dmndfm3xs2v5jhwq50mnn4ibcf8ljg88hkva"; + rev = "d9312cd22bf56213116cac70cad22cbc3537f351"; + sha256 = "1l7lmvr4rss8bsab5dd2hfrv371dzlb26vfqryq6q8swafj9d1v8"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/"; meta.hydraPlatforms = [ ]; @@ -11883,12 +11896,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-11-21"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "3fb91e18a727ecc0385637895ec397dea90be42a"; - sha256 = "080cii3b3gglzrgngx5iaxj6vkkyaffr2rzbzsrjy81pyhq9c1k3"; + rev = "59088b96a32ea47caf4976e164dbd88b86447fb7"; + sha256 = "043ddk97mzp431j6r6bcaaca1mrbq2yjswpkw9r3sahgxgjqw9km"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -11909,12 +11922,12 @@ final: prev: { nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-11-10"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "660861b1849256398f70450afdf93908d28dc945"; - sha256 = "0gwbmj48mzc72jwbjgj6141svyjh1b7gnmd54zn270d7f98h0b10"; + rev = "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a"; + sha256 = "0dmcpn7l1f4bxvfa4li9sw8k1a5gh0r9zslflb5yrnax1ww71nyw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -12091,12 +12104,12 @@ final: prev: { nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-11-25"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "ad2b425298757136152f30b3988b69662a3414f3"; - sha256 = "1rlci2cxq553pcdnjfy9mr4kjs65h8kphxgllwwkgqv45iz9zk4r"; + rev = "e68281faf0c6433db92abe1600107954f07c1512"; + sha256 = "0ajznqkbl1kl2bqwqbxl27gz9plblilhl9b6ak4zvc3kidz8zsp3"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; @@ -12247,12 +12260,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-11-26"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "609aa89bdd84c0ecbb296bf6d06ac873b06fee26"; - sha256 = "1a614xcpgkff5sfqaxzbdacl0xnmkm64qszcki62x9dsi6xy0hhq"; + rev = "6939efc2c7145cf83644192c588eccd935b57826"; + sha256 = "08darsyyxhagvxviwfs6bfpkn66xkjwwm355nsw5qm23fc67yghv"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12286,12 +12299,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-11-26"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "e6cef8d1889be92b7393717750fa5af5b6890ad3"; - sha256 = "034f1jx3f0jgxlji7k1mqmhwpwwfd5kjqyk8j4jci9snc8l3a6kb"; + rev = "6f8a27847328e55582733cbe3ff43c449f0b881d"; + sha256 = "1jnjxc3qnwwvixdji87g296svizj4r1lnviivjari0ks4rm6q6gc"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -12323,6 +12336,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + oil-lsp-diagnostics-nvim = buildVimPlugin { + pname = "oil-lsp-diagnostics.nvim"; + version = "2025-01-22"; + src = fetchFromGitHub { + owner = "JezerM"; + repo = "oil-lsp-diagnostics.nvim"; + rev = "e04e3c387262b958fee75382f8ff66eae9d037f4"; + sha256 = "1l87cs6ffd1rlsw7sb9cimnqa2zlm1q5rf5ihbfp1wf8gn8fxj0k"; + }; + meta.homepage = "https://github.com/JezerM/oil-lsp-diagnostics.nvim/"; + meta.hydraPlatforms = [ ]; + }; + oklch-color-picker-nvim = buildVimPlugin { pname = "oklch-color-picker.nvim"; version = "2025-11-11"; @@ -12507,12 +12533,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "2025-11-28"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "NickvanDyke"; repo = "opencode.nvim"; - rev = "045770859dd1b74ade88d779ed0dae56b014290c"; - sha256 = "0v7ci60c00l2dxnyc0yi4hh6915smm8q5w3xfyk1kazdkrm54fby"; + rev = "963fad75f794deb85d1c310d2e2cb033da44f670"; + sha256 = "0wa43jx3f1lgx2vabl8q4mk3zi7fpdv4r0p49g77kd190cgar8ww"; }; meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -12546,12 +12572,12 @@ final: prev: { org-roam-nvim = buildVimPlugin { pname = "org-roam.nvim"; - version = "2025-11-06"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "org-roam.nvim"; - rev = "57ebbd05ef143b0ad09e6fae3cd3b8b584b3e5a6"; - sha256 = "04z86r6v0qg5jj1swrjki6bn8cnd2yfmxfj8b6hzs1xm5hhzjn69"; + rev = "087b7ba015a7d164c16d24567727117a0b0c43a6"; + sha256 = "0yiprzi9zp78p2fkns5q1pj1bq24cf0l26ky0f3v1kqmxi7ixm4f"; }; meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/"; meta.hydraPlatforms = [ ]; @@ -12598,12 +12624,12 @@ final: prev: { overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2025-11-28"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "9b6811cf677e35f6cfaee743db1f1284e3556668"; - sha256 = "0zy3dkdd30i40rzd3lxmp0lhngdbjaqip4m33jc5bsaahwf5cdx1"; + rev = "6a7f22dcafd9e938f70eb52b7f64f272d2b23b41"; + sha256 = "06yy4frgljpcipdbvamclxb202lj3khfb20l6ib8zn0ac0w4c2zg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -13107,12 +13133,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "2025-11-29"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "65c7d2372f3e64cb74ed7d2a500229aaf12cd528"; - sha256 = "0k0sfvvc48iqcmq2lmmy3dy8gjxybwis9myw5967my3ya47aqb14"; + rev = "2a9371bdce1f87bad7774c26f9170681c20ba7c8"; + sha256 = "1zymahkrr6fqvlk202arxpfgbw94qs6xfirfdm44n53a9saw2asi"; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13524,12 +13550,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-11-18"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "6e0e8902dac70fecbdd8ce557d142062a621ec38"; - sha256 = "11v6d3wkx6xgqd3wx0qasj2rhvipn7yzal4ijiwb9ywi7axhyg6h"; + rev = "b2b135347e299ffbf7f4123fb7811899b0c9f4b8"; + sha256 = "1l21xxqi01nssdgsma3gz4ihxyhkxa6qlphsw89vfbdngpavl9lg"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -13655,12 +13681,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-11-19"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "88f837a658df7304ae47fdf251c9560ffbc6bf2b"; - sha256 = "0gpa99qckzm4xhd2d4l3s62j5g6w89r3pjkw8cnq70x5fp896mm3"; + rev = "ab60e7e674992e12a5f54e5b8e948d8fa28347cb"; + sha256 = "1lrgwpgm2lgzpk9c2q5mmzrah3g5mpssk07w9la8fmb477pkp9f7"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -13720,12 +13746,12 @@ final: prev: { rzls-nvim = buildVimPlugin { pname = "rzls.nvim"; - version = "2025-11-21"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "tris203"; repo = "rzls.nvim"; - rev = "c1f48e5a82d8148f25d2f4e6491af20484141355"; - sha256 = "0xjnn2dpn85c7zlvaybbp0va5d34byzkygwvgmw2mk8407n14s5r"; + rev = "2c754a8002af71c8679ed171bf715c562737a38c"; + sha256 = "0izz5jksfcvd19j6rd5r9rz4jxb7v94rwb8qlwcawqijadrk180x"; }; meta.homepage = "https://github.com/tris203/rzls.nvim/"; meta.hydraPlatforms = [ ]; @@ -14059,12 +14085,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-11-28"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "e892a5da963813119d053af5b2260e3cd9d9f037"; - sha256 = "0aidpafxg43mc473h1fd86s6ndw9baf62spqffz8y5lw6n3l7d5r"; + rev = "076426b93a0654b6e1467258514dd9021a5e33e2"; + sha256 = "11ws6gw5j86abkxy5417w5kaw7kj530gxwhckg370ivzimk70j6y"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -14202,12 +14228,12 @@ final: prev: { sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-11-07"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "ec07018013b4683cf33f80ee4bdf3eca2621da33"; - sha256 = "13cs2bydz4gwdxpid8ikxijz794n59mvzpmlv6g1zcli7n9h36rl"; + rev = "a796676c1347ef2316c9b9d209ad52af6b6bbb51"; + sha256 = "0jaqzzyf515iyas827bjw6r9yiva0ca5hp3g3jgrm6zvwsxy4134"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; meta.hydraPlatforms = [ ]; @@ -14372,12 +14398,12 @@ final: prev: { srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2025-11-25"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "7f7740bf7605a8a438a23c35fb06e6229d6ecbab"; - sha256 = "01csg2i1jv8diph3hhsfjn1gd95ahk2s39p13vvrh4gf3d0p8aix"; + rev = "38f52babe0fa2b11719b51eb045a85244d6d7883"; + sha256 = "0618qr2d7l3g7pzjwgpvrcz8pbhab0rrw6fmwn443w3680c7lws6"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -14946,12 +14972,12 @@ final: prev: { telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2025-11-11"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "0697efb39e24a1c9a66d3eaeac9e38fc06ebba5a"; - sha256 = "165bi4ri5njqnw683wq3aifmkqvwz14sdvgcsngvv76f6d75mvsa"; + rev = "b4672bacb9ab08a48a696d41f0a2f107d3d2ede3"; + sha256 = "1dkqqgqbcdcjbrr9jh3vxmqs5l58pjkwx43m5pmph8si42wbi3va"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; @@ -15625,12 +15651,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-11-26"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "3255aaf9089c06db1732b25762b2eaa889034603"; - sha256 = "06cxs4ncr4fy4z1hwfpwrmjd71gmlzi5z2w3qz6g801nsnhs171h"; + rev = "9b55d36b797875b6e513f6bcc526e17cb9fe31f4"; + sha256 = "0jbzg9ajlaxa5ykg2qjznv74s7xqi2pipq735xv33vy0ax159rcz"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -15822,12 +15848,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-11-16"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "fb93a6cd02a0445da7976ef5646b7fbd3c2d7ee3"; - sha256 = "1kqzngfml4d8sm3f7akv9q3cldcp7f8znwyxs1jw10w4x33acqb1"; + rev = "85e79f665ac9ba95488d4b289d69c22227188286"; + sha256 = "0nfiigaczxil55qsrd6ybdm873yla60acs0a8kgrzw40vg8k98lj"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -15990,6 +16016,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + tv-nvim = buildVimPlugin { + pname = "tv.nvim"; + version = "2025-12-06"; + src = fetchFromGitHub { + owner = "alexpasmantier"; + repo = "tv.nvim"; + rev = "176c97ce7e18b1a5acd473b320d03773901a8f75"; + sha256 = "1838rmg32nm34fmwsgv79nnclsnyf27jay4x2ijjik6cnph1s6rf"; + }; + meta.homepage = "https://github.com/alexpasmantier/tv.nvim/"; + meta.hydraPlatforms = [ ]; + }; + twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; version = "2025-10-28"; @@ -16061,8 +16100,8 @@ final: prev: { src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "87d0f3a1beedefe6fdd96422c04c3dceb69d1063"; - sha256 = "18873xm3lhbgqy6s6nm23ciralylbm47dk4w654vpsnsj1h142lq"; + rev = "291972a39db85c5d2e76249748aba4206dfd3bc2"; + sha256 = "1m59bwpl81r2484phv5gq7bgzscggmir2j399af36h974jg3bzvd"; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -16187,12 +16226,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-11-21"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "29e1d3a1049d910dfdf0f9c46d83be0f040a51dc"; - sha256 = "1sk4209yz89gl5m3cv5by3ja3qbgg8470x01b66dq8gmwafbm0sc"; + rev = "d884da2a6bfd0f78b920cf08f583ddeadaaa5c02"; + sha256 = "0sih47754iki36grx8qqdhhg4yjw1ck2hlqyycmn3njac8xk5x9q"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -16226,12 +16265,12 @@ final: prev: { urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2024-06-04"; + version = "2025-11-30"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "c07733179e27c225ac3c58c3951701ee10b2dbde"; - sha256 = "1qbqn9h7602dw8vgj5m1i45g679n8j82h38hl0ab9lhxxykf2cys"; + rev = "813736e6891b8dccca58aa3baaeabef032f44525"; + sha256 = "15vji1dyfi5srv0dc69cjaxdg4krkf9f5292hw2crmgb1vrnll7b"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; meta.hydraPlatforms = [ ]; @@ -16746,12 +16785,12 @@ final: prev: { vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2025-11-28"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "e06b45a8705d945d795337deaf64d9652f96076b"; - sha256 = "181smjz1qx1239k15ls6gb62l88h7r2wqsb18y1bxffd64ralav8"; + rev = "499ae85357db811108ba1c52aa161fb09c462572"; + sha256 = "0ymkb6w2cbxwf7ipfqfigcl623b88c0b0fn2vicgmns03bcy79r2"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.hydraPlatforms = [ ]; @@ -18358,12 +18397,12 @@ final: prev: { vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2025-11-27"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "23f4fa532b1edcca87ec62d060f8ea39b02e363a"; - sha256 = "0v6gxds9zi4r35a1zl2nih32fscwhkcdayrryig9brp02f2alw7l"; + rev = "2e7e88b975d3111cc08b67cca6fad7806ac13104"; + sha256 = "1x5igaysm5ndyqg28sa096nkwqdd2ny4iqpm9ynv9l9vk7x24z5r"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; meta.hydraPlatforms = [ ]; @@ -18449,12 +18488,12 @@ final: prev: { vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2025-11-24"; + version = "2025-11-29"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "b8580b970722b48580add3b9fd9e13a6a2f0f4f0"; - sha256 = "19bva5hb3f42nmlfnqcng017l33w7icmy22529y9mfazn16vvrj1"; + rev = "0eef7d76750aa80507a3df60dabb4c66b6fbc70c"; + sha256 = "0fk9nn29jfkd7d3ccp0jk4iadjy5azsx0ni6mwqqsm42pgvmphwc"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; meta.hydraPlatforms = [ ]; @@ -18749,12 +18788,12 @@ final: prev: { vim-hy = buildVimPlugin { pname = "vim-hy"; - version = "2024-10-06"; + version = "2025-12-06"; src = fetchFromGitHub { owner = "hylang"; repo = "vim-hy"; - rev = "ab1699bfa636e7355ac0030189331251c49c7d61"; - sha256 = "09v83a6ybj73043acpm2nps5s56sqg2pz456b4qgz2r7zjlgx5r9"; + rev = "0bb9d63fc346fc8fa50afdfc4437d73ed9a53354"; + sha256 = "04azpvwq10mbwyyci9wip7km2lx62kaazpc77wrr3bvwsk5mpgh0"; }; meta.homepage = "https://github.com/hylang/vim-hy/"; meta.hydraPlatforms = [ ]; @@ -19413,12 +19452,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-11-28"; + version = "2025-12-04"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "928fe58f1ddeafdbfa35c4cb4ecba24389d03f2a"; - sha256 = "19z83xzb44yi1ccw3jq04xfivjv0wcq11gqq8l0j71dmhhzka0d2"; + rev = "1b01a8290b5fd00eb7f36b194589b01ff961f0e0"; + sha256 = "14qgai3vcmczlb616xr5i1bcq1j15src7jn39zn07qs2h2prnr18"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -19673,12 +19712,12 @@ final: prev: { vim-moonfly-colors = buildVimPlugin { pname = "vim-moonfly-colors"; - version = "2025-11-18"; + version = "2025-11-30"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-moonfly-colors"; - rev = "930f33f2e91225afb0491d259cf151ea9eca6ca3"; - sha256 = "1jjz7a24fpz3xsjqssjpjnb9b4mlhm99v5kmwx2s6c4apxhdjsrg"; + rev = "1ad5a8d40176a8749f0c77b8875225d9d299a438"; + sha256 = "0w42ap8z9zvcrh8almxg8m99nbgj5vxnag0sb81hm72za083acwb"; }; meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/"; meta.hydraPlatforms = [ ]; @@ -20895,12 +20934,12 @@ final: prev: { vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2025-08-25"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "67b24bf93cff3ac39db94694a7aefcdb3f44b927"; - sha256 = "1x2z8arn6zkmilq75qs3l66qdvgay28zi85q0i1q0zxl365nhl16"; + rev = "3fb77a9d1d3dd3abfbdbd4840eb20947f39f688b"; + sha256 = "0kbqxgvfzf2jd6skhxrhc8jshbl8m1h9f0h59w4h2z3v55j8562r"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; meta.hydraPlatforms = [ ]; @@ -20986,12 +21025,12 @@ final: prev: { vim-sneak = buildVimPlugin { pname = "vim-sneak"; - version = "2025-11-26"; + version = "2025-12-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "536dd6aa56374ed207457abab6f7940cf46c9451"; - sha256 = "1lqwxb8dgnzlncy2c90a0g3qmmblizgigfcyq8wl2j6272g5j71s"; + rev = "feea86adcfbf8e6b5e71fdd5f4f5736fd8819fdb"; + sha256 = "1x68j3kd53xsdnw414m6i5a147njkjghh2mfd7bs216xf31ahh2n"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; meta.hydraPlatforms = [ ]; @@ -21351,12 +21390,12 @@ final: prev: { vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-11-24"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "bbdc7f5d6280a047c3b1a951614454555a566356"; - sha256 = "1cwxzkw8p2a4gahfz7yap2w88mgnbdlx3d1igmnid5rwd7divbpk"; + rev = "1eeb12774a0f251571700ccf68da27789b2f0852"; + sha256 = "1jl0b6amvwy8alrm4m2q347nkjr9y4yn9843pz3wnfi0wihh73mh"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; meta.hydraPlatforms = [ ]; @@ -21845,12 +21884,12 @@ final: prev: { vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2025-11-02"; + version = "2025-11-29"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "dc37e83e7484fa2085cdaf37f84408e12006165a"; - sha256 = "1gkhlb93w68cgrwydb5wby1zzczapzqidapk8q842bxadaypkdll"; + rev = "4d86e39267d979b12df4321e9c93d3100d9db033"; + sha256 = "192557r8qh8n7ajgqslxxh345v1wz7x42byrp6qikm1s4l3fd6lg"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; meta.hydraPlatforms = [ ]; @@ -22184,12 +22223,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-11-10"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "32bcb3922c20588e00de68f73c86312eda2141ad"; - sha256 = "0lgr20w23646ada3aiqmrfxgh5dmkav4724ng2imr0v2nnfpmfh4"; + rev = "6e1229e23c3bbe93487ef62458b1241a2d8ff6af"; + sha256 = "0f3va5iw6b2sfjhsb191n3lx551inf72r744xfail845mk5lkp77"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -22312,14 +22351,27 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vscode-diff-nvim = buildVimPlugin { + pname = "vscode-diff.nvim"; + version = "2025-12-06"; + src = fetchFromGitHub { + owner = "esmuellert"; + repo = "vscode-diff.nvim"; + rev = "1610dbfeda57b003e666f93e88df5b33cd8c721b"; + sha256 = "09nmfq8vckipajihp18kb1w5z98g8h26zpfvjgglmmzdg00567s6"; + }; + meta.homepage = "https://github.com/esmuellert/vscode-diff.nvim/"; + meta.hydraPlatforms = [ ]; + }; + vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2025-08-06"; + version = "2025-12-03"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "cb9df0873c10a21d05362455ae3bb355eadcef6b"; - sha256 = "1m5r8w0rm531wkmappbk6487k7fgfkgdpp6hplph6gwsn0688wp0"; + rev = "aa1102a7e15195c9cca22730b09224a7f7745ba8"; + sha256 = "0q1vnzrdxhfajzjwmv73srz6mdlrk17px5ncrk4z72iff6a56sb0"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; meta.hydraPlatforms = [ ]; @@ -22377,6 +22429,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + whatif-vim = buildVimPlugin { + pname = "whatif.vim"; + version = "2022-06-19"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "whatif.vim"; + rev = "3c675fc637837a17a3243f851ce03442b20c2b42"; + sha256 = "0gva0qhns68bafrvzszljvgz7808bmnvaa44bvllv3vb4iw6jjj8"; + }; + meta.homepage = "https://github.com/AndrewRadev/whatif.vim/"; + meta.hydraPlatforms = [ ]; + }; + which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; version = "2025-10-28"; @@ -22613,12 +22678,12 @@ final: prev: { wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2025-11-13"; + version = "2025-12-01"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "e0b0f0f6efeb439d6ceec57492418fcc49d28a7f"; - sha256 = "1n2653np3gpvii3rjm6i9zd6wakav1lz775kwmk3072sr0ig3yp9"; + rev = "a50e7ae1eafe0a7c1b2871ac4185cad33bc94393"; + sha256 = "1bh1laywx7zihn2b9zhkwvn2f12h16hg7hckr9f0n2vhf9y1ipc1"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; meta.hydraPlatforms = [ ]; @@ -22704,12 +22769,12 @@ final: prev: { yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2025-04-14"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "04775cc6e10ef038c397c407bc17f00a2f52b378"; - sha256 = "024dw52ji4691ndkaz3k12fx6qyvhdpd2r69r9d2isy81fbs2fjm"; + rev = "04fc42b94305d94948c9c197f679336668af3292"; + sha256 = "19fl642mbf4x5apw29g0kd83bnf6410yvd7iss4dmxsfa1mrmh5h"; }; meta.homepage = "https://github.com/gbprod/yanky.nvim/"; meta.hydraPlatforms = [ ]; @@ -22731,12 +22796,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-11-29"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "f7b5ee05fd50fd291e226ec074e99e68d291ea50"; - sha256 = "1ikfb1z45x396v39ixm0hzg637gfj9gr1ymwrcbb7m7mkb4p93fp"; + rev = "1e92a6dff8cb67c89d10f309043dba6e8e1ab343"; + sha256 = "0b65bwnrfqmxvwq47b4rsknn4sxz3gqrngyqfmp80kgl9mlsgm31"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -22835,12 +22900,12 @@ final: prev: { zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2025-09-04"; + version = "2025-12-02"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "a934bc07d2ed4a98b74526c172d7f043736d8935"; - sha256 = "0vhmz4d74q287asz9fhcjf6vajh1d89przn93p90yxx3jh339bcj"; + rev = "4635a3f46d1066975d1074cd9f61f93cb1e32f64"; + sha256 = "0g94c15xi71zqqsfrahyn6w1dp7wcywb6l6q434gds3y31a59dh1"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; meta.hydraPlatforms = [ ]; @@ -22900,12 +22965,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-11-28"; + version = "2025-12-07"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "76b5c325bc0b3579b5cdabb8ed6631482715f900"; - sha256 = "03rqqcrps91pn3mzqgvbdm89r5bpgfh50i79dxwmig7nmg1sclf4"; + rev = "d281b862589d830b8650147e5461d21377744899"; + sha256 = "03vh6vyr1zakc91j4nmfmg5h5sp9817hb6vl9hf26aigalhr7921"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index d6974b1be5ab..c3c138c25c3b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-11-28"; + version = "0.0.27-unstable-2025-12-01"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "4d9d2de6fe9325a11aea7fed653478cb5b2b728b"; - hash = "sha256-HjMfeW5d0MpBSV1u+5pYgCoJYf1QjcVZZ8wyNTYMK5U="; + rev = "d3ec7c7320151244f07252a73628b1417f694b06"; + hash = "sha256-xwjY/yCjySqs6ndZitgVfhnCgxzB4mbplpefv5vVCN0="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index 4c92849f07f6..a4d3edbf5aa1 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "65aeacf-unstable-2025-11-03"; + version = "d88922e-unstable-2025-12-07"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "65aeacf9e2c663c9af2b1003727aa25acac96db4"; - hash = "sha256-rGfV/BxSwvcNZXmVUk54gni8fKFyoTsQl+gBtYci4jE="; + rev = "d88922e6c74b357cfd029128ce5ecd813b6eb747"; + hash = "sha256-XdDSyRHAZxRjziFwnEjjIrKSf8S+CHZw74P/O9O7C88="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE="; + cargoHash = "sha256-+se3u1ib3Ghy1tHIPpCY8sPgaQRaYCYGdJ8up+bubpM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix index b1220a1da25b..4acd1d8d7d48 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix @@ -25,6 +25,8 @@ let postPatch = '' ln -s ${./Cargo.lock} Cargo.lock ''; + + env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; }; in vimUtils.buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix index 90f8aabb2a82..d7d193647686 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix @@ -65,6 +65,6 @@ vimUtils.buildVimPlugin { description = "Interactive database client for neovim"; homepage = "https://github.com/kndndrj/nvim-dbee"; changelog = "https://github.com/kndndrj/nvim-dbee/releases/tag/v${version}"; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 296c7ba945e7..ec93b76547e2 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -5,6 +5,7 @@ rustPlatform, vimPlugins, vimUtils, + stdenv, }: let version = "0-unstable-2025-05-13"; @@ -30,6 +31,8 @@ let # Flaky test (https://github.com/nvim-pack/nvim-spectre/issues/244) "--skip=tests::test_replace_simple" ]; + + env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup"; }; in vimUtils.buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix index 29a21b5c326e..75356463fa44 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix @@ -6,13 +6,13 @@ }: vimUtils.buildVimPlugin { pname = "sonarlint.nvim"; - version = "0-unstable-2025-10-04"; + version = "0-unstable-2025-12-01"; src = fetchFromGitLab { owner = "schrieveslaach"; repo = "sonarlint.nvim"; - rev = "1d49a469265e271f02b6efcf09c215e4560bd5fa"; - hash = "sha256-1eUwgHvegULo33xVjvV3b90fSlJ8Ax10iDCZE4IPo58="; + rev = "36f4fcee5b0cd3ddae1aa10225ddf40100dbb6a4"; + hash = "sha256-UhCb7Glxsd/byGRQ6eLK0dAQHNuShWzJMCxM+RkhFyw="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 17443410c2df..1c86eb29518f 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -121,12 +121,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=20f55fb"; + version = "0.0.0+rev=a06c2e4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "20f55fb9663568f16ebceaac7673d2aa530add46"; - hash = "sha256-rHHXLHZ9n/gc09kSMYyMPl2VBupbheva0pDV9RrjlT8="; + rev = "a06c2e4415e9bc0346c6b86d401879ffb44058f7"; + hash = "sha256-ONQ1Ljk3aRWjElSWD2crCFZraZoRj3b3/VELz1789GE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -242,12 +242,12 @@ }; c3 = buildGrammar { language = "c3"; - version = "0.0.0+rev=2e852d5"; + version = "0.0.0+rev=3bcb189"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "2e852d524cdab2e857ac7fb3ad814b39ae858916"; - hash = "sha256-AKjdyymtwn6mF+41YuqKTZu506nnzE45m5qeEGwclVU="; + rev = "3bcb189c85a15d5e47a12947fbb25cd6604025f5"; + hash = "sha256-aOvlLAXe7h2RC6oUSuLk6g9XvcrUsSVHV6M0dKkf+MU="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; @@ -663,12 +663,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=0277284"; + version = "0.0.0+rev=3d000d3"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "027728466b8115cf807517af943cbeaed34053fc"; - hash = "sha256-vaeGViXob7AYyJj93AUJWBD8Zdfs4zXdKikvBZ3GptU="; + rev = "3d000d37b99ac2640bf24c1a7a5c9a58485778df"; + hash = "sha256-17HyH70Odvi4nT8Lox/EpTBSYipBkas0TKcX3stLcvQ="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -806,12 +806,12 @@ }; forth = buildGrammar { language = "forth"; - version = "0.0.0+rev=9018923"; + version = "0.0.0+rev=360ef13"; src = fetchFromGitHub { owner = "AlexanderBrevig"; repo = "tree-sitter-forth"; - rev = "90189238385cf636b9ee99ce548b9e5b5e569d48"; - hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws="; + rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0"; + hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8="; }; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; }; @@ -1891,12 +1891,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=80ac665"; + version = "0.0.0+rev=834a0b0"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "80ac665f68a5d1c6ca0443f71b6cd60e24e84157"; - hash = "sha256-052xMqQoaYIahDpznCqQi7D5l3lFDICqRerpWXpI3F4="; + rev = "834a0b01e98eaf4313dfd48778e20bef1738ff8f"; + hash = "sha256-ed7h87jGE1C0ryj/4MWdLExiIt+BSk5YYU/IVYJ47Zs="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1980,12 +1980,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=bfcb03e"; + version = "0.0.0+rev=eabf968"; src = fetchFromGitHub { owner = "nix-community"; repo = "tree-sitter-nix"; - rev = "bfcb03e6ddccc5a1eb84cea0176096f85a7af333"; - hash = "sha256-S3YgbP5u5ybrboJUwE9KVALS92X7ojc0fBnA4StQhxc="; + rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840"; + hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY="; }; meta.homepage = "https://github.com/nix-community/tree-sitter-nix"; }; @@ -2172,12 +2172,12 @@ }; pkl = buildGrammar { language = "pkl"; - version = "0.0.0+rev=82f0e99"; + version = "0.0.0+rev=d50709f"; src = fetchFromGitHub { owner = "apple"; repo = "tree-sitter-pkl"; - rev = "82f0e990b727374014371681457cc6ea5c3daa97"; - hash = "sha256-USRl2LghA0e+shclJFp6HxDKJf6+txslMZiQ4pCfOvw="; + rev = "d50709f1b71e77844c4551c655792d100a5ca559"; + hash = "sha256-Q5feMUI0w1NinR9o3pE3bH7qAFMcF0xOwWlZjughTqM="; }; meta.homepage = "https://github.com/apple/tree-sitter-pkl"; }; @@ -3105,12 +3105,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=1975f67"; + version = "0.0.0+rev=3057cd4"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "1975f67058325403c5412cde48b181a3fa817870"; - hash = "sha256-3zcsIy+UNNUNua0iZW96jXrgVRkYZLFj6ND2coq4E7g="; + rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db"; + hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3541,12 +3541,12 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=d466418"; + version = "0.0.0+rev=a96227a"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "d466418f1c8850276bb7787a135372cb70868b1d"; - hash = "sha256-xoCHXWY2oCXSs2qrEA5AdJ4zCRTmqPdFhmK6Mdpv+Oc="; + rev = "a96227aaa37e5f8e1a5888bfac2dcb31ad0bf1f1"; + hash = "sha256-yNOpIFc7jdXWWeoo1C1JwSx121BO1sHYbiiieQyxNPM="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; @@ -3631,12 +3631,12 @@ }; zsh = buildGrammar { language = "zsh"; - version = "0.0.0+rev=v0.47.0"; + version = "0.0.0+rev=v0.48.0"; src = fetchFromGitHub { owner = "georgeharker"; repo = "tree-sitter-zsh"; - rev = "v0.47.0"; - hash = "sha256-GOSBnGXBURBxg+hm0QKSYJuj/pcXOGDdsErOuSVEXcA="; + rev = "v0.48.0"; + hash = "sha256-gBbT2xt32fKt54nh4Dp6EK6uUd63rsIEmmK4nr9Pg1Y="; }; meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 72a524e91049..634bfe857d4e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -21,7 +21,7 @@ direnv, fzf, gawk, - gperf, + git, helm-ls, himalaya, htop, @@ -31,7 +31,6 @@ libgit2, llvmPackages, neovim-unwrapped, - nim1, nodejs, openscad, openssh, @@ -71,6 +70,8 @@ pandoc, # nvim-tinygit gitMinimal, + # opencode-nvim, + opencode, # Preview-nvim dependencies md-tui, # sidekick-nvim dependencies @@ -122,6 +123,8 @@ # search-and-replace.nvim dependencies fd, sad, + # tv.nvim dependency + television, }: self: super: let @@ -1359,16 +1362,19 @@ assertNoAdditions { nvim-treesitter ]; nvimSkipModules = [ + "init" # _GO_NVIM_CFG + "go.comment" + "go.format" + "go.ginkgo" + "go.gotest" + "go.gotests" "go.inlay" "go.project" - "go.comment" + "go.snips" "go.tags" - "go.gotests" - "go.format" "go.ts.go" "go.ts.nodes" - "go.snips" "snips.go" ]; }; @@ -2309,6 +2315,7 @@ assertNoAdditions { }; neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { + checkInputs = [ git ]; dependencies = with self; [ plenary-nvim nui-nvim @@ -2323,6 +2330,7 @@ assertNoAdditions { checkInputs = with self; [ neo-tree-nvim # FIXME: propagate `neo-tree` dependencies + git nui-nvim plenary-nvim ]; @@ -2774,6 +2782,7 @@ assertNoAdditions { nvim-tree-lua neo-tree-nvim # FIXME: should propagate from neo-tree-nvim + git nui-nvim plenary-nvim ]; @@ -2832,6 +2841,10 @@ assertNoAdditions { dependencies = [ self.oil-nvim ]; }; + oil-lsp-diagnostics-nvim = super.oil-lsp-diagnostics-nvim.overrideAttrs { + dependencies = [ self.oil-nvim ]; + }; + ollama-nvim = super.ollama-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2863,6 +2876,13 @@ assertNoAdditions { }; }); + opencode-nvim = super.opencode-nvim.overrideAttrs { + runtimeDeps = [ + curl + opencode + ]; + }; + # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we # avoid choosing one of them and leave it to the user openscad-nvim = super.openscad-nvim.overrideAttrs { @@ -3618,6 +3638,10 @@ assertNoAdditions { dependencies = [ self.nvim-treesitter ]; }; + tv-nvim = super.tv-nvim.overrideAttrs { + runtimeDeps = [ television ]; + }; + typescript-nvim = super.typescript-nvim.overrideAttrs { checkInputs = [ # Optional null-ls integration @@ -4183,7 +4207,6 @@ assertNoAdditions { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ marcweber - jagajaga mel ]; platforms = lib.platforms.unix; @@ -4205,6 +4228,7 @@ assertNoAdditions { # Optional shipwright "zenbones.shipwright.runners.alacritty" "zenbones.shipwright.runners.foot" + "zenbones.shipwright.runners.ghostty" "zenbones.shipwright.runners.iterm" "zenbones.shipwright.runners.kitty" "zenbones.shipwright.runners.lightline" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 53ab0e1e2a34..afc3e554f19b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -658,6 +658,7 @@ https://github.com/nvim-mini/mini.basics/,HEAD, https://github.com/nvim-mini/mini.bracketed/,HEAD, https://github.com/nvim-mini/mini.bufremove/,HEAD, https://github.com/nvim-mini/mini.clue/,HEAD, +https://github.com/nvim-mini/mini.cmdline/,HEAD, https://github.com/nvim-mini/mini.colors/,HEAD, https://github.com/nvim-mini/mini.comment/,HEAD, https://github.com/nvim-mini/mini.completion/,HEAD, @@ -946,6 +947,7 @@ https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/refractalize/oil-git-status.nvim/,HEAD, https://github.com/benomahony/oil-git.nvim/,HEAD, +https://github.com/JezerM/oil-lsp-diagnostics.nvim/,HEAD, https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, @@ -1227,6 +1229,7 @@ https://github.com/dmmulroy/tsc.nvim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/mtrajano/tssorter.nvim/,HEAD, https://github.com/Quramy/tsuquyomi/,, +https://github.com/alexpasmantier/tv.nvim/,HEAD, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, @@ -1719,6 +1722,7 @@ https://github.com/dylanaraps/wal.vim/,, https://github.com/mattn/webapi-vim/,, https://github.com/willothy/wezterm.nvim/,HEAD, https://github.com/DingDean/wgsl.vim/,HEAD, +https://github.com/AndrewRadev/whatif.vim/,HEAD, https://github.com/folke/which-key.nvim/,, https://github.com/neolooong/whichpy.nvim/,HEAD, https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD, 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 55bbf0ceb028..01cb7ff866bf 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.57"; - hash = "sha256-vqlW54Ck9Q2N0gUsfCEEt4dTqiaQOi3eAAK43umcEK4="; + version = "2.0.62"; + hash = "sha256-2w4ZMOM7EI0rEKoUocwnHVlNVk6smCiX0nTgTpdZo2s="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 495c3e8fdf76..18dc7cd09d39 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-Ll+V+0SBAXIQBvfbGQ1lgU8KtAAQiHJjc6t0Nxh1LvY="; + hash = "sha256-oN7pb/KKhzx7LgODvEh5GyX9Nismtz1lsDcGsDlmaO0="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-NBHmOJT1n+Xc/8rS2gapPMRDsQXCsCbo9sK2tXRpyHA="; + hash = "sha256-MeX4waPhX4/hmQH+iYs+RZlRGC/giXOtXG31zSAzcKI="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-vv5q6t4wh0K5Ll39/Fed0p9XPbm/YrkH3L7uVRB2Ndg="; + hash = "sha256-pALbGD8Gikfyn4wNjCK9CTwZzaK/LjfHfJmFW0ns+yo="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-V//GHbjbHos3u/DF4qPplufscJ0Yclg5HTII27U9SDw="; + hash = "sha256-Tr6KjEDTtCH3EgSKK0WqU/5w8gjSz3azhxHVHlXwZTw="; }; }; in { name = "ruff"; publisher = "charliermarsh"; - version = "2025.30.0"; + version = "2025.32.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix index fb59466d4ded..278e77fe1a7c 100644 --- a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "3.0.16"; - hash = "sha256-UxD07bouMK8nuysh5TAV7ZVhkLiOV6R1qfvVZcXB2Hc="; + version = "3.0.20"; + hash = "sha256-X/HqQM1CDUvIi8p8i++6/aZl2hQWbeKIwgmDx/cb5UQ="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5eefe7d47bca..2688d76ba966 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1242,8 +1242,8 @@ let mktplcRef = { name = "languagetool-linter"; publisher = "davidlday"; - version = "0.25.3"; - hash = "sha256-ZxIBjvDUThxmJwvaP3N/nM4b2dGkM0jiklcwiAzPXiY="; + version = "0.25.5"; + hash = "sha256-/ZSxaxiv76aJ+KmDlR5h8PrkEo0pPMvb9C3KGdKCNK8="; }; meta = { description = "LanguageTool integration for VS Code"; @@ -1900,8 +1900,8 @@ let mktplcRef = { publisher = "github"; name = "codespaces"; - version = "1.18.3"; - hash = "sha256-NcCVpRbFdfRaV7nwQgMNOJWvhrFZ/FCJpcVoivS+jVI="; + version = "1.18.4"; + hash = "sha256-/bCLmpUqtkV1yTLMWIwbX6jdtzwN25NatGRQHR8z5oA="; }; meta = { @@ -1965,8 +1965,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.58.3"; - hash = "sha256-3m77Z3UpP1cIXdnyFZ7EikwsCZ5jVBw9K8PIZbBwFhM="; + version = "6.60.2"; + hash = "sha256-X3ZOrEkcFDlB4pYqEvO3gACAOET1kjF56FkHLmNKRrI="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2009,6 +2009,8 @@ let }; }; + google.colab = callPackage ./google.colab { }; + Google.gemini-cli-vscode-ide-companion = callPackage ./Google.gemini-cli-vscode-ide-companion { }; grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { @@ -3836,8 +3838,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.9.0"; - hash = "sha256-Z0oUhqoHfVALG5k1dbSBpJiq0AEjaqeh8yLJ8FjvfcY="; + version = "25.12.1"; + hash = "sha256-5icJ5nZSJNC2znqC8iA6IDjBMeRkoRKRMaRQ6G2vn4M="; }; meta = { description = "Ansible language support"; diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index a744b9c40bc7..0eb911d40c5d 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "harper"; publisher = "elijah-potter"; version = harper.version; - hash = "sha256-Mu1l/3twbdpqIV8ePNfR7No23Ib/8hkB2CfE59BZP9M="; + hash = "sha256-ifOUhBsEtBNGB4m+y6p82ZNk2CAeyTzmgz76GRh+f90="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix index bb21dd2a0d7e..cc9a49178047 100644 --- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "11.0.1"; - hash = "sha256-k+Hien0huGIn0XRQQSeW6wmd1HTTTfNZPnw36ryGLd8="; + version = "11.0.2"; + hash = "sha256-PwP49p1gpxfx3AmGFhNvRBBc4SxWM2b9aaiUG/C+Uhg="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix index 89cf74e10627..784661a5bfe7 100644 --- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix +++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "fstar-vscode-assistant"; publisher = "FStarLang"; - version = "0.22.0"; - hash = "sha256-jDHVN34f/HlE74+uXt4tx8cDjh9pG4nKZG5CaHKT9oE="; + version = "0.23.1"; + hash = "sha256-AwYR74qyoEsn+LixmFwqzwA6yM0MBtWU4SKcxslNSOk="; }; meta = { description = "Interactive editing mode VS Code extension for F*"; diff --git a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix new file mode 100644 index 000000000000..270825ecc7bc --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "google"; + name = "colab"; + version = "0.1.1"; + hash = "sha256-WzMZaS4Tr50VmOJY7jYdX4AK0hMnALp+LS+hyIurpx8="; + }; + + meta = { + description = "A VS Code extension providing access to Google Colab. Colab is a hosted Jupyter Notebook service that requires no setup to use and provides free access to computing resources, including GPUs and TPUs."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Google.colab"; + homepage = "https://github.com/googlecolab/colab-vscode"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.devoid ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index b575daa60738..2dfc0bcd53ca 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -1,24 +1,78 @@ { lib, + stdenvNoCC, + fetchFromGitHub, + pnpm, + nodejs, vscode-utils, - vscode-extension-update-script, + nix-update-script, }: -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "RooVeterinaryInc"; - name = "roo-cline"; - version = "3.28.16"; - hash = "sha256-Ot7Rrb9tbnXEsVGpJXULq+8o3UhPA2rwtawSbop7wHg="; - }; +let + vsix = stdenvNoCC.mkDerivation (finalAttrs: { + name = "roo-code-${finalAttrs.version}.zip"; + pname = "roo-code-vsix"; + version = "3.36.2"; - passthru.updateScript = vscode-extension-update-script { }; + src = fetchFromGitHub { + owner = "RooCodeInc"; + repo = "Roo-Code"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YO3TxKcCDoIJeBoMGFFrHUp6lne1e84Tf1I2vHF6w1c="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-k6Bw6MlFDNPNPdaKJ7tW8wje2j9LJvREtlAWyySnOC0="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + pnpm + ]; + + buildPhase = '' + runHook preBuild + + node --run vsix + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp ./bin/roo-cline-$version.vsix $out + + runHook postInstall + ''; + }); +in +vscode-utils.buildVscodeExtension (finalAttrs: { + pname = "roo-code"; + inherit (finalAttrs.src) version; + + vscodeExtPublisher = "RooVeterinaryInc"; + vscodeExtName = "roo-cline"; + vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}"; + + src = vsix; + + passthru = { + vsix = finalAttrs.src; + updateScript = nix-update-script { + attrPath = "vscode-extensions.rooveterinaryinc.roo-cline.vsix"; + }; + }; meta = { description = "AI-powered autonomous coding agent that lives in your editor"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline"; - homepage = "https://github.com/RooVetGit/Roo-Code"; + homepage = "https://github.com/RooCodeInc/Roo-Code"; license = lib.licenses.asl20; - maintainers = [ ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; -} +}) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 0ac09122b103..4c96d8fbdd7e 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.38.3"; - hash = "sha256-LVFZlgXrnZ0X6gt+UBghvG7t6mK5R9N7X0SYb8G3alU="; + version = "3.39.2"; + hash = "sha256-9ypSR8TbFxjcwfLk+aYewjULz5LNPUD4pX7NAXk6ozM="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix b/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix index 60bdad38a129..76d4e7c08d93 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "sourcegraph"; name = "amp"; - version = "0.0.1764403772"; - hash = "sha256-3R9SMaIop+7gBPVh2cdovbt6FyfaxjMhPIgdDJIPNIE="; + version = "0.0.1764950983"; + hash = "sha256-ydP5axyMbTt+h/cSuwOsFDj3Lm3sGtEi/ZKQELXzrpo="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix b/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix index be85f260a9b5..a9d4c460e5c9 100644 --- a/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sysdig-vscode-ext"; publisher = "sysdig"; - version = "0.2.12"; - hash = "sha256-3sn1YQHOZW/SigV6eyubPJoQbTwqNNwlsXIEmevs2zc="; + version = "0.2.14"; + hash = "sha256-b4e5Qgk8YfI1nAB8yrM5k0svgebgZSucXRktkK0EItk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index caec8fdc6765..d806355197e7 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-P5LEN+wTfJ9p0vG4z/FAB4u2hFLcqy7Xc18qC4W5x8U="; + hash = "sha256-NXlV80CV6EyALfJHT3x3pfjGiJfYxPT2JXTADMfB7yA="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-cNiXCrOw3ET/BTfMxYfr01F+5lTXbKH3vKpRQQdnRLc="; + hash = "sha256-NWak0NXK5SxGm7JLpqR7zapEzxG+CDFdTcZDyCY6ifk="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-zCGwaw5Dgd0o5t+h0sjPZ1nDp/JqC2Wx4QfQYv3jg4w="; + hash = "sha256-9lJfrqVFTROMqLaO9SUx9msACjHu0lTSKLRPPA8r8AM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-M5BQdlEe5eN91Mz8trMFbFNeRoMIpGSOHpBSGQQVJc0="; + hash = "sha256-iz3+iEXCYzItNTrAlzZAuM80U+TNlz/n1nljRvOfX3k="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.20.0"; + version = "0.20.2"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/applications/emulators/libretro/cores/atari800.nix index d749224cb248..bc60a5474c2d 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-2024-10-31"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-atari800"; - rev = "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b"; - hash = "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE="; + rev = "630f2346a1dabefdcf534880a48e3e200e2cc551"; + hash = "sha256-mCno2DHQXCJO2gStyp1te2XEUlrbX2iW3xIUOvZdoB0="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix index 2e870f8ebc89..3fea5eeacdfa 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "bsnes-hd-beta"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "DerKoun"; repo = "bsnes-hd"; - rev = "0bb7b8645e22ea2476cabd58f32e987b14686601"; - hash = "sha256-YzWSZMn6v5hWIHnp6KmmpevCsf35Vi2BCcmFMnrFPH0="; + rev = "fc26b25ea236f0f877f0265d2a2c37dfd93dfde9"; + hash = "sha256-Bim8N3rkGNnHQhaA+wVALSM3ZBBTk0Zt9xct5qVnXzM="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 3e52d3aab7f3..de020e1844a4 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-11-27"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "3609f054a65aea4b4cab5a87b2fdc876d911d244"; - hash = "sha256-S18J0S50/S/50rCmcGkwSLslnA1abvsX9HhtFVcQ7XM="; + rev = "db02ef59a64209954b47965ae186ec95cf1da706"; + hash = "sha256-lbtc/3lu+wm19rRt+gT3tHrDaqfZYVXsiHN5Pvm5iM8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index ae4f1ca10acf..289616f7eb00 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-30"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "a90e86e100f79533f257ac2b30ccefe26a76daad"; - hash = "sha256-BD5DFl9EzSgnKBjF/TPXL8yvoyc3B1Ktzcwug8CEK38="; + rev = "872488e6f457edd449bc3eb7554ed1198abcaad8"; + hash = "sha256-K0+uHdd85F5QBPhbV5U438TwVKwNk1NHHBTt5r45EgI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 0581de85285b..b5fe73e6a070 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-11-13"; + version = "0-unstable-2025-12-02"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "62c7089644966f6ac5fc79fe03592603579a409d"; - hash = "sha256-NHJfZpo4/aR9a6Sn3x+BQaVfKtkMBUoDQlgtvIkXDFI="; + rev = "e58d3285f4323a19a0f5aea01f4cdf7a934e1155"; + hash = "sha256-3n34FDDQ1CjmZ4V7Vl/JYi/24w9F3z1nLSEuq44KvMg="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix index 63d6ccfd3da7..a95a63558c1d 100644 --- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "parallel-n64"; - version = "0-unstable-2025-08-05"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "libretro"; repo = "parallel-n64"; - rev = "50d3ddd55b5774da643d90d7ad1e3cbd2c618883"; - hash = "sha256-l42EKrZH1JwTxpkjl8vTrMsd2NJCeKV9Owgj+EB81eM="; + rev = "1da824e13e725a7144f3245324f43d59623974f8"; + hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix index 7f47453292b3..b7d63f301b81 100644 --- a/pkgs/applications/emulators/libretro/cores/picodrive.nix +++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "picodrive"; - version = "0-unstable-2025-11-17"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "libretro"; repo = "picodrive"; - rev = "046e5ff91eb4bfa728e51e01304ff73cf6b4ee96"; - hash = "sha256-uoUqap7hMg8C2Ouud0UTtkWeZbtga9GVqSipHZK90/s="; + rev = "3365b1774bc8680be9899968fe45b224ad2f11c1"; + hash = "sha256-hn80Dkdf6dMmCFoh9QeySVbF7tu8Vc1NfAl3SV8AZLg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index bdc4cb4bd0c0..31a00e5aa7a3 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-11-27"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "e5bafa4264e88cf2699e44740e2580ced0454a90"; - hash = "sha256-+Rmj75yBodwqENJppTWpsef9R0ajCoz9KaxVuYktUII="; + rev = "cf306e9cec919011339fb123d009cb470f628df4"; + hash = "sha256-5UNd59QG10yD7wuiXWC5JwqWvggx07M6n320dhJ3rU0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index 718ce9e37128..bf0a810f4866 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation { meta = { description = "Super Nintendo Entertainment System Emulator"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.sander ]; homepage = "https://www.zsnes.com"; platforms = [ "i686-linux" diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 02726e6738d4..a7f219c4c5c3 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -203,7 +203,6 @@ mkDerivation rec { description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lsix ]; teams = [ teams.geospatial ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index e6868cc03407..ebeda7df6087 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -81,14 +81,14 @@ let ]; in mkDerivation rec { - version = "3.44.4"; + version = "3.44.5"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-G9atxBBANlUDGl39bkwTo6L04/+0o5A5ake4KvIY70E="; + hash = "sha256-VrI3pk7Qi0A9D7ONl18YeX9cFS6NfSU2Hvrzx8JIoXo="; }; passthru = { @@ -199,7 +199,6 @@ mkDerivation rec { description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lsix ]; teams = [ teams.geospatial ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index e419f1b06f9a..05d4676090a9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -47,7 +47,7 @@ vala, gi-docgen, perl, - appstream-glib, + appstream, desktop-file-utils, xorg, glib-networking, @@ -79,7 +79,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "3.0.4"; + version = "3.0.6"; outputs = [ "out" @@ -90,10 +90,17 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz"; - hash = "sha256-jKouwnW/CTJldWVKwnavwIP4SR58ykXRnPKeaWrsqyU="; + hash = "sha256-JGwiU4PHLvnw3HcDt9cHCEu/F3vSkA6UzkZqYoYuKWs="; }; patches = [ + # https://gitlab.gnome.org/GNOME/gimp/-/issues/15257 + (fetchpatch { + name = "fix-gegl-bevel-test.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009.patch"; + hash = "sha256-pjOjyzZxxl+zRqThXBwCBfYHdGhgaMI/IMKaL3XGAMs="; + }) + # to remove compiler from the runtime closure, reference was retained via # gimp --version --verbose output (replaceVars ./remove-cc-reference.patch { @@ -113,13 +120,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./tests-dbus-conf.patch { session_conf = "${dbus.out}/share/dbus-1/session.conf"; }) - - # Fix a crash that occurs when trying to pick a color for text outline - # TODO: remove after GIMP 3.2 is released, per https://gitlab.gnome.org/GNOME/gimp/-/issues/14047#note_2491655 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/1685c86af5d6253151d0056a9677ba469ea10164.diff"; - hash = "sha256-Rb3ANXWki21thByEIWkBgWEml4x9Qq2HAIB9ho1bygw="; - }) ]; nativeBuildInputs = [ @@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - appstream-glib # for library + appstream # for library babl cfitsio gegl diff --git a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch index da9152eeef01..9ae02fdb4a56 100644 --- a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch +++ b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch @@ -1,5 +1,5 @@ ---- a/build/meson/run_test_env.sh -+++ b/build/meson/run_test_env.sh +--- a/tools/run_test_env.sh ++++ b/tools/run_test_env.sh @@ -33,7 +33,7 @@ if [ -n "${UI_TEST}" ]; then OPT="--auto-servernum" fi diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f5b4d5509a23..618fcc99d259 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -95,7 +95,6 @@ stdenv.mkDerivation rec { homepage = "https://hugin.sourceforge.io/"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 12fbce05b962..6744c10d171e 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -86,6 +86,5 @@ stdenv.mkDerivation rec { description = "Complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.hrdinka ]; }; } diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index b99886f953fc..4539c3606639 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -28,23 +28,26 @@ wrapGAppsHook3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "25.05.0"; + version = "25.10.2"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - tag = "v25.05.0-Release.2a2b0e16"; - hash = "sha256-PBqkVac867xE4ZcvwTysAK6rQSoEZelKrV9USvFsaLk="; + tag = "v${finalAttrs.version}-Release.673d1b90"; + hash = "sha256-afzMUko09vGmQvu6sob8jYfVUvQECoUdAmIbLIoh1Dw="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; + buildInputs = [ qtbase qtsvg @@ -68,7 +71,7 @@ stdenv.mkDerivation { libzim ]; - # to prevent double wrapping of wrapQtApps and wrapGApps + # Prevent double wrapping of wrapQtApps and wrapGApps dontWrapGApps = true; preFixup = '' @@ -84,16 +87,16 @@ stdenv.mkDerivation { "-DUSE_SYSTEM_TOML=ON" ]; - meta = with lib; { + meta = { homepage = "https://xiaoyifang.github.io/goldendict-ng/"; description = "Advanced multi-dictionary lookup program"; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "goldendict"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ slbtty michojel linsui ]; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 03b5506e99b4..4245ff0a23b6 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "organicmaps"; - version = "2025.11.11-5"; + version = "2025.11.26-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; tag = "${finalAttrs.version}-android"; - hash = "sha256-lO6pJUV+PBgE3SLUfD7i4zySB6vg9ZAXN1G3dK4XYqs="; + hash = "sha256-gkTZpWV3f/rNb5aDMRsbf/+uwItaTCfqODJxxLhx2hE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17291bdc2cce..944b4030cf7f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -24,7 +24,6 @@ let description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - edwtjo DimitarNestorov ]; platforms = [ diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 8a9959832da7..1e3322511bbf 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -93,7 +93,6 @@ let homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; - maintainers = [ lib.maintainers.edwtjo ]; platforms = lib.platforms.linux; mainProgram = exec; }; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b85b0f0bd903..d54b3b1e74cc 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.0.3"; + version = "2.0.5"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-vvbzXwujOIk3g/SvNM3JGkt956RN9VR0Pcx5nzg1IU0="; + hash = "sha256-a2pYQCpcF4nIr2HaU+29umiTdXN2P//+a9SZ7pG55lo="; }; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8ff6cef784f7..84fe0843fab4 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Core component for zathura PDF viewer"; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ globin ]; + maintainers = [ ]; }; }) diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 9290e079d480..1ca50b639bcc 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,7 +1,5 @@ { - config, lib, - stdenv, newScope, useMupdf ? true, }: @@ -9,7 +7,7 @@ lib.makeScope newScope ( self: let - callPackage = self.callPackage; + inherit (self) callPackage; in { inherit useMupdf; diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 6f5d5bcee4e1..326b0c3fb2ee 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -68,7 +68,6 @@ symlinkJoin { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ smironov - globin TethysSvensson ]; mainProgram = "zathura"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 54d44013f30d..c6b00dbc2079 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,59 +813,59 @@ } }, "ungoogled-chromium": { - "version": "142.0.7444.175", + "version": "143.0.7499.40", "deps": { "depot_tools": { - "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5", - "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=" + "rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984", + "hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E=" }, "gn": { - "version": "0-unstable-2025-09-18", - "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e", - "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=" + "version": "0-unstable-2025-10-08", + "rev": "07d3c6f4dc290fae5ca6152ebcb37d6815c411ab", + "hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I=" }, "ungoogled-patches": { - "rev": "142.0.7444.175-1", - "hash": "sha256-QN7G9LdflMa2Rg9bPFrmT1mgOfM+2ZlBc4GDamkf8J0=" + "rev": "143.0.7499.40-1", + "hash": "sha256-x5Hd9adDj2hb33oiqrUXsXFR+Aza7fE8+m95P6JjKnA=" }, - "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=" + "npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "302067f14a4ea3f42001580e6101fa25ed343445", - "hash": "sha256-2x1IpfD0BXDaPKwdBO4+t8Dw7dYLM7oQDlrXY57tFIw=", + "rev": "c23ff452476d1b6322d73b9b629420ef119d0388", + "hash": "sha256-ujiHFq8I6yENksWhBJ/BYMd5eDdlThfZxMfvDZH9sUo=", "recompress": true }, "src/third_party/clang-format/script": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", - "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=" + "rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e", + "hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc=" }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2", - "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ=" + "rev": "08611c39bbfc52cc034904eb88817c6209b828f9", + "hash": "sha256-AfVP7cm7eNGl0JPnMkixMFgloDTHh0KSOAwXDEcl5MU=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8", - "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=" + "rev": "8cd54f6b0741cdef08299711668e6b25fef26406", + "hash": "sha256-AJx0Oz1sNubo2JNPjeXO5f9SnoXewOsPlgFrRXiCEKg=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "864f61dc9253d56586ada34c388278565ef513f6", - "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=" + "rev": "a02fa0058d8d52aca049868d229808a3e5dadbad", + "hash": "sha256-iNV7NtVviRBDjt6mK/DK3WfYd/QNGejRaSvpgEXmLqY=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "322be580a5a193a921c349a15747eeeb9a716ad1", - "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=" + "rev": "b7c3dda13e46ced88a6f7230e271ebd633b4cef2", + "hash": "sha256-eWxGIMxMBRvQVJ6uc3ZWaKO7oXLLCXTi8sVR8v3H4MM=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55", - "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=" + "rev": "796bfb264a22264b11acda9feaffdffb168c7e12", + "hash": "sha256-J/FiUpmwkFVZcLmeXABl4FE9rzGFsbo/Lc1Rjy5wdOU=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -884,8 +884,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8", - "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo=" + "rev": "2acb551cf58ff3b6e6a093fe36deb8c625046900", + "hash": "sha256-HaNA1Es8t3A/WR9aXdEoFOdeNO6c6ydPDF1CCBb0Bu4=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -894,8 +894,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c", - "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs=" + "rev": "42cbfedd76691c19af012a3d717fca07d7b09cc9", + "hash": "sha256-ik5NjHWC8LHJiOde7Jdqq2C/NOofQwtPT4ubAqc8D4A=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -904,8 +904,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "7b27cb13556246035dfc7b308702b1b20710df47", - "hash": "sha256-PM7msE9678QFyr7qp47Bc0vTntsSCeB/cirg9ME6TZk=" + "rev": "9b75aecb1fa769e357d1dad2614228b6a04ddee6", + "hash": "sha256-d375qLKzOX3fap5ZjbhPzU/8hWAB9GeT6IWrw3Vedsc=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -919,8 +919,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "c67cffddd65aba724950e062343fa1cc89560b33", - "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg=" + "rev": "53f6cec6c0a81fc4e712cd3ec87a1a39b802f5d5", + "hash": "sha256-KC9sHWRrPI5R10z5Epq3e7BW7+Ez0AoYe+bKPYL58jg=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -929,8 +929,8 @@ }, "src/third_party/readability/src": { "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git", - "rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197", - "hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0=" + "rev": "d7949dc47dd9ed9ee1d3b34ffdcf3bce28cde435", + "hash": "sha256-lFsHXk4kEkzIbHgJiLTgeiKqiGOErzUwADo8WSZlnec=" }, "src/third_party/content_analysis_sdk/src": { "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", @@ -939,13 +939,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d", - "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=" + "rev": "fcbc3d1b93f91c709293ed9faea8b7cbcac9030b", + "hash": "sha256-Lux+OGbeWnQJhIYDczH6jP/+lO+ZLlwpuUcLbO4Jvuo=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831", - "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M=" + "rev": "e1ce227ebf75378c5f60a9d531579982bcdd93ee", + "hash": "sha256-RqGCh/InZagPemqMRnR/ziaxDm3ruS4dtnj87mBmIjc=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -954,8 +954,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a", - "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo=" + "rev": "c522461221759f1785b3434ce52ae89d6b66855a", + "hash": "sha256-UqgsxtEdvGs3fOueXJU6DJcESmgkEGAjdnMig78qKzE=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -974,13 +974,13 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "18f1cc77dea7254258eeee21839d1c249b506576", - "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs=" + "rev": "95042527d1555325b90dbb745a29d32eb9fad14a", + "hash": "sha256-Ofi/XfzyQrt2gUHaJpOyUUD7DXTWWmvXXJQP7C6AN8w=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", - "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53", - "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis=" + "rev": "ca7071cd5dd8a67cb8ca4f8614fd006ff3d93bde", + "hash": "sha256-ucRkEY1bZ3WyK55FW0pujl9LWFENmEzZvxO2QKYXmhc=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -999,13 +999,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e", - "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270=" + "rev": "58da9b0d721fd807279f4e3898741c92cf43bdbd", + "hash": "sha256-uvsW0p3wo7L1tQqelRk5QJ65Jt5cpv6ORZRorZjHqrw=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "a1220f673dc44632e821bd1a217089e5a159a203", - "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=" + "rev": "d0b41ca2a38c7b14c4b7853254eb5bf3b4039691", + "hash": "sha256-CQ1doQRsX0zvfgYKJalz0i35mPJfk5o6m2sdGYqS4co=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -1014,8 +1014,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a", - "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=" + "rev": "ddb5845c3f7d88d8698e602547bd854b36f0604f", + "hash": "sha256-N+h99EL03NL6sAGJJM/aZEdVibn7SziLJp5G09y0EOc=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -1049,13 +1049,13 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9", - "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU=" + "rev": "2c31c25519405d3d2b107844fd5e8c8bc397dbf7", + "hash": "sha256-Ew7gk1XxZccztYLZc4sOrzyKjNTkFPG8g+oOLy4/g1Q=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c", - "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI=" + "rev": "e4937b062fe8b9130ea0fc02c406c045b5cb7b31", + "hash": "sha256-C//wuupFwZL4m8mMutY/SxCmg7mcfw2Sj5eS4c95+XE=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", @@ -1064,13 +1064,13 @@ }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5", - "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=" + "rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984", + "hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17", - "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=" + "rev": "4190a105897e986349694cae685b51054bf2dc51", + "hash": "sha256-K+bg3OPmv7tN/elOtmlDXwyhC6FxrAEEAY/MqMkQbrU=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1084,8 +1084,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3", - "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=" + "rev": "cd4f989f8f9288ab5aed1643ecb04c7be021021e", + "hash": "sha256-qkdtS4kz8m5ZW30SQpDCbgM3WvfCGc+WGsv59J4FYpQ=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1114,8 +1114,8 @@ }, "src/third_party/flatbuffers/src": { "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e", - "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=" + "rev": "187240970746d00bbd26b0f5873ed54d2477f9f3", + "hash": "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw=" }, "src/third_party/fontconfig/src": { "url": "https://chromium.googlesource.com/external/fontconfig.git", @@ -1134,8 +1134,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "d3668e00da732654b50e4e81f982544ed6e26390", - "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=" + "rev": "ae63cc0d13318f2f93fd440cce277388d1b30a49", + "hash": "sha256-Tx5MbwMk+d2OZGd4CxJhJtP1pQyRJ0pe358OdKuWiRU=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -1149,13 +1149,13 @@ }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b", - "hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA=" + "rev": "f70052a0bbae22fe52b630844e9651b27db92ed2", + "hash": "sha256-Mvxbdn4m/H3HBss31Z9nz0LphqpFeBHcX/kbFxJQPqM=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", - "rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c", - "hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY=" + "rev": "2cd45e8683025c28fa2efcf672ad46607e8af869", + "hash": "sha256-h/xI/TPV2yiRLqrBgaDAkr8Nfg3RLkjHVuYX+nH99CQ=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", @@ -1184,8 +1184,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8", - "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=" + "rev": "b2b9072ecbe874f5937054653ef8f2731eb0f010", + "hash": "sha256-cTPx19WAXlyXDK4nY0pxbMI4oRojaARgIeASA+MB3NY=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -1194,8 +1194,8 @@ }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8", - "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=" + "rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd", + "hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=" }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", @@ -1214,8 +1214,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a", - "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=" + "rev": "7940ee9a7ebce6419c6391eef8b289524b16f198", + "hash": "sha256-uIb2nzPzMU/FZGYs3cFQwc4QNTNRmz01uF6XDCLrgDk=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1229,8 +1229,8 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f", - "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU=" + "rev": "93233d27eb23ac3f1f13da1b19c5380bacc75baa", + "hash": "sha256-wDW+YXxIaenDtqf3zdpMT2hbwEMEswC88+Q2ylfzHw0=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", @@ -1249,8 +1249,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6", - "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0=" + "rev": "0debbb0b94486d4c78162ad5a102279b96dc79d3", + "hash": "sha256-w1oBQrjYK8ze02MRNPO8PsV5rNHiLzToCQjoSm+NagI=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -1259,8 +1259,8 @@ }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "06449bdc34789a7459393405dd777e02d78a3743", - "hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY=" + "rev": "d90b6fde07041d9d19ab71de32b461b613c899a1", + "hash": "sha256-/S8YBNfxbQe6Wt0h2Otuw7+bkObBtvmtb6ZO6nsce6E=" }, "src/third_party/speedometer/v3.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", @@ -1304,8 +1304,8 @@ }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=" + "rev": "4be5f77f672a3a9f1bbf3c935fb0ea8b3f86ce61", + "hash": "sha256-GzLVt6RIN+FgOpcK61ya5lvdIIhQRciAb/ISIirWogY=" }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", @@ -1334,8 +1334,8 @@ }, "src/third_party/libsync/src": { "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=" + "rev": "d29ac04dc81e6b072c091c5b1342a282765ea250", + "hash": "sha256-aI7Exie3AmTy8R/Ua5lua0lCwMO1k4wMS6cxulU6iD8=" }, "src/third_party/libva-fake-driver/src": { "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git", @@ -1344,8 +1344,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c", - "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=" + "rev": "4c1801be20dd53900d2a7cd74f6fc91a9ae353be", + "hash": "sha256-8k8KWkDS3kvJjHWVlOlTW/By7rQLiT7TrOtxwEOCXgk=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1354,18 +1354,18 @@ }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6", - "hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg=" + "rev": "c00d83f6642e7838a12bb03bca94237f03cc2e00", + "hash": "sha256-a7F97BEnwpdx9W8OsVnz+NfIYW+J1XVDSi38KsIZIfI=" }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "94417b9d213364905ce849c25719b819b8dbbaaa", - "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY=" + "rev": "900da61d3cadba86ec593c8226de736b5e6b2c43", + "hash": "sha256-vqPiv1HJe883aDOjzLBNXGA/b/F/frcW3Iml3ZUyHlY=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0", - "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=" + "rev": "29164a80da4d41134950d76d55199ea33fbb9613", + "hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo=" }, "src/third_party/material_color_utilities/src": { "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", @@ -1394,8 +1394,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a", - "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA=" + "rev": "279b21edd27132609d2f46b702c42455ea05c4a8", + "hash": "sha256-BxS1VaDK6ZwS7tXjimeBPNqdPKsIOosH29cL6EmWEM4=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1409,13 +1409,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23", - "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk=" + "rev": "f5c376f93d33709ecd6b0dc8147b14a651ddbfeb", + "hash": "sha256-Rfpdow3S3HTHVEEAmCyiKU7XfuUoxvtHeWV+wfarvF8=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "d5bbee7afdf259af4212929ccbff467dd5349953", - "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=" + "rev": "ac7792a0f3f1cbfffb071e8b97cd9a5168900e03", + "hash": "sha256-9vpds/Xgw65uW5TG0kenqFVEh/NM1V3OpRdkGd0pMk4=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1424,8 +1424,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119", - "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=" + "rev": "0e6ca13779b57d397a5ba6bfdcaa8a275bc8ea2e", + "hash": "sha256-FPUKjWARY4TdUq7ni48tnszEdmVYxPXIgtddPBHn/U0=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -1434,8 +1434,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad", - "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=" + "rev": "e5c4ef17d934e078644e65d667ca6d86fe020d49", + "hash": "sha256-LFZ5qFQoyBKta05wJUtJh3oIvaBYlzOozFpDulrQ/no=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -1444,8 +1444,8 @@ }, "src/third_party/re2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693", - "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ=" + "rev": "61c4644171ee6b480540bf9e569cba06d9090b4b", + "hash": "sha256-fRnjrP6Bz33eW+bOta5v3k9gqgN+gBvRH+t1i7b+eXA=" }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", @@ -1459,8 +1459,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe", - "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64=" + "rev": "da51f0d60ea2b14e845a823dc11b405dbeef42d8", + "hash": "sha256-thUbelru/6nPF7haXJtW6ncT6sIQzYqi0BCAJ+BWNY0=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1479,8 +1479,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20", - "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk=" + "rev": "3d536c0fc62b1cdea0f78c3c38d79be559855b88", + "hash": "sha256-mlKoTdZgqfMzKGB7dUaETCd6NIQm5dne59w09/0bnGE=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1489,18 +1489,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f", - "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=" + "rev": "5fcf510a862fb6d3c0d34906044389095a180ff6", + "hash": "sha256-iXt3IutfZxiH9j7/mnx+YeZwak44+nhNo2rbDxtgKTg=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3", - "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E=" + "rev": "224a52b06d0e019c7f7c006c2306de095207f77f", + "hash": "sha256-/RkiBLiXo7Z+FUIjHIrvvcU8Mg6vX9vJUn8Cz1fI2OE=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a", - "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=" + "rev": "36b4d078576ad465e85b4b0502695ac5f3edb2e6", + "hash": "sha256-A2D6fSfHpeXsYnXZs9l7DRE4ELUHbNQxr7HaokFByDQ=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1509,38 +1509,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd", - "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=" + "rev": "6bb105b6c4b3a246e1e6bb96366fe14c6dbfde83", + "hash": "sha256-rgLhWf3U7gMjB+mpwq4EgQdRS6yP2/Q71Ns42ZDu7cc=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a", - "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc=" + "rev": "05b0ab1253db43c3ea29efd593f3f13dfa621ab1", + "hash": "sha256-OmvvBOBacp8ZgY+tcV1a7OmdGL607rrH89bu9uLj1L4=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2", - "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=" + "rev": "df274657d83f3bd8c77aef816c1cbf27352a948b", + "hash": "sha256-/YXVD60zaSRgqkAFGZs0D0T2LoXRgMnYcO/RkQznW+I=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78", - "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y=" + "rev": "e1cad037970cfeeb86051c49d00ead75311acbec", + "hash": "sha256-/xnxL+S6Z04FLHLv1V/YBcDu4fzhXvAqfHgS5cgeVhg=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b", - "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU=" + "rev": "7f6326618226225269a274869ac638b870c8fe2b", + "hash": "sha256-hInSJsfPuI7U74rEqFQf6De1QoBkFjAnGLFE91uyJ5s=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7", - "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=" + "rev": "ea43e2f5e51e9ad958a40fdce981f2f0abf09cb5", + "hash": "sha256-7SYRTJLLkC1OXDZ/llNRpVKhQeNak2IFxrHNJKRfrLk=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "83d96b88de7b85c3f29545170857e54e348421b2", - "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M=" + "rev": "0cb2d651931455e44aa898585d7d78a9d90d31c5", + "hash": "sha256-IxxvrY90d/NJWRNcvMIaUjg2o7LZEHi2gmOe+eyJmHI=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -1549,8 +1549,8 @@ }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", - "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=" + "rev": "736d12ac67c20c60dc406dc49bb06be878501f86", + "hash": "sha256-5iG0HaPXJCEo027TuyXlJQNGluTaAPlvwQDFbiYOEJQ=" }, "src/third_party/wayland-protocols/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", @@ -1579,18 +1579,18 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366", - "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A=" + "rev": "eefe6f33964beec1bd1534b1d9065ad027b71740", + "hash": "sha256-g+zg7SpK/BztfgT+y45Ygb9+7izQpkgAM3vRX5iKkbU=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8", - "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw=" + "rev": "ab0ca8075f0cc5d40fed25e08ddabb144c29fc08", + "hash": "sha256-hZ2TH5AsPPqxxShDTG1hhgpZWqXccD7TsoPfXcdhIUg=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8", - "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w=" + "rev": "a5751574a386ba0ba80b8c62201977f6aab6c225", + "hash": "sha256-amrKVRN2QsjeDbxkKu0yjAs06U094MHj4ccSJHoVgPE=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1609,8 +1609,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158", - "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=" + "rev": "98a027498845d3e2acd0e983fff6950714edbfc2", + "hash": "sha256-MwzgJN/QE3pLI+5UZNz2oepBibQq5j4CKLDQ1jFyi2w=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", @@ -1619,8 +1619,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "baea8d627b70725fb777ebc1074f8ec4110ef6cb", - "hash": "sha256-jECAfgeAgdkhbI/8BgT9TakR9Ylha2zPznjZzibPQbE=" + "rev": "beee9f5cafde91bbd086077a11db16cb9768e62a", + "hash": "sha256-q1gVbNGls2izSDb3KZmteZQvcc6M0JyPuZFPfG4FIAs=" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 295b0d2126dc..840fbc5d3f85 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 = "145.0.2"; + version = "146.0"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ach/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ach/firefox-146.0.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bcdf4bce5ab22275fceb198e682570e04e1da79d7d77dd708b1757aa9780dfac"; + sha256 = "6ce80d8054a595fbda6defec2fafe3a54a321c4a21241df49ee2ee759f14e153"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/af/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/af/firefox-146.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ac994602aeb00646469b6f62b9713094ef505c36b47be09bc40fa88d17080260"; + sha256 = "aeee2aa306f950d4896d47609deef14d0e5ed1b7af578e345d1c0330bc6a130a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/an/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/an/firefox-146.0.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "92a223e481d46527ed2d941a2a70d3e73f3f1d9519f378afa73e42c44744a2fc"; + sha256 = "872e874ebf8cfd31fdb5fddf41517d6e7aa718a4aaeca30357073fc5853ded58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ar/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ar/firefox-146.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f1add5520ad25c5defe15fb6aeb95936fb289431d5151bf0c1498dee5a1e7aca"; + sha256 = "cf78a6c2e0c0c2b02f9fdeeb97ad72ff72025b4ced516e1c7f4393eab0c9a343"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ast/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ast/firefox-146.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "9de636aae37109934672d8bc5b5ee5e37cb814a7185681b466d66df96d322b5c"; + sha256 = "8a3ec685a9eacfe98fa38e8fc925649b7f62b94afd72ee98607689c2e52b176a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/az/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/az/firefox-146.0.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "17993033971dac42afd48a9dfdd58fe93178a2d7ba63575ded2ffd06e98aa2e4"; + sha256 = "00198d8a6cf2cda090bf473fcea8c13d22fd4d97b2265634fbe2366ab4864f6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/be/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/be/firefox-146.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "42631e9fbef85f8dc45c4fb907a1f319321bd5f75e86b609692d52fdb4122c9f"; + sha256 = "45134025870be5b1b91477a8863df242f567ecb72263b6fb5a923db20a93dc7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/bg/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/bg/firefox-146.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c484802c5af568ca73186cb1e9cf70f82ec3b6a13f98530e0ba563cb1c755d66"; + sha256 = "3361f061baa81e6ee7edc6d6e13cf5b209c3bb42e63955d643bc4833a4521e3e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/bn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/bn/firefox-146.0.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3b5327a95fe1cd65366991c0dcaba1d7ac2d323878ea8f5b00e59f83364cf78a"; + sha256 = "daed55c5bc1e6bcf94f932fd5a06bf0aa192f132c2a286826188d9b33173231b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/br/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/br/firefox-146.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ceca88d14e1e33f59de9bf305e738ed7a50dbc7d7d0cea6cc2f0f44015d1088b"; + sha256 = "b058ebf8861ad531f8cdb67e7485838e6871fe7c915ed3723a654183857fd7fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/bs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/bs/firefox-146.0.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c07865903553a40d45489ad7497fbe1022700675054c7fdb4c9d9919609491b7"; + sha256 = "fecafc11029b9c833d9ab33d3711dbdd7987053fb67fbba84a46d4fac2334296"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ca-valencia/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ca-valencia/firefox-146.0.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "121283b79f65381e2374a1e0bf5ce7d273529c0e5a1235cd971a290d7153614a"; + sha256 = "1bcff66cbbadb15664cb5724674eb5d1129abee833fbef480c239aa9434bdc20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ca/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ca/firefox-146.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b8cdf23059b03d2b7f4a152cae7a6fc711fd072c417557d088c9f7074fe8ce10"; + sha256 = "1a84e191c69028696ee1294ebe7ec6cdf4cdb12bef1695ae55df11b654e90d95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/cak/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/cak/firefox-146.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1f7606a5b34861e3e93b1fdf267b5ccc9e84c9fb938dfc236eec77f0212230dc"; + sha256 = "04a8137a5155de41c32b8c703b53e6da4f54b8a5dd3ad4ffe6b81cba144a142d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/cs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/cs/firefox-146.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bcc3afe1e2f3ba9dbe58c073ce24be06f2ed90471a84399339e505b12274cd53"; + sha256 = "ab7d20ce50ff8a7d77ffc72d3d04c05fcbc7c971e9ecb2b56a8a735c508f060f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/cy/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/cy/firefox-146.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c6f2fa65a2881638d65dbb580093b05bc18567aa6fb49d0c26522fc59db59a7d"; + sha256 = "9dd3df7ac68b3c0051f4e7493ea9b46414dd312969bc4f5fda5e9fb6d56c142e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/da/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/da/firefox-146.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f181890266b6a7ad5704d0f6cd822804dbe058abe88fc0b23b1e0d2bc804cf1b"; + sha256 = "837b8e5f8c4940f8eec0b702ac3460f6ea465a5bc31664fedee5d29c96e5fa91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/de/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/de/firefox-146.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "039357bdfe7e79fc9c500277310a2b9b0142c2c42ddbc420d4e7363cdb28d032"; + sha256 = "65abf0182b4bad4f406f836289e8e3bba15df23bebdfca3bb8a8e099dc51fddb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/dsb/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/dsb/firefox-146.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "459eea7d6db04b76f2784cf4c4bc60ff7b7c5ca645b8d925560b314c40f6dac9"; + sha256 = "2502c41d1359e84fae78853b9610ce6cc455977ece011695d0b3d945539ffbf4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/el/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/el/firefox-146.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7ec56bbf4ea0785a2c2db719a0ecba9c043742dd3c0b46764b727f2dc4d6dd68"; + sha256 = "243f9c6e7bd6eb3fccb88dc643ca086775eaaa286974ef2d089997d4cfdcce28"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/en-CA/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/en-CA/firefox-146.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1cf2fbb5fec593ef01aeef1eaf4f05af53c919a8c2f4d7078e3591386bef2c3e"; + sha256 = "89c65898949bd5782581337abb28bcefe4375970bc893cde60da1163ca390005"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/en-GB/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/en-GB/firefox-146.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "15e7ea5e76a2d9d994b27fa4b23e44844d6275717e05ed2a3433907fc333d0d5"; + sha256 = "0d6de17751dd94efe9e4906af60c8c9fbf8fb6bc244d87b102c44cc26c877073"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/en-US/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/en-US/firefox-146.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "dcc1fa58269877e45c5212dfc4b32ed4df0f30a52a12f13df9f0194c95cfd48b"; + sha256 = "8d56f479cc398a537a60a3fa20dca92d8a41925113d3a67f534881a4e4d7e344"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/eo/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/eo/firefox-146.0.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d9cf1288312181c5f86b7d0a3922090a907a91f4eb9eda5f3503c76a065068b9"; + sha256 = "b9fba11f6b754127573a208591d80d98626ea9acf148efa29003438c00b6d8e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/es-AR/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/es-AR/firefox-146.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "208ea1701c33685380ab642adc5cc188274765e74075c0520786ae2524108325"; + sha256 = "a172c07d1010d35c28f8a39e279c72b790a9b44c88f7d3c2658d0584b16230dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/es-CL/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/es-CL/firefox-146.0.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "98a5784862f641a280be401463f66ca6cdc3acfd95c4e5223bf52f47b2825674"; + sha256 = "2e161670dc623eacc6769ffe371d0a45280b05bdb2410301ce0827bbd1c5064b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/es-ES/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/es-ES/firefox-146.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ce494fad94949272d72162ae35653af6f83a85b9b3c36c49e44d824e0ee6b0e5"; + sha256 = "57520fd223e547b8ac85b192c42f0c2bb7b2e33afd6664527801ad072470f810"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/es-MX/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/es-MX/firefox-146.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8f259806d79184d50c736c075cbad743eaaaa64e423c14fa2c6d22c051d9e7c8"; + sha256 = "061ec28dad33441b7579a39a9b295f692051e849222264b34d221eccef1a5a43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/et/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/et/firefox-146.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "02707aaed78d52b284a853c2b8b885e996a6e2008618c6e53ca6918e2af1bcfe"; + sha256 = "b54aae10c66fcdbfaaf301da5b8c3aaee361f26cae757721583120a34500e4aa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/eu/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/eu/firefox-146.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "825be72def188478e9668944ae258e178376ea208f62f78b436505289d7759cf"; + sha256 = "b0365f5ab555ec9a02fc2b504d9fec09a0f98cf25c74fee4ff94b533180915af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/fa/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/fa/firefox-146.0.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d8a2df8288eb2e5ce172728bf34b447a5c887e22d6b503272da384d641bb0dbb"; + sha256 = "bb575b3e06bb073e7132e3fb4aeedf1521eabd951111ce136412bf600b0bdb15"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ff/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ff/firefox-146.0.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "35d433403cbac7e339904ad8a75392ca06a3dacdf653271d59f567083f82e714"; + sha256 = "3a47808175eda5e515f72bf9f4b71fddcfaa56ad736f2c32c29c7a4c102bfda3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/fi/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/fi/firefox-146.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9371ceb21df0998e6ea67d70d0d0bd28851478ff081f60e618902decb562568d"; + sha256 = "38a943080ad5e66d2554c869c802ce21fe267c1e5db87e7db2c8261d3c6267ac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/fr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/fr/firefox-146.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6661a058cdd22eaa10d5ed116f9bb773720c70c355456ef01c5abc47bd72dec1"; + sha256 = "4fea5c7aad8a34dfc3f9e3f368888795226f3030c7e9b792dd38a8a8059ef70f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/fur/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/fur/firefox-146.0.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "6472e2a7a0812fb9fa2af64176208cc523383e8afcd44df9a7ba4f61e8af8aea"; + sha256 = "a0dc848dbd763bdd9bb83b03a33384cddbf5c5b3c827f7096122537da5c96818"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/fy-NL/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/fy-NL/firefox-146.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "182eef248c5417a1adaae36ed3d695e07ec95b46b5a5a1b910178b34e2efa5f3"; + sha256 = "f185cdaa52ec6aba50d08886fcf8fad827dee7bdd2e821c27a816e6b3325ff1a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ga-IE/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ga-IE/firefox-146.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2e75ac6a7a3e9f6ca3f0d9b088b5f61d9ad029afc68ef88ddb62e3be11b09632"; + sha256 = "e905ffffe49b28b4ef54b96912a27e1538c403c43c636cd36b71ad4f7cd02be3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/gd/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/gd/firefox-146.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a3b6fb1f8695e75fe4b8e91c3e826016c3b122ec32b09ac257656944a83c84b5"; + sha256 = "f1f32c5f5a4488515697328d5fc812b21697fafcd9bac62b12c3cee9fe4c60f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/gl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/gl/firefox-146.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c1a4507ecacc78d7d196a5a2c81fbd31fe27a6acf0c7a1185c6a5cc5c16a82c3"; + sha256 = "31a704b2f5ca3214c044734442910dd41b523c613bb40e1247c9379d392e1ac6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/gn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/gn/firefox-146.0.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "02b60834d8f5e16022037227ca7d9ba80963e15d777b58ced615a59512d7753b"; + sha256 = "803a4fe0297f7ca3063e917a0459977241b46520bbb7a1775d9558aff8a75b42"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/gu-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/gu-IN/firefox-146.0.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3737c9a8493f77e7f465b70bc77a244912eba952962a61e0ac281aad83119920"; + sha256 = "7de7cadae73fa6cc3fdef8ca5528631f8552b563d7461e396524753412fd4814"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/he/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/he/firefox-146.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e67366e6f508b5f943a02bf6b10328a99e2ab394c41aec4e7f7c6a54053a1a6d"; + sha256 = "d584a94a2d947735d113f283668e0886b03c9f6bcccee5c000158281d44d3745"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/hi-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/hi-IN/firefox-146.0.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d7279c582a8e93250a0ec98c5903e50b89c8dd2f5771fd8083b84ca04de0e73c"; + sha256 = "267e67a3c0913b8c8e8f0b20622d54e55f7bea33289850f8b14d8e94ff82cced"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/hr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/hr/firefox-146.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b633445a92446adb8b7624ae128aae5600fd329a39607445f3bf09205f10e31b"; + sha256 = "9a26014e72c654da71c411e8e785f1b1198d34e6e04acb8e527d340bb325e46c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/hsb/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/hsb/firefox-146.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "bcadebf03c63a5d234e488e6355c3bb53cdfad4383f3ac6dc532d8defbada6dc"; + sha256 = "61c0ca66a7dc646bc5d60925ccf6aaea2c97d079da05631a258b0f5ed48fdbe2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/hu/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/hu/firefox-146.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d2ec531e399b2edd8ab5413df28f6a6a2b576d07e470186c3fcc751468b88483"; + sha256 = "a4454d1ee44b543ad9fc72074ab81499e8ae31a62337ebc53b5d743d43def326"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/hy-AM/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/hy-AM/firefox-146.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "780c4b94b4098027547be61299c8872ef77d2665aa8f94731975ec0f4845d1f5"; + sha256 = "0b37f3cdb38d7aabab3ac6f193d29308f441c6d215fc74268d80d676b1327026"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ia/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ia/firefox-146.0.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9125266ac87c7d60837943029a72df61e5c267474d48efce3d44af2a31ddf2bc"; + sha256 = "778ac42f2ba9087f44641c83ad6391c0b54ee2746fba001b7eabba29aa94f317"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/id/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/id/firefox-146.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1e14cb705a8f03d9efcd4d49ed7a00be1ee32409335d31caae34615df70f5f3c"; + sha256 = "dd6fa38d876639d86344ddfc44c033a4d88ef157b1b7e210407bc5aa7f0d6317"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/is/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/is/firefox-146.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "42b535e09e367c047f99789f12bc293e6914699d4f71ec9d06dda093a05b3f20"; + sha256 = "c618237af50f98b032d80563e66ffc1a9369e2c86ebfab3edb9657209ba8a5f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/it/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/it/firefox-146.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "52f0a09beaf1bc3908ca19108a155b653d8dfaaacc26bcce88d401108b680223"; + sha256 = "73f7938759c7bfbb19fba5dcada759e29a1099931104ee20431c4c1cc574bce1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ja/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ja/firefox-146.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "adf50623225b98e813c3ec0e0b033154249606c0e554b828015fa617465e365c"; + sha256 = "eaa79e307e40644da128deb4ee29e6bb6e72e999cc501652da11cf93e8109aef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ka/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ka/firefox-146.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0b50dc06526149257df8b781f15a2cfd3c49aded9a0fa37a35addefa93a0b9ed"; + sha256 = "615511cb799b48ad656f70c00368ee24d7472af700cc4247fedfd66678eb7c3b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/kab/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/kab/firefox-146.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d58ead88c5cc34c8e6a16b33b678ce8956c443bc668171e932015245f5f45d1b"; + sha256 = "ed2a936e8c7fe8b71af1ece3ffd70ebd39a01304db1a2c328bb1e70b1a512bd9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/kk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/kk/firefox-146.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cc9f65ff6ce36d6ca72cc5901ef03ad45c4b0f44b52e5a6251e0a7a83f80d340"; + sha256 = "4c68ece51d512bc7edd1d448f9b8e0c4467047f4a589a769d61751370cf250d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/km/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/km/firefox-146.0.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "b8e0627e4ae513fa50bf4df9f4d742e1b48aebe19218012d5a441dae3fbbb86e"; + sha256 = "bf6d739777a473ca3c2cb1224e20d3e37635efb178e654220de067c524671d54"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/kn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/kn/firefox-146.0.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "0d1a097beb7c6d73cebc6b787bf5ccef509300e033d00fc7499612a5f95f8185"; + sha256 = "64d9035268155f17d1d39df343568a963286b903676f719dd4e78652762ece65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ko/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ko/firefox-146.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e9b704e198866c710528ed8aa3fe1cdd7b9eb46cef06244a3c3ed5876058cffa"; + sha256 = "56c02a734f2b66d695b3011131f8ad0e479c133ad154db095b070dd32cb06fcd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/lij/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/lij/firefox-146.0.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4afc9e59bacfccdbbc27849ca9500d2572120b44427a3c9de01f3ed97603d542"; + sha256 = "6fdcbc8f93f761a0ebcb16638af0de59ed678914da566e93700f6b038141ed9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/lt/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/lt/firefox-146.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "29fd7a375139ffd081656fac6a3876f3507793a9cb7476c418c7166259e75c53"; + sha256 = "86711674be61f1d61ab9fb5c2b4dbf32308f79d6f666ed345f29b0b551306fc3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/lv/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/lv/firefox-146.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9079bd91e3cd742c03832fad8e709a62d61f1e281bbf842a4d0221a49d174ee8"; + sha256 = "5242e4667407474e61afe95b887af4d53cb3a2983959d842e577f3db737bcd0f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/mk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/mk/firefox-146.0.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "78a7cf4e4edf8c31a696289a90c41a0821e5cfb5e57b8d25f412ce8c1fd5e5af"; + sha256 = "c597b8b3d3cf5aa5ce8e2ffeccc8b596dfd7f274823fb936dd49c78a03020896"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/mr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/mr/firefox-146.0.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9bdd54a114696b523e0b62b8939105c729ca6f8037d5de8587dae06a7859fc17"; + sha256 = "4b6bd5e7b7416e43a9e7f8ed8f5585dca64cd281a450dc8116f6a1fa2a05bcec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ms/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ms/firefox-146.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ca0183536470770f2c0029d1c346741b19a605ea5cf0a1d4ff42b06a7a4d202a"; + sha256 = "99325489077386a7b896162e04929052e594f9f9e6cd55b7d71e143b05d4f51b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/my/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/my/firefox-146.0.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "214085120e8cd651c7d15e49533c482d013286398ff8b00b4e3d080f22825907"; + sha256 = "5150ed0d890560e7e8ad395ac6aa446b9fa518b9c85257b12294eea6f67b3bff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/nb-NO/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/nb-NO/firefox-146.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "32bf375569211a21da1bff50ac6831e87ee8dfe2e50673db38b21c4697af5cb9"; + sha256 = "d95306f17c95aca752de800618d1574afd465645ecf5333088bbe40a5da8c89d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ne-NP/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ne-NP/firefox-146.0.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f093991110e91f66c1f64968957ad528e1c34e2b6e92eb3c85ebdf99beb97dd0"; + sha256 = "65909b6a66b4717ccfd0b17c7bc71210b327d4368dde03c5ec851526623dc9ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/nl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/nl/firefox-146.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a6f1c8b508237b7b43df49344a6cdf237b7c21e4ce363bb2452fc689fc8fc6e0"; + sha256 = "4b5efb142d5ec61efab9088e015766d3751de9b9699fefd018cc2a06689734f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/nn-NO/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/nn-NO/firefox-146.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "7feb441227887151eb41e9d4ef284add35f76b319565bd3c89dfcdbe764303ca"; + sha256 = "fb496ec61484ced6c54713d7cd2de897bb94c386fa973e645b2580a8524cdd8e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/oc/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/oc/firefox-146.0.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "f702e8d10b2d95fd983317ba2b325a0a0ce8c1490f9314763fd101e2f93d340e"; + sha256 = "b3cf507b3c1f9a720e7121f44ec17d9a1d6ecc7e4229120980ba887b100d2992"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/pa-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/pa-IN/firefox-146.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "55a1d242b97f4f74da3e2dc4266010750048fb69934abd45d56324ae7983f081"; + sha256 = "4bd5da65c941ce4bd38d96c33a0da780a58ecedae50f2ca9161b659360684d81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/pl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/pl/firefox-146.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5c269ade2ca3bd9d6af7c64e44dc6b18c03fa8846ae768729e46d6a3fe498e23"; + sha256 = "31a54eb0e170ecdbb70cbe9920dde9a93fc6746a73ee95a20e79add381d34fb7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/pt-BR/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/pt-BR/firefox-146.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e35c2458f09ba5f6a924e70e52cf4827f83c15db395bb2c9104c381f3c107a99"; + sha256 = "92ce273db9d77598582a0f480a9d885cd00f08acd077cb8c9366b46ac15156b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/pt-PT/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/pt-PT/firefox-146.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "12294543d4bd17c873f9a28a2117fe0164acecac8119b592674afe233f0dd859"; + sha256 = "d93d193bf0008f4e234b00439c004e9be6cbb6340f6f4328c1ca61ced0577066"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/rm/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/rm/firefox-146.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b943bf4d800a1ac01a3a26fd2394565788fdce6638f9afa206a2099893aa4e5f"; + sha256 = "88721d54083810cfa8b515b43a5be0bd33f07466cda53c654066050e00bf8a3e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ro/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ro/firefox-146.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f411813a5c8a3a4c5c083e0915c8a7cd6284adc258cdb3f334880c7f26421241"; + sha256 = "3f5c532236e9786e40bb6a68e231b9537d7114c279d081f715f128396cb863c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ru/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ru/firefox-146.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2c25dc16141fd5ab7aae4d2e8ecbba60624848276e87414c11d2981f5fc5ecf1"; + sha256 = "5f1585ebf1cf856dd76d7b3a8437ea01e2cf4cc378fc1046429188a62d2130be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sat/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sat/firefox-146.0.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "5c64bddfee6000bbff5e76701dd458343dfcd4fdbc78fcd22c630d99723eaddd"; + sha256 = "104563022632e932a2142e0ebf71cb405b9d91d686d62c6517cdf9570741e9be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sc/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sc/firefox-146.0.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "1dd5f029815edc912fe9ba3f77c567a26f3b7c6ba2ad31ed8ea20046b73f1f40"; + sha256 = "7a895c61d0d2dc620a8aff146bd7cd7649911f83360e8dc5736c8f923c3af6c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sco/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sco/firefox-146.0.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bc1620efec6d74f9668d94ee135866228cf8f39d179395e56330d98de8f630cd"; + sha256 = "5895e92ef310a3f899de093a7b8c759db5f71a220bdf0481155f0bc29637669b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/si/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/si/firefox-146.0.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f7c17fa64e3263c6c91759ae62aab3bdd12c8e7eab709f6739664f8f77f301cd"; + sha256 = "b9a2f35c2f536d356e1c37da89d8820a6b9c0f0efd0c3ceda4badb9f86d7f743"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sk/firefox-146.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "051f53fb99642bce74b8f2d6b57bd15bc0080c7ad2fd65214903e5d7dfaccd9c"; + sha256 = "24b436c1e6375f9246968f615d8124d2b0656444f78108c53003a44413bbd3b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/skr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/skr/firefox-146.0.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "dbdfb230306547c045e97421bfd72fb6b51d1f0c2e4103ef0da660b8b3dabb49"; + sha256 = "e521b5d622d7dbd256efe3f64a1e3be8490701bf34afbf8b91152348d8e19cae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sl/firefox-146.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "67409832b07bbc5b8dba6d36d349d607c65ee4417f36e5d510088865e513eaff"; + sha256 = "2206d279b9153b5a4562e4da993965b91c2b4c9141e462a81c7b8cd2a9258328"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/son/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/son/firefox-146.0.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "710d692530d624d0791189a1be907b13f2bfe1b5b6325d0550de7f15f807039a"; + sha256 = "a38d79c06f7ea88f8cf10ef7db350d1f14f1449dfa81da136ff0ac67a3eece85"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sq/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sq/firefox-146.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "487de6e74ec430fc76a6ffde9a5ebe482ead7cbb5426c0b67682aeeda95a1f69"; + sha256 = "7c16cb5aacdf322ad3746dfb55e8e3297f04641c8d4c0695a72bf10bdecf0ecb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sr/firefox-146.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ad08c70f4f1c42d4c5792222a227da6b4c34d4f05f70be08b5631693255b654b"; + sha256 = "ffde3f622ffdbb2fd488d8582d1fe04f5621ec4079ec1f764bbd64981fb539df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/sv-SE/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/sv-SE/firefox-146.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1f0be90e52363648f872d285c3dfc70451d8884b0bdb551c60866a6ec49d6f9c"; + sha256 = "87ccecd4d8dc224f3f6c86e03f452c522b837fdba49a6229c27e22c20d304f00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/szl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/szl/firefox-146.0.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "cabddf9826d72438d0e549269ddb8cb1493b048d67a5f0ccd90548fa8c46c380"; + sha256 = "381cb360f2734f03322628a5937491b2dea58cba8d8a9423a1445ca4d316dc17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ta/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ta/firefox-146.0.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "899ffbaa94d548e4de8345f39be016fb8b6e6b7932fbc9ed91b1fa4479b0d0fc"; + sha256 = "1e58328ca2c81ef3ec5486d00dd27b6126a52f723cee40bb9cdc8e35f921c35a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/te/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/te/firefox-146.0.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "cc0252dfe015c3f736a3a7cdd05cf695f725229d29e2037be8d17f2c7c57ae1d"; + sha256 = "9007dd059f0e2624a652f3ffe88b7bc847050ae420c73fc152b4d98f664bf47e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/tg/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/tg/firefox-146.0.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "75d02bb68275cbc0637e89981a64dfd4ad27c61eb356e3a774e9c0706dc899d9"; + sha256 = "438f9212a6147ccbbc93595d2dadb0583586e3a757aef7d16fbc579731a24432"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/th/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/th/firefox-146.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5a1456b91e9499bc5622705f42b9440a36ce3d8c6ba61514b6b1bb623242937f"; + sha256 = "a360ce6d93e1c4e4242a980ce3b2c0de839f88530466a985a64e1614256c07fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/tl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/tl/firefox-146.0.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c8b40aa54ba16f90c37f8e576a4e0300dc501c07c9f77031509cd48b71251013"; + sha256 = "e146bb303062690147c68d1905fbe6d2a454b93abdee16f51b0232fd8201a197"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/tr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/tr/firefox-146.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1e287aaf41b118a28f93d5cb13216fe5e0e588ef6bdb424ea246712f93d1cd46"; + sha256 = "d546e78c4f7e51190dfd3d729dfb8f1d1cc8f2b73947c07a25ac5aa6f6e058cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/trs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/trs/firefox-146.0.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4ef293ce7f48fa489dfa93d630fb8919a6e98b1c7e343ba3d2c807fc85a75dd4"; + sha256 = "ae120cfa62a5b86ffe35ce2f51d35550d7c19a5f879cce24af4f0bb92297a1f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/uk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/uk/firefox-146.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fcf53c7eb8e0403606fae345d05b290eb5eb20da9c46bb980f1e47f52a92c995"; + sha256 = "8d58b21aee8e655ff62d38e8bbf804fc5559aa18c32eca799b7bf8ae27a96dfe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/ur/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/ur/firefox-146.0.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6498cff8e694a6b30b61431da2446b9bab062e68f8e001376434cd03037d6bb0"; + sha256 = "501967de6489018f7fb62525e7929e1096fba16217237008481a0a197545e54d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/uz/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/uz/firefox-146.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5cb6ce36f0a53ff5bd5848822ab16bbc7eb4f1f3c51b43bee6bbe1b44fe29bc7"; + sha256 = "f6813a390d79a1acd7407e69d572b21ad05a83b47869f35375daf9916638fb7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/vi/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/vi/firefox-146.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d3e6f8a3f4feae9031dec1b3ac6477bd9ee380ce92dfb0861183f752279496f9"; + sha256 = "a747257a140a9ef2ff672966faa2133907c99b40a4ff5db1249b4c5a9b4ba3fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/xh/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/xh/firefox-146.0.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4f58e0055d57081fb63aeb89673fa1213c38d587bce8b820c06e265425283e88"; + sha256 = "b29aa5bca277cd6b9938d0e62579bfe721e68a43e93e8cd0ea821f2ad2338c5a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/zh-CN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/zh-CN/firefox-146.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "da1bfe36e1f8cf20e817047fc19d1f2b24dfbdb8cefe17c9bfedadae110234cf"; + sha256 = "1c6a3d5a01993e5126eb744adc88df2b8ce4aa05e7ac1a75dcff2e197044ba74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-x86_64/zh-TW/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-x86_64/zh-TW/firefox-146.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8914692753389b2f3ee4b6ba1262c596fd43f503b4530ead9c40d5627fe7c34f"; + sha256 = "286e71882aebd9f1b612c3939395334f4b6394d4c5c97007838363919c8d9312"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ach/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ach/firefox-146.0.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "e4e7dc97cddafcb9cac4e99e065ed85194caa7263cfd6c0f8af35f63c4f614fd"; + sha256 = "4b8e14779da3ec67ccabe285efc4815867068c1e67b1c49f946d0c61ee6a6453"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/af/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/af/firefox-146.0.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "1acfaa032289b8f8967cb0194a3d688db885e4e9f8be61cf06923ea0c48ede3b"; + sha256 = "f01107983653f7d86aab71a16e43264bb08a5697cb1819b2f404d1d3ec2da490"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/an/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/an/firefox-146.0.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "2c810e067038ae11e46301a4ebc89c26988021b776ece5238d01067229c708d8"; + sha256 = "abc44138e1001d823a464de38de48a7aa8beaeeccf47d7e523ab99dc22a0ef19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ar/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ar/firefox-146.0.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "30c80485acc80e68cd8fa009247c76d2aba12e3c2c3cf0b723eb77d118f66cc5"; + sha256 = "90d70d2a1ee7cebca0684432c422c490fed895672a01f957a7637820adf74255"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ast/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ast/firefox-146.0.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "0efc74c1f735e20ab1f363b61248ceb22a5a21a41e45c8dde9789e222bd94386"; + sha256 = "9abb4b3d873c3bca46470d47aef8a2194d827e86e9d74b5fc71bff518dbb95a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/az/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/az/firefox-146.0.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "4f48ed2c58141d68aa87d2063e193ef6f559a12a25fb19d3b6740f78cc09d8ab"; + sha256 = "c79aa2f381311893ab1d5c4af9fc76edfca021676cfb8c704ce30f8945c0caeb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/be/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/be/firefox-146.0.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "0afef532b561d877772e6e3fb4161b84c2038769e002712c10103727ac1b9eb3"; + sha256 = "98fc453034cc8db1fd5ffc5c1d8fe5f32168a54db46d85e8bbc6cc4eaeb9d767"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/bg/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/bg/firefox-146.0.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "f41075cdce641a51c7dc4f0327542d474b8876e065c054f02a487ec9f6993d98"; + sha256 = "3460c0f58e57c359dcf1856fcbf4121ca84a338fae47ff74fb76d53f1eb983d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/bn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/bn/firefox-146.0.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "f410266a62f2f0a50d284bea376dc8c6300c076bd079400ef449e1e089f37002"; + sha256 = "483f76920040dd1b09ea6ebfcca15924b4a7c8daa45760395750a05e259347c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/br/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/br/firefox-146.0.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "e2c5e60dd0a0bf74f692e913ee40068c645c285e0f69a0f21f1b9fbd78bb11b1"; + sha256 = "4a78d8c5ce8d8c73eec87f96e6d7e47f736ce4f82d477f3b9a7228982cd910b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/bs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/bs/firefox-146.0.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "f5e4cadd851184fbcea6d4175276b9a3244ae49dba0f6f7bc2135255ceb49fe2"; + sha256 = "bbf032a1e7622bb308f821a0858d67504f9666e6be1a984961141e740e332d4c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ca-valencia/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ca-valencia/firefox-146.0.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "e532980cd6509b1c96ee906fce44c09a0d7422e45eb778cb55f0ab1a3f17e5e6"; + sha256 = "9463bf23f292c111f8674afea8b28899719f26da371e0a3363f3e5bd58aa0d29"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ca/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ca/firefox-146.0.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "1b8c0df3735b003b3baac30ca50edf0827ce267e9f45d6306f75546d9eec2bb3"; + sha256 = "db635281438983de072518c442d025de4a9b70d5f9ceba83ab6ccdd5ae8002d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/cak/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/cak/firefox-146.0.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "ede7ef1afb9d2d85007d95d77f0fa3e6e5322d645ffbe41c4fac438c8ed240bc"; + sha256 = "dcb28744ac1a2f69506c9515c9fd32c8d875f7ddf85dd1e50b326783386d1c52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/cs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/cs/firefox-146.0.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "018baea0e5cc7010d3cb36342f2d85f3f209793ace348fd0a0f4d0ceef52aa6b"; + sha256 = "bef31d0efddd7da44874a52274a9033467fe590e7ffb0d2d5ebe41a2ac874878"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/cy/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/cy/firefox-146.0.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "8a15c744635418f74da83e742b04f22fb25b764c3b32255d42bbd45074872138"; + sha256 = "86a9a87f69fca104accc39c738a40675e2fcebcf6baa5017997f374404b2418f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/da/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/da/firefox-146.0.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "e48a84d8aff8928b87cd8a9a05cf7f739cfae021ab93c2c3c4169f6a655fb411"; + sha256 = "7ba9ff22e512e1cbbf221b4ba42540905a195c02fd2939c697aed3bcb3011fb3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/de/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/de/firefox-146.0.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "0484b5fe3c6d79a9197b0ca63e68b8ecde2036f936b2dce0b83c44f7cad5bd22"; + sha256 = "93e73b2adc8d62a69a9542d7dcbab75df70b947690eed002a7d41ca0e404d27c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/dsb/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/dsb/firefox-146.0.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "f7da87432ed1ea8f39008ed4d69a5e80edb981ba3d3ee6afe237dab5d71b1378"; + sha256 = "7086729a6a63d3d78bb117b58b8bd7c8b8c68eed5308228d54616185f9ca0ebf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/el/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/el/firefox-146.0.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "77b082d12afbe6e794ef7b5cde140537ba21dcbf5d748232374fc50fba06ef18"; + sha256 = "c1762097262d84aa76d82272babe1cf09f6da14df6ef8e7ae43103faa16b4be3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/en-CA/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/en-CA/firefox-146.0.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "c8536e96c0f65265b37219699c97427d2546b8de22c6b3df4b1a7bd4987104ec"; + sha256 = "1c78369901480c41c2da6060b2a98caf077f24a1ad6529d0b259e63b279cbfa4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/en-GB/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/en-GB/firefox-146.0.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "6819f31744bdc7971881e89dc051b38ebdda7751301736b6f144c6b3e9e2c0a2"; + sha256 = "c979aa6b35b4aa9d9d9a7d62126b3cc27ece1bb9cead4aaa23fe26695ce89518"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/en-US/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/en-US/firefox-146.0.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "dd3a7d4854a1a7ae13cc8bdc9013b34ea551bb9917de80901f25e2d63f6eeb6b"; + sha256 = "1ef8572b58902fd514dba246ab3f630b162acd2afc98b1ff1c245c4653a1477a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/eo/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/eo/firefox-146.0.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "034df09ddcb07e192fd0d3c937a48febc046015c9da32a91b6ef1a95f496b082"; + sha256 = "bf6128a5212b8118bfd90d72e4de9af5396a42b6fef7d1e2c1c39ec850297fd7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/es-AR/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/es-AR/firefox-146.0.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "102a1ab2f43443dfb820c6f67d0ee81c2d9824a4a71e49187f00b6ceb0837b4c"; + sha256 = "1b8ba63033e9e1d6a3bf21eec4e9616ab26eb758172da67eb6707b83e605aafb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/es-CL/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/es-CL/firefox-146.0.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "5147e42e30085a5fb3d037cc6b7005fd1d6d49f7b81d16dd34a455213e10dd5e"; + sha256 = "ceb72659c8c1ae0d30cb969f2d3336fde51508880b59ab90d9fe0861b79dfd06"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/es-ES/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/es-ES/firefox-146.0.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "def897576608642898bd4a8bd75ceb2c06b5c788ec91d1ed1bdfa418ef58a17e"; + sha256 = "5544644e2a30ae29265c41c0fbfce7d25ef6698f2f1b130fd8da701f980d7c2e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/es-MX/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/es-MX/firefox-146.0.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "09ace8b0046b5d8767398456817662115b90d9c5438257f3988e4e6a23d8cf65"; + sha256 = "a1643bdc64d150a0d42e4d1d5b299a3efd926cde710a9a1f010e00938a2f743c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/et/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/et/firefox-146.0.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "a2b454da6f4ccce5cc484681745ded16af09966b7883c92ed177c00407f9714b"; + sha256 = "8682d88bae9be70a59d4552a681334b2f0d3aab50b9b5d57386d3df29415a482"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/eu/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/eu/firefox-146.0.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "2cc5ec1edde2a4c6c5850209bf23b233a7a1fbfcc34b0e921f3eab7933623d16"; + sha256 = "5c7ac6db6afacedfe2f7cac61636de439ebcb1f13fda5d64227f2ab3a35d6807"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/fa/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/fa/firefox-146.0.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "cf8271f1910b586bcf6d655c0e3801a0968918496d439213c90a627954a0d0f0"; + sha256 = "49f98d438b7b28344dba509fb272a76d1678f42c7a4d2b55e6b36799464d7a9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ff/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ff/firefox-146.0.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "77568f33077b6960a05bcf389d2d2f1094d9f94d20ab54de24a18945200885f1"; + sha256 = "ec7e8030f4cc520fac78cb57a364692546c5b8e80e66d7e86eca418665c8eb88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/fi/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/fi/firefox-146.0.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "f901c930837eaf22f30c60765e958f465d0ffefc134a990e26e0fb83afc017e9"; + sha256 = "59e4efa053199858c998092e54f52e2d4a97855f25b445ff31e2bdc0bfa444ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/fr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/fr/firefox-146.0.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "7e383b6b9ca75575cf19ab8951180b52770ead6559c0832c8c13f734ddcc69fa"; + sha256 = "04016f6eeda310d067725f2a5cda4f451b93251b98b9f5093274c090a0778b6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/fur/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/fur/firefox-146.0.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "9838a0b3ddaf6a7e7777f408cfbe0804ff1d882e91effbda4f75bf5c46336399"; + sha256 = "4b2d404a4e410f913950ed66e5896d275f6431644c08c22729dc724f835a020f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/fy-NL/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/fy-NL/firefox-146.0.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6ef0a6c996643dd8bac07b8cd2441d44bb5af1df88494ab99fa9afa3f3159d99"; + sha256 = "78d75fea5cadcd48b548b4a017df5c4acfce582c9f0a648aef94ab2008790695"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ga-IE/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ga-IE/firefox-146.0.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "2aa97783abd29be1e293743d73b97c4542a2f5e68df2e7ce6246a6e5f4a61aeb"; + sha256 = "d5e27fc3306a64a676c662619a1415b7c41d701c0a9115bc973400122427a9e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/gd/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/gd/firefox-146.0.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "6680f1971aa3d560ee60bcaa96016f433fc0a0bbb494cd613cdb69e9c202ba20"; + sha256 = "9d24bcc511a1d555219afc585de8aaf100e03cd8a419cfaa693f8ea3deb962df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/gl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/gl/firefox-146.0.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "add1aa9328e8c4a50fc5374eaf3b1bab990d23665c8f86c6adde7f634c3a0fa1"; + sha256 = "01015fb1797f2511530d3a22ec94e46b388a92484c54c9137c86580883dee259"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/gn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/gn/firefox-146.0.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "adcc1e7da6ceda4ed7c0f1e8d306adedea0c8da7fe4d8e6a509c141a5337a0e4"; + sha256 = "f61452ff439071c4656f27be8f8f7c6a1ea73714b2f1806f6f3c873b356173ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/gu-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/gu-IN/firefox-146.0.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "93ece81783a7046950c72a7cf8ef3402bd04b67ea003ac11dafc99b4daf208cc"; + sha256 = "d3078e6ab562813243e846257e3c4723187e04c58702587a55170ee1dc1f1190"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/he/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/he/firefox-146.0.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "66ff6c5131a4d0d712a7901049e46ecb316dd6726e90650034ff28a82fa0803f"; + sha256 = "8a43a65edb1d0b806a96bae3e68e59ffef099ec58da3bbe461c041816fd7aa5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/hi-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/hi-IN/firefox-146.0.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "f3ea9dce3bb89e45cd8b1e55368bfe4e164ee87b1bc982bfdd44d8c49dacb144"; + sha256 = "4563a8b38a00572a3445715164d5aa14f2e662ccdca55d02e67a5213c9d5846a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/hr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/hr/firefox-146.0.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "4e0bedb695d58e11c26315bb8cc7d6f516ba67e1d47f8dca6f7730e8f2a49fbe"; + sha256 = "81bc3298ae639fdd86dcb4237e53675a66ec45be0c707bef3b57c9017037e678"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/hsb/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/hsb/firefox-146.0.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "285a5e122f33a534987462cec61b2a8f94277555d01b5828b01bd1bf60ae2ac3"; + sha256 = "81a2530ec61adadb90519a905b6fff7bdf21576938f60a767f899ee4313b8424"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/hu/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/hu/firefox-146.0.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "cdf20df27bee354377c8f6174b745c6a1d85023b098e795f783a4ad4b05f5409"; + sha256 = "46ee9bd70f2a587fdef541f46ec5641e4bb141dfec11e22c12d04bca35452895"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/hy-AM/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/hy-AM/firefox-146.0.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "ce7c0f973afbbb6faafb63034c7c0f176e5b9d84fc76e806153f18104cec9527"; + sha256 = "c342ec513f959923605cbc3d2903b64c1e921ea3f989fb85e328149ed0da2cd3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ia/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ia/firefox-146.0.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "d2b785f3219e4b499771a55dde98afb89f3d02b408db01a3d9f111c1f2143142"; + sha256 = "f21658e5b1d96277e33643fdb63e66567404ecff75ec0b7a68ffef404147f1fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/id/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/id/firefox-146.0.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "9d79f34950ac0debed8d9281336e9b65dcb88650c984b1ca2725628c9098c09e"; + sha256 = "e26899f67f9a68c596a90e750f393fcd20b7d05d9d67c632bb90905f9b367fe2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/is/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/is/firefox-146.0.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "f328213dff21c44eef21fbcdaee444c86372c66eaa59df9a65d2088ab8237cd4"; + sha256 = "43e37ce7e4398933fac97e9ca25eff82da560edb41ebf437661386bf084c4f36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/it/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/it/firefox-146.0.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "7b5260850b1c4fd8df354ffe51dfbd61596691a64d8a13fc1a042ad9a2b96359"; + sha256 = "d8d222bee59a38f6f583dc716646a9b17050be8122cef4bb0b69f89ebba46f2d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ja/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ja/firefox-146.0.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "6eebcae9311ebee67c7e994515225dc08c708fefe0f8a5b488f64d115d936187"; + sha256 = "75ee3b5cfce6c7793e3e32fe0fc2e1a270f61cc88cd96b0f5bbe46118ec25804"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ka/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ka/firefox-146.0.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "ba24e19f4e85a8f9d587562eb59d0257028e106eb71285384d2f67fbcb2befa8"; + sha256 = "f13de4809fa4ea402162165c1a92fa41a1eafa4e78ebb88e10f63184723ad753"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/kab/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/kab/firefox-146.0.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "f5079b8c15ffaa0d502e3358334b75a35392fcc058f1599cc1da787dea8132fb"; + sha256 = "de766a148cc0e83b0a19feda922dbfd62fcf81b35cfb18813f2f3525cd85db6e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/kk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/kk/firefox-146.0.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "16b82c18f02f3c2a0e989edc51f2d2d1c37c3e45ac3749c33ebe7ac0abc5db12"; + sha256 = "d9f0192567c12b6663bc8541e4f76c32004a20a8e5679635f38afdad1944a5fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/km/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/km/firefox-146.0.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "197af648e58ff88eb598a2198c30b73be582809da45a80d35aecbe8b0ec2f670"; + sha256 = "d3257f2706d38d1d44382b9db6610f1208ac770e2c3672fe57108e08df2689f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/kn/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/kn/firefox-146.0.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "3bfec7e718b63ba6e1d1524274fbedd0f7f977ce9be89456b3018a98861759c6"; + sha256 = "470b43ce22f48893bd3b134877fd7c505ea054c514deef7f4046c6c446b004b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ko/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ko/firefox-146.0.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "e2999eb2e9f37b3284b2ce15a0789d10634a759adf06432c1dc7023bce99c4e4"; + sha256 = "fc47276a348e5a98f957d2033f627acdcf93426014cb64b9b7256d12c0bda2c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/lij/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/lij/firefox-146.0.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "6731d4c992268b604a3f3c1e2fa75dc5bf4fe0b0d3539ec8e87d8578a2bf6382"; + sha256 = "fa783d4806aa61a9b9ba3d30f8d8779ada88b41982d034dd3e439ffe0bde2ba8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/lt/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/lt/firefox-146.0.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "379503df63177dd97649a9191e84f71f4ad537e9321871118dce0b2ece662d5e"; + sha256 = "c8725c42697e3c7e38d419ed37c7e3e5f93c53139cf8b0c8422e7577a3266ab9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/lv/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/lv/firefox-146.0.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "fd8cd723db15b636a486b192ad4970f1638ef7fa68b68d8220cf33cf43f9bb75"; + sha256 = "1bf3ee9800c7274555ea0ed859edc8b3c01457cb9353331a5b19e360141a51d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/mk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/mk/firefox-146.0.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "5416190ac0899331fe131ab90a8cf039b8e7b0258debc52d63a5ae283154d52a"; + sha256 = "b0dbeafc61e395670f4590a25120983e5cb12e550f7d5cd8bd1c2dab9963e15b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/mr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/mr/firefox-146.0.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "79da95083a79900ce9733834cdeadec7169bdb211f34db07a5ed7cd9a2a5848d"; + sha256 = "ed8f23209f7175f20f458c25faee38fcab472aa93a23426c3c34174bd6c53b77"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ms/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ms/firefox-146.0.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "2f6dc3b932f2fe79113b114dd6b06230fe52748b7cc0c95da1d4575044f0a123"; + sha256 = "b2c766e408e8e630d0af983b07f4314222ff37e2796bd1fcb36132ea269f8fc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/my/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/my/firefox-146.0.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "eb9d66286a03da491329e4012f359cd704b520d8fc4f86e1ad9a1948e63b1c80"; + sha256 = "d8cb43cfd675e9f9e3245ff714d2f1f3125421e520dbc9b57f3ae5bbd518e32f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/nb-NO/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/nb-NO/firefox-146.0.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "f347579d6bb1cbeb5e770b7229656e3fd062ba54edeeace82cbb823b9bee128f"; + sha256 = "6c7ccf921a26b572e8732de0abf67fb3a635b8b7b0bdb1d0b9cdda186e1dcd97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ne-NP/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ne-NP/firefox-146.0.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "1f8b6d4ad0e2d1d1a85fdba0311154591f9038a66e1f56c9973d7dd39afe9862"; + sha256 = "6efae907acaa87c7277954b8d32ff5392bc0e2057d4cd504cb268dca83beda52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/nl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/nl/firefox-146.0.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "40ca94171c75f27dae1644cdc59970a8d67c94dde0b9aabbadb30715e2235ddf"; + sha256 = "0bd76286f621266032b09cf9ce103f4542f7585447df1541baf548a1230aa2b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/nn-NO/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/nn-NO/firefox-146.0.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "dfa0f43ec926ec85b234a03217d5d58af1ca4757eb0c789ff6d9bbd245ad680f"; + sha256 = "e7ac05175515ebb079ee76349f6752036133397c157b24ddd677607b64652dd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/oc/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/oc/firefox-146.0.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "ad9ea714c487e945741df21327be5b7faa10ab7683b29ab5bced91cd47972b3f"; + sha256 = "fe3d4ba1f64b784ba9169f5b99fb7d8282a50096bbb20f97a33c636b505541f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/pa-IN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/pa-IN/firefox-146.0.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "e62dd3d8d6989e51d32c942ccff994f705b0cc9b6535ef0b37a4761d55d8b88c"; + sha256 = "86403d5dbe3e83db4c7cc1e8b6e54f272694afc12429a7a6139a2a2e6364c917"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/pl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/pl/firefox-146.0.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "1b58fa54e72ab58b1e4877b9abf5a5ec49f6befe380890f5b853b3ad4f2e0fe9"; + sha256 = "e4c7c60755a2416e8b0985fc69df516feb6f102c42c171a6a735aac4c8ac8da8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/pt-BR/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/pt-BR/firefox-146.0.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "23d4081c8e4c033c3c92a3719bfdbc6415ff86fa4000904c05bfa6ae5f3801a0"; + sha256 = "1de2db93f4b6b98738693a4ec37c15bf205ddaed9f5996eaaede2b6bc904033e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/pt-PT/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/pt-PT/firefox-146.0.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "da283b99060269dad049d4da0cfe58501b2610085de0fa6c58db299a6250d58c"; + sha256 = "8f278599c8de459a6c5a618b70b539d05cc109ade319b8e37d935b067eeff2f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/rm/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/rm/firefox-146.0.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "dd2d412abc530e5b43c212c3b5a6745ba222327476191dd99ebbf80413ac1165"; + sha256 = "eb7832461f09fdccf460863952bebfba828f87a0257b020ad5528a316d2116ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ro/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ro/firefox-146.0.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "2f39e976b1902279ba9fb125ce73e9665b71891285e2d10a2221463fb4110348"; + sha256 = "841e4dd98c34efd8d00b5d80925b06f977d52e7aa1d43a4c03d6e8e77dbe1ece"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ru/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ru/firefox-146.0.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "dbf4d13b929492dcdc42f21a770c917c970513ec6fd1107d29b6cddb6aa58417"; + sha256 = "93cffa6ad5bb25c0d5f119b84e3ac365c9ebfcb99b16bc9a5020b4cea05b6e0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sat/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sat/firefox-146.0.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "f9b8a4bd114fcfe9fd3943d96f97095127ad9d5246b70d72a770daf2d0bb7085"; + sha256 = "938b8d39aa04d12ffc579f162f06f408f270872942ec6d1a3123246ed0486f9d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sc/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sc/firefox-146.0.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "bed78df57bdf5fd9915bd6964819cc2d80088d6639d0c139dc0aac24e0a260dc"; + sha256 = "603b4ce9b11b53c2031ef5c3db67ac062be9dd756f8d1aa2a7d036169365392d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sco/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sco/firefox-146.0.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "179525e7bbeb3306f51790d21461be71fac019c66a79bb6be377985704fe00a4"; + sha256 = "64a140172985836357c53f1f1d6162d36dc71697342aef33ce50afb924a882d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/si/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/si/firefox-146.0.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "467d3576b02b93d4efc67175fb6c6323e64346d1b68884928afd9b27b578b152"; + sha256 = "5a3b527c8a3618a1fe988e6a74a9823761c1252b8d81ba9399c9a20562977316"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sk/firefox-146.0.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "6fb04b0c1cae905c88eadb6790162ef20a2316599b440a7365abc732baa157d5"; + sha256 = "36cdcdd4df927ae3c390a44c22bb0fa252d687dbad5bbd32c8af8f886e2af4df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/skr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/skr/firefox-146.0.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "ee96363e0c60482daeb828e06e9ad221ffc45d432fe8be5d6d286276cc1e3ba4"; + sha256 = "44e3b8da0285e05f7bc0a6ea5104f5482ab7fd9acb2bc29a5cdee3a42d3b7169"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sl/firefox-146.0.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "bc8a458c63d4c9e8f6fd0aa775c79896ad96609dfd6ab59c99f7104c7c6d1c51"; + sha256 = "db7d606629709273b24cc5a6b7c01228bc577c34679ed03b217ce2e3b1612321"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/son/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/son/firefox-146.0.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "c588ce8bb88eb00ac5d16aa53ae8c75c200fc06dfd4c68dcb75267bf4d110d34"; + sha256 = "a13ecc3249305685d6ced48dfd36cc3a4e07f3cf1c9ff31752cd62d9683c4c79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sq/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sq/firefox-146.0.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "2317b0c4c9cebc765c27ab9a35e3435edac2151e417da74d8c829f5a13057a96"; + sha256 = "c69025aa366b4203a5e4d33bcd07d175e1ba80a0df5184433fab41450794ed80"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sr/firefox-146.0.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "b920cf12ec3b6cf7f890ad31e1a50d90b410536c876b2bcacf092d8ac9a9c146"; + sha256 = "517aa37b02745fb9d4c5da619aac64fcd1c16e0c5a81136358c661a6fb0d1677"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/sv-SE/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/sv-SE/firefox-146.0.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "fb7289da78f837ffb9db06e5432efb7677a91f550029f90afcd8c1ab66e5f251"; + sha256 = "56371d1795a87b75664cb6b4803e49ba4e6e35549649cd92028e095439491598"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/szl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/szl/firefox-146.0.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "7b77e86db7b7b0f36abca0f6b8a7c5c138de6a36a4a5bd2a7dce74464f1f6d9e"; + sha256 = "4d455a81fb2e9306f48f2d623b62deed09b35e97ce2c47da72d5993a6b268f72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ta/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ta/firefox-146.0.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "70f953dc74b678703652f9e7969c561c4bd497615f53bc3d95fe60c3c373d096"; + sha256 = "aba5c7c760b084bbcb1c790018eb8d536e080a0457b60805931d4f1df068cbb8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/te/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/te/firefox-146.0.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "da3d6ba8e5dc6900e32efb173d774e2a2cae5f32dc5fa62ab36936030927496c"; + sha256 = "a2981e58736bf8b739cb13c105aac37313411308e4a612398623ee65f50809c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/tg/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/tg/firefox-146.0.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "f818ba0f566e989fabc4b16549a7ecd97b655bfc1e275de8c09943d9d2611e64"; + sha256 = "c6cd36bc1b600c92e0093b4597d48402281d25c0df85cc3a0ba5f4ae34d903a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/th/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/th/firefox-146.0.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "85e39a219f062ef36da9451aa5d5c653a505a92253bafef958d721bf21884123"; + sha256 = "0a85f8d87573272042f376a75d8431341afd4daa97a9dde03328f3ed0a8f0ef0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/tl/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/tl/firefox-146.0.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "b587a900def68474b1dfb5d98b8ee981d249c5cdb9bca1386907a42abbd7cae7"; + sha256 = "383239ac49c91dc21cf6f10938a312e2f4d0e1c22805def4746f000e67afe7f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/tr/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/tr/firefox-146.0.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "0b27eb58199fe25d9a81326802e1f5b60c6e6185754b0c57b3de77316cf65a9a"; + sha256 = "98b6772a20d342d85b41dce7c9c2810fe44e2e62c6daa3b70b6eafd3c2934701"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/trs/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/trs/firefox-146.0.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "bdcff45b606338ed32ba03cd901f5ba049c5e88e208affc49e668b7e1412143e"; + sha256 = "ac897ec4564b12f2ccbb7f321e2e7660e8f39acaf5eb9e09fe2a3ff9630c4e44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/uk/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/uk/firefox-146.0.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "7dae3e409fac27e4feca3bac2dbaa100eb1509ac51ca47ed256d9acb30fc7d68"; + sha256 = "60befba221eaf286d968bb57dc57621e2bd4645f58b9a3b7eb78eb6be75665ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/ur/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/ur/firefox-146.0.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "3939f7e526c8f6079dbe0773d7e47860e45dbaa7cf6d3612b29784eeebde5632"; + sha256 = "fd2e356616ea893dd6095c70f898dda41238c35e3b11e42a57f6ddab550f6aa3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/uz/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/uz/firefox-146.0.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "2b03e499cba316dba4146963b4bbaeab006100514c45dab1455ec5e7c8251552"; + sha256 = "3de4ed2c5439e42f6b36981351b7733427509c6d00957ad1148f0e087b8fbdd1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/vi/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/vi/firefox-146.0.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "1c78cd58c60e456d5093feefb0b76447a846251a654a36f69bd0e6943814fe2f"; + sha256 = "e948e9293cadb76a8360ca4f086237bfc3a717d95122983493114b6b8530cade"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/xh/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/xh/firefox-146.0.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "b67c679fdbc9f6a4d1b75d158a61dcf44825ed7910cf53157b96b4e7158b9ffd"; + sha256 = "e6cc6764768b03ba35db0f755a9f15973f48dc335b30284a45eb1d2858b57740"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/zh-CN/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/zh-CN/firefox-146.0.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "37b336a439d44bc48ffd1b6d1d05b5e64912252c2f2a0d96c7962f35e63eed46"; + sha256 = "0b748e10eba3b6ae45307e2e236a38a48409eb6970f624534cd3aebae9fb98ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/linux-aarch64/zh-TW/firefox-145.0.2.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/linux-aarch64/zh-TW/firefox-146.0.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "39c0d343f4106f6a8aaffb66a4cc24149c537150b0a522c8646483c3be96ab88"; + sha256 = "2a27ed380d180acf4c96521ecf2eb314219f8b29b2d7c64203b814aca7c9eb52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ach/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ach/Firefox%20146.0.dmg"; locale = "ach"; arch = "mac"; - sha256 = "7de0ced714dc187adacd354622abda32996d2f9fca12e8c7ea7c0c7d394dd566"; + sha256 = "90d76fac15511726aac3ef79093ed384feaec413713eabd8cd189dfd378cb7a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/af/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/af/Firefox%20146.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "29d28fb1a3147525380d4bf0b6fa8a82c6f8a30f02e5c03868487452220fd65d"; + sha256 = "3bbec0d877d641f1ed710221d9147046c5d28ce47c038632a19c4573661a551d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/an/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/an/Firefox%20146.0.dmg"; locale = "an"; arch = "mac"; - sha256 = "68354a37b20f27e83abaf2235b8a2c31b968f042575ff339c30d54150b6e965c"; + sha256 = "4676a04ba8c9eb273e6962ca98135160bfaa4c9f0347364b9ce72b7625a131be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ar/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ar/Firefox%20146.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "c1888ae4379606d95f3fc692f0e3a697e7b45a07b55aea3b4f237824ceed0207"; + sha256 = "fbafa40c041ba5a608d401c2561ac67dea7ce7baf7000b6d8cd7fd2e633a8bb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ast/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ast/Firefox%20146.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "7fe729136f0bcbdee7f1517255a70978bc71da988bda0520a19dfda7c9511c7b"; + sha256 = "0fee18bbcec26c1c7c56b9d5f9e458564e0f26124084849cc5c8483ed8dcd949"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/az/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/az/Firefox%20146.0.dmg"; locale = "az"; arch = "mac"; - sha256 = "0a15339b0dbe8968d794cd0a95fc36cf890f055cb8eddd70bd4a6abc5c81d897"; + sha256 = "d32045f473b05ec96292909b1ed0d6aea6582f1c5941155df6f23fab63e2a8c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/be/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/be/Firefox%20146.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "793e31624d6c084e4aca2be5d6d163b5af0c0b672c32a96488689ce10230225c"; + sha256 = "dcb55080814302e9710755c9779f1f6d19f69228f3f9f604bc7e74756e05bb1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/bg/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/bg/Firefox%20146.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "c45b5208fe6f816101c848618f70817c569e91ab3455fa365153df79816fb8f4"; + sha256 = "e7d27a71e577ba2f083fc8691a4948abe34174af56b507f38131f278380ebb2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/bn/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/bn/Firefox%20146.0.dmg"; locale = "bn"; arch = "mac"; - sha256 = "f469c96365e2ea373f65512c2ee3ad4cae214e202026c107b2db5cce1af881ad"; + sha256 = "431c331c8a969144a79b62198aa1f3c00e8660c9d011dae9f210f2279686c1c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/br/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/br/Firefox%20146.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "1d0144d79edb01ca3bd1c5d84f241f58e1ee03a6fc5f4a1b427a9cd43858fff1"; + sha256 = "7b3dd9acbb44bfe5168bd570d77e65899323e91291631562abf033e8d08af1f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/bs/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/bs/Firefox%20146.0.dmg"; locale = "bs"; arch = "mac"; - sha256 = "0c59447873d3504a19c7fca1497803e6cf337b1a2dd6008deefd4a76cbb45fbd"; + sha256 = "6ff6e3dcd86ffe33b50cd482d3f90999ba36d46bee84948f40bce6d7f805512d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ca-valencia/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ca-valencia/Firefox%20146.0.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "09df7a81fdc0f629a0dff4fc478a1d54e8b823423575e0950bb3a28e094f88e9"; + sha256 = "abdf1b8b1eca28c18a0927a3a6250967073c14aca798476ed7d2d9e35adcdcb8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ca/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ca/Firefox%20146.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "5c6f42a855e8774748b8a16e7c42700a5cb9c753e1915c4848401dc6d1a5e53f"; + sha256 = "10957e44f6a61395185e225d6b7d59092d6ab245d49f4e20b2f7940924754968"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/cak/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/cak/Firefox%20146.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "c9a2d445f265fcacef090b02d69ab12f6c842661d8572c54b353efbcacb2d94b"; + sha256 = "4297b9f339042511a15bc170dd2e8a6d9cb92622b71e604680a26b5c58353434"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/cs/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/cs/Firefox%20146.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "b50b9930726f2f558504cb3aeebf942af24e7827284f2fe19c0f066fd0e0bc82"; + sha256 = "35700c8eda0fdd5d33890b433bdea51c5181fa42f6412b0730b4313019782e21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/cy/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/cy/Firefox%20146.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "68d3012fd9b1e7890ad482f8ba89564e3fddb20380671ccf01953e078bbeb98d"; + sha256 = "7731f729fe313091cc164a020d78169deb476da126552b66658e7d6b8733ee94"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/da/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/da/Firefox%20146.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "6caff8522d49eac0c843c73b414f06d9ba26f615bf9668a53da563e6ebf257ed"; + sha256 = "decf757fc09040576c74da40ddfafbd9ef7ef8a09c9851c2bb8c63fdeaf18546"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/de/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/de/Firefox%20146.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "709119afce010bae5c12a548d9c23e930639c1c2c8b571d5a57e31d35b58657f"; + sha256 = "5411c700f34a0f12edfb6836670d036bffa0fd19dfb9caa41f29a7bd5ab17699"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/dsb/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/dsb/Firefox%20146.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "cf38ff3f8e34e9fb5e7474f3c6a17e22b0524a9b222f912bdccee77f0e9d265a"; + sha256 = "79257cd6e06862f3a5d1fe08e7563799214e887069070d437812f8ffc3710de5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/el/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/el/Firefox%20146.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "0cd919b1f350a7e8409198c7eddd8fc71c0bb9d6466e03f30f991a11565a8d37"; + sha256 = "f1d77e7a1287c0da6a11730c02993069a5939f4f24817af11cfaa80f341d7469"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/en-CA/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/en-CA/Firefox%20146.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "83b35d798a2154dbf150345b28bfb0703660ed1033e4c650bcd32630b6104558"; + sha256 = "c6a12bbe161763329fd64097077321db329dbe81095836e0b6ff40051c5dccd3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/en-GB/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/en-GB/Firefox%20146.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "0512e6f21be71b848c667d4a4e7d40294d4208dadf9b13269a63711b7a987499"; + sha256 = "11d821fe3e4436bbe9b9754cac5093ff0b5fda2cfbd86563d9de88969ef24771"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/en-US/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/en-US/Firefox%20146.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "80f5851f90de88d1b8d27299cb0a3ff3b9ff3774c275de2675f651834bd9228b"; + sha256 = "4b1645313887972d466cd82166ea571485c2c40a167f84624e3f3ca739993cc9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/eo/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/eo/Firefox%20146.0.dmg"; locale = "eo"; arch = "mac"; - sha256 = "9bd1b53f3fd5fe1961d61098e5750599fb1fb5943e83d6303470ded2e50363d1"; + sha256 = "c3ee1f1e692baf80856a6d646a6ff24b6861377ce0eb549dcdd3810da1c6250e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/es-AR/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/es-AR/Firefox%20146.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "20bc059a4cfcd7cd35f1b56ed7bbcc0018725cb69bead56a7425709fb86f914b"; + sha256 = "cc7ce08d2b6c8758fe973d8805ff7f4d57b7aaaf1c70640357ab97a37f81deef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/es-CL/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/es-CL/Firefox%20146.0.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "5b7fef3f3de33bcdf043defaaaad2534527ad779f0544fcdf728c562de37ae80"; + sha256 = "ceac20f4ce8bb2f8bb64f995d694051a26802fee5995c1d9e6c065091247bde1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/es-ES/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/es-ES/Firefox%20146.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "b21f8cdb876516cdc28b17bd4ef3fa427b212929665b0b01872fa4c40e29c60f"; + sha256 = "aa576f8a9cab7187fd276a15e803e8483bee569eca7a55113e36555f93688e59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/es-MX/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/es-MX/Firefox%20146.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "948815da1659aa780e4d318d5f31628ddc7105a4a1094f2d5e0cc0e0449919f3"; + sha256 = "a8865bf164d7f37af83a4ebba53689fe2b7d08aad3a10ecc490b81eff87e6e96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/et/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/et/Firefox%20146.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "daa86de8c7e13c1f26a1fa197d62a988920e4c2471104de2df46e20b041c5e43"; + sha256 = "c8a749995236c0c5a0b27c200290b5d69aea7728cdea0a7c1258d3998345fa3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/eu/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/eu/Firefox%20146.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "12fdb983622a68d52c5a8dd44981efd9ec2960310eca3748814b21c3de434d0d"; + sha256 = "d10db090cbf1c378d3482f9b0c3610d68350ce4d9287d9c48656b40cbaf31259"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/fa/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/fa/Firefox%20146.0.dmg"; locale = "fa"; arch = "mac"; - sha256 = "c34ba300b426f4cf92b1a57b8314298dbd0d3a02d5c5982d3f017f010a642023"; + sha256 = "72fd9dd497b42846c228b40b7d935596ed5b8fc9dcc8c1a1d1bc84d26362c6c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ff/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ff/Firefox%20146.0.dmg"; locale = "ff"; arch = "mac"; - sha256 = "c3d04e9ef1faad6c7d1ab3a3b100e753356fb808020423a5aad42d9402491b65"; + sha256 = "5bbc87decfcaff3f1dcb0af2d7383497fef5fb135fa7c73b09bf1933370c5e04"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/fi/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/fi/Firefox%20146.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "340fab036d8c43cd78cec3408fce0716c6a80bc1284d8f5b82b6250b54a19c64"; + sha256 = "60341d7260c7936b08a6564946664dc10876857193432a08b58a8f49a2b54501"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/fr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/fr/Firefox%20146.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "d7648fe26a147613278e9206ddd0efddc8b63029648476740de23669c91fcb1d"; + sha256 = "d2689a42c0a4673567f2deb094809a6584478c3f05616db37648892efacc6d7f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/fur/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/fur/Firefox%20146.0.dmg"; locale = "fur"; arch = "mac"; - sha256 = "ae1625c69c9746e737433ebf03d75784e233b7fd8759858db8c4ee03a1e8d4a3"; + sha256 = "b009a69a71862b314fdba63a0e1614a9e7800c97934edbb03fce542b295da6d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/fy-NL/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/fy-NL/Firefox%20146.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "720c8e5ee801f535386fcb66b684fff3736994cf7b2cb34454ab08cc69bd5c7b"; + sha256 = "f28c2e9edded11d21631c8ab05da150fcda6c3313deeceb982786aa29b54cd0f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ga-IE/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ga-IE/Firefox%20146.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "7c995b9a0ec8390f417461b14a974df20676ef4847620aef9db0a0f1330d699e"; + sha256 = "e34b3945d10d152a1cbd42624bcb329f382b4e47bcf25c757b307571455b16d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/gd/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/gd/Firefox%20146.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "502c8afbec7fe81493fb6a89186e5a1a5667f43cb1fd4a4d264a9e705fd58e1d"; + sha256 = "4b64e312166645667c370a748c19a63bdf27bf4aa981102c28ebcf4e7ad26137"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/gl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/gl/Firefox%20146.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "7c1591889208c13eda977192e4a0c2ba33e3b934e2d5166ebb3518b912bca3f0"; + sha256 = "6272494cf7d5f5c8aaabbe54f4d61633f37531a7322726d54bcfcd9a571abbad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/gn/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/gn/Firefox%20146.0.dmg"; locale = "gn"; arch = "mac"; - sha256 = "3b1bb996a7fe7f3c5f8151323139c7c4a2c9e280d456660b6fd54ad28f86f561"; + sha256 = "628a52456cfb4f4bc56212d2a81004547d46d86f92cfa87986e56c8b34a1bfa3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/gu-IN/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/gu-IN/Firefox%20146.0.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "7aa871dd0b3b5d3ade8ca61f2792aa8c8552d3ce53c5e01b6b095a18f157cada"; + sha256 = "5949e246812e4e4cc07ba606f6e3815c6d4adc53d6b32779f920362e78637197"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/he/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/he/Firefox%20146.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "dfc877ec22951c111466558541e71540436e6899883533e00926f4c4ab2d4cfc"; + sha256 = "030e1311e95c7903417151f137871dc84d05ee9b6a104411686c5b52c3d7a04a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/hi-IN/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/hi-IN/Firefox%20146.0.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "4f3269f5f2df4c1ec0863d199a7c15823e162db61d4ef2bce354c7522b234702"; + sha256 = "3259003c3c476d257ec89790c898e66030ef7f26089f0f02a944d659c890c411"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/hr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/hr/Firefox%20146.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "afb6de4f78ec221cd3664060749f8b9cdbc5e9bba4db1482866e63540be4ee13"; + sha256 = "01a68afb50ad932b548454cda0e1b71bbeab326c6d122d3978a43d7bb3093862"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/hsb/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/hsb/Firefox%20146.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "7e95f84306871172f79676b888599f7f7d9695c44c29386bb64d937858c3d982"; + sha256 = "68a70a56d2ea55b3b961fcee5396dd08ff4ccaf3edac2331cf546a822f4e864d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/hu/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/hu/Firefox%20146.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "b5815775f06fa0183f6fd182f73a0ee2441f047063df4bdb16b7f7828d944f08"; + sha256 = "6587c3415b097435ea699e8dc20649a49dcef35fbea2bf56f7456c2e48faa4f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/hy-AM/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/hy-AM/Firefox%20146.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "d0dbe2d900b92baabd83c27d6530d67b3eefebfcbb558bc83a0997c26cd9bfe2"; + sha256 = "fa4925dddd9dbf589d674cb970144f484dbb89652ca9272ab52594081dfa2598"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ia/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ia/Firefox%20146.0.dmg"; locale = "ia"; arch = "mac"; - sha256 = "b7c5ee07a3e86458ffd2499e547fe79d97f6aa996c421b4b7f2ae19199b33801"; + sha256 = "da4d75b72d2192319019164541ceebfb81b88bd7b95fdb90ec0fda0fc18f499a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/id/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/id/Firefox%20146.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "7309b0cf16cbf353087df0cccca3686930ed170055dfc241cc809ea440985884"; + sha256 = "f509bc63826cb639777fce66d550481109bddf0ab8a73a6dc5c2f95537633122"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/is/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/is/Firefox%20146.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "92285b41dd86b8bbc84ec1648502ad09033b6e429920b7274610b35567cb2e1b"; + sha256 = "c6b87a3a6be0df66f8b45c7024d94c88667f17fc304c17c7e9e703d1d13e19ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/it/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/it/Firefox%20146.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "9e118f1a952f6d6e273f84d2b154996864fb3de292771f1badb3ea9de4d87d87"; + sha256 = "e41a35a713228e9f233a319c2a107c893878a524844ec13fa42b0cdec645fc76"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ja-JP-mac/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ja-JP-mac/Firefox%20146.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "162bf907fee76ef067008bea882b06ffccb1d21b7e32820e7d6f6f7229e36e52"; + sha256 = "32d6310477682e3d3f5100d8dee0a46a34ad1951ad067e83cbcc6e1753b29c90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ka/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ka/Firefox%20146.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "7ae1854a3f5252487d689436f494ac4386016da9e7ff56f3060cafbaf39b5dfa"; + sha256 = "53361b8424a19fac774907db1b90df737f62c04f6f69bbad1d52b01d7f7aa284"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/kab/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/kab/Firefox%20146.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "01b8bb81377cb2ca78df499f1cf175d32fcc0a87498d4ca826a2fafb321d7670"; + sha256 = "5ecf19dd41dcbc7ae3db6517735beaae0f9a3af6ce7e5949059a8bc23545ae8d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/kk/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/kk/Firefox%20146.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "a67a685554c4c66f8460a7f35955d4f8ed2cfa97da167c25203746f8f1145c85"; + sha256 = "e4c2914990a00b392b5ae0e0d847b0c9611a5fd9c855a98d3640c798357a08d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/km/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/km/Firefox%20146.0.dmg"; locale = "km"; arch = "mac"; - sha256 = "e8d19d04c2f1a2d7de699151f2a309b0ca28321485b84619775487636c12e4ca"; + sha256 = "40c0c4775b4c303d60e900c6ee75bf3a7e5cbe50dcc7a7344dcec59ae15255f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/kn/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/kn/Firefox%20146.0.dmg"; locale = "kn"; arch = "mac"; - sha256 = "76024d05d1769605b7d70b9ee5eb174c869e1f7bec68e211495ce16b86117790"; + sha256 = "6886ea40252205728f23311660baaf5ea091f013695c43af3e98a216271a2c9b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ko/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ko/Firefox%20146.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "06b91e95687598d7ef8c01ddc10fc5b35ce5efdf72c034344ab8a62d3a321f6d"; + sha256 = "ab343840aed901259589a4d1ed5c835c4b4b9cb39c6a12712e528bcd869941bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/lij/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/lij/Firefox%20146.0.dmg"; locale = "lij"; arch = "mac"; - sha256 = "650a03f02ce1d361e3cd15d36ac1bf2575b1315eb2e1e613000d4f8cddd41e4e"; + sha256 = "676f85af24db63784e368ec3160a05d742ccda0a26d1c859666afab00c7e0dcb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/lt/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/lt/Firefox%20146.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "0188ecfe4fa6744c6a3c5c76a0bd15d883cb16633b1dc6cf722e42753d6b329b"; + sha256 = "aa94198a92cb708c8be2b39912f86802ef426487fb26b80d9ff3ac13e22939f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/lv/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/lv/Firefox%20146.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "72e56d7faea9885a09ad851d6d8f79cd3d943168d5abe5c5673024cf79fa75e6"; + sha256 = "dea01fd093dbbd51a079795d4bda8dae7ddfee1a363f428657765cd57fe705b5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/mk/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/mk/Firefox%20146.0.dmg"; locale = "mk"; arch = "mac"; - sha256 = "168a50cddf59b39518affe48da4ad50abfd947ff16e7f672131f1b65ba307573"; + sha256 = "a2a673be53d2fa2a38f6d9b12a84ea8c2afcc78f0d5a41b511c3bf03874f0537"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/mr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/mr/Firefox%20146.0.dmg"; locale = "mr"; arch = "mac"; - sha256 = "dd8a846e4285ac3ed2aa7b4c10476e3ac60af5ec1124aa6fd49d7f037182cd74"; + sha256 = "dee01af9aa16f21148a02955ccbba12d5ffdc8356af3ccf4f108ce1bbf0e8801"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ms/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ms/Firefox%20146.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "0d3a8611279010267851c689e308c7da39a4677b7ca132d783fcb1f369c2fe55"; + sha256 = "01897186f49375beb7c3b61a79d2f5c56256878d22a377e3dd324164a920e7e8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/my/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/my/Firefox%20146.0.dmg"; locale = "my"; arch = "mac"; - sha256 = "d2dbc814dcff059069019f66cf7771210b2793a92b971bfeca6180721d43475e"; + sha256 = "81cf8dcea8cda8d019c41e546b79d3222d055f09d7736711f0de9d7caa6560d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/nb-NO/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/nb-NO/Firefox%20146.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "67b97883d412e207deb4980417bbe5c2707bf0ede2358419783bc852268962a9"; + sha256 = "956fcbd0b7de9f9b74b295732178e2f9bbe4fbd93d7606647883279af85d2f3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ne-NP/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ne-NP/Firefox%20146.0.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "7b9c2e043b13186b9d7e818e7d7a16e41e956f5b67ba3ad87d7a54177baf35dc"; + sha256 = "3e2478ccae6b06b57df7d67956949051cc9ec9c81fdec2d97153f8adce0ff897"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/nl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/nl/Firefox%20146.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "5a77b3aa7199852a7e98ffb208c84501ee55092edcfe19e0147837dd3fa7936f"; + sha256 = "4fac5d8dbe6cc4288e784d46e20d60813f38ab89a5e313cce5d1c53823986fbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/nn-NO/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/nn-NO/Firefox%20146.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "f5d85974b06e14f2f071d631375e7258095be1f51cf470630769ff009365b63f"; + sha256 = "70a0c6434c17eb9b89f444b94ecf64fd2ceca36c4f7f53f0c3a03b424f857871"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/oc/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/oc/Firefox%20146.0.dmg"; locale = "oc"; arch = "mac"; - sha256 = "7be86c3824f1545890fae2078031cc3c26b1acb0b0121bca3b5a2c8f3adde99d"; + sha256 = "e8b4fbca66ee055fd333d67b49e4b0a580b24862f98111f405e4f29d5cba62e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/pa-IN/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/pa-IN/Firefox%20146.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "15ebfbce7f8278b46c0fa10262c59244ea0a57258366eb59827fd4b00b17b811"; + sha256 = "96c4952d4bab38baf6cac66bedd0890b8886db2859853abb071fd96e774298a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/pl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/pl/Firefox%20146.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "1c441abca64fef53d5f7917dcdaa6d72b20afed0c5e9ea606da248170727552e"; + sha256 = "f2fe3479584b32a25eb1198ff3429ffe703df603f6f9a643e2c94f18274c47ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/pt-BR/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/pt-BR/Firefox%20146.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "d41aa6ecc7cfc9888feb9e304c713438e90fe77545f00ff2f2ae017ece05841a"; + sha256 = "ce391123e36d73dff3cb241eb42c5847aac0931a81ad3f40448f3fa3ee6e349e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/pt-PT/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/pt-PT/Firefox%20146.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "9db85027b655aca56523c3fa6721cba899119df38c9b581ad5631bcb0be25fa5"; + sha256 = "bd4836d802c5cb63bcaaecdd1822d48d06686f4a27fa2bb1e8b1509ffd2d3d08"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/rm/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/rm/Firefox%20146.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "aa1ae8b4e8decba9acf6f71d97f4c7fe807d49b6eeec5507a0de444d73798472"; + sha256 = "d98e432c1e047276f4cbe6587eed93442e63dccaa70b946a2059eab57ff70a24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ro/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ro/Firefox%20146.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "58d615d3efd6bc3ec8e57843f97cf7a0de503c4eabee9392a237de1861e23afd"; + sha256 = "36f5f0b881e16a0a10c93cfaca5aa3b01e58d25d34d5cd7e9c691775d138ac6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ru/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ru/Firefox%20146.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "4d46a7394f48dfed0e27c85f075e08aef118a5891d77bf87c2ebb2f0b84cfa4b"; + sha256 = "10aec7f06cc13e1131188af48598cf2d90c9d3e52df5c869bc7dbcb7a0785dba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sat/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sat/Firefox%20146.0.dmg"; locale = "sat"; arch = "mac"; - sha256 = "7cd39f57cca5afc34c2806a5b2762cb1d37c39510415813587d6e8efea9fa349"; + sha256 = "0a95a5705c6a5dd85d496886690287ba1e8a2014bb1ff47ec5360d5e9558e106"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sc/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sc/Firefox%20146.0.dmg"; locale = "sc"; arch = "mac"; - sha256 = "485307af0683a3e586246a8b87b3ae483c0ff3963cc273b7c69effd62544f40b"; + sha256 = "f1801894217cc870e0432e2d3972270d2c790da96dd7fef034b9f81b8eb1a9c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sco/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sco/Firefox%20146.0.dmg"; locale = "sco"; arch = "mac"; - sha256 = "87dd889f0d02c7856bbf2a37ff5aa8fb5f90feb45ecb68a817ab64459142a111"; + sha256 = "efbc9cdb9388db3c90947ee5caccd8445e670716439d393a6152ff932d9dd0ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/si/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/si/Firefox%20146.0.dmg"; locale = "si"; arch = "mac"; - sha256 = "32be24157e20104b9235fc32f13a748f6eca146c0f83846ea06025fcc0c4ff37"; + sha256 = "bf4490b81152abca7fa06d8664f5da13272ff8eff0808121cc2a7e85bfbc6807"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sk/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sk/Firefox%20146.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "c70087d03dd367c1b8e189035fd56c1f3af0b5a4479591adf0baeb6a66a3dc02"; + sha256 = "ea37fc5a629de40f46532b8502a9be9ff3718941335307cb4c8d4b0cec8c4649"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/skr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/skr/Firefox%20146.0.dmg"; locale = "skr"; arch = "mac"; - sha256 = "5b836d2b97d37905ddaa2e974d448790ef022891d3da2565e6e8a3bfa0ef35e3"; + sha256 = "f60f698fcf15452bfa8d0817f34ed58d8a0af8595d0271ba5690ca6506a8587c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sl/Firefox%20146.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "30064db442fc47577acbc62a7cb553bb76478c69b441b079a208b5ee475f7e14"; + sha256 = "c5ff3b4e8ea5b099f4f37e8b2b7636bee0503f41aa04eba9bd1ec4bfb1310f45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/son/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/son/Firefox%20146.0.dmg"; locale = "son"; arch = "mac"; - sha256 = "4965d9a9cb6317e9484184a80f94acbce4d5baf20e511c90f902f7d3ecb9682a"; + sha256 = "060bbea8b3ad035405629efdb6d9fee17d4ebcfdc51656138b01f6922699d85c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sq/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sq/Firefox%20146.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "a3e67ea03bdf5aaf959a26cbdf9414d52e28d1f99e3fb1e6ca103d7e9f4f0d8a"; + sha256 = "90256a13a6783964c1d03f4e95dfd114b030504236dcab2b8bc5068469464873"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sr/Firefox%20146.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "a1e1962afe97de834e4a222027f1926a1a26f3102ec072bf2035aeced4a21447"; + sha256 = "103ec3423695efefb15922c34a104e1fc2399b9291231afbda81eb79845273fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/sv-SE/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/sv-SE/Firefox%20146.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "8fbb8f5e7cbafed59d3b1bce2f747fa4e68f262630fb511c89197991ec30baed"; + sha256 = "65d3c5930a1328854ffeeef6bff58851b9076702cefce50d601c829f32673da4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/szl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/szl/Firefox%20146.0.dmg"; locale = "szl"; arch = "mac"; - sha256 = "55a8ff229e06d55bd9d7c99b6c655db201cf7336ea16470872d14e56466f9706"; + sha256 = "69a054c4bfac4aca5ceee1dd134cf77767b76c2546c7f7f31b842d4cd6e0606a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ta/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ta/Firefox%20146.0.dmg"; locale = "ta"; arch = "mac"; - sha256 = "e0b3b10b3a26b2dc0021bca6e49cc5ed36f610b306daa6fc55f32ea516f686eb"; + sha256 = "090b7cfd5789d027e909bd9946bfbc1ee7c04389c7e9d1342f6c58f5932bcff4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/te/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/te/Firefox%20146.0.dmg"; locale = "te"; arch = "mac"; - sha256 = "4286d68f3e9a9237794e2a6bcbf1276fa32880a76ea2c8dfbe2f06a9a4a716ed"; + sha256 = "d5bab648285b1cbc2b42193b287aa42f8403a693561de6d2aec7cd129849d8fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/tg/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/tg/Firefox%20146.0.dmg"; locale = "tg"; arch = "mac"; - sha256 = "6cf3ba4c13cdef94d94c852dfc3600fd1a53750080cdc86c87503801a8033ac8"; + sha256 = "6dd389cd0ec2df22162d24c3dfb908344d123b58256271bc842815688827ad7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/th/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/th/Firefox%20146.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "b03397993ed7e98961fe21d31f8f03c1b863891265bafcedddcd11be4b83df10"; + sha256 = "bf4f44a3573d0ae2b010791ad8aaab500f9886ac07dd7d70848cd4300fbe91e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/tl/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/tl/Firefox%20146.0.dmg"; locale = "tl"; arch = "mac"; - sha256 = "6214b13bc9916deea03c4260cde052121536d92ac63730fd7d3cf6749357e5f3"; + sha256 = "08b52c08333dd3ef7d47d049d60de0761df037ce3bdc481b25fede0bc5a2a558"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/tr/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/tr/Firefox%20146.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "489939df5fe3179fe66dca7cf893e56f7844a5071e2e61cc53c6370b4099d0e5"; + sha256 = "4b12ec565a8bfd9b94217f505e47232d3ac6fabf2a87df0c4b8566878719cc6f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/trs/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/trs/Firefox%20146.0.dmg"; locale = "trs"; arch = "mac"; - sha256 = "73e4e57ee129716a77cb4945ad26231f48e653ae5727bb13360b64b498abd104"; + sha256 = "6bc875f9df6e0bf423a8d5e5e62dbd848dd4991937f55d1c3911d1dda31460e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/uk/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/uk/Firefox%20146.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "031e88dc9ea98096a076754d2b340fca5bd55d1a3c3535d0db9e911f738098b7"; + sha256 = "df7272f7e9b9e2a02f48c51ba136c7bfbb25efd541c7ab45dc81f4f5ca11bce3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/ur/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/ur/Firefox%20146.0.dmg"; locale = "ur"; arch = "mac"; - sha256 = "f66cc79f184ddd54002ba9d5a6f214dfa8ea820e0816ba64c87869a5b556be15"; + sha256 = "5c7a25acadc362c87ddbe82b2445a474eb4f25ca5dc5a4f59b3d235b9c1ab8b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/uz/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/uz/Firefox%20146.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "605c083d735bfb862276151c31a7fefe9445ca7bbaeca1774df7ce98fc8c8a0a"; + sha256 = "42564224bf3873526210e1c4f78e6711c50f61516be546148a9fd4ca114e104f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/vi/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/vi/Firefox%20146.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "283064355c9a02eeafc83576b861906946c7abe698050cab3dd7d1d2268383bc"; + sha256 = "ff5ae085ce628eb1a9a7ce6529d2ab836b316c5b0066d3a0016618e98581823c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/xh/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/xh/Firefox%20146.0.dmg"; locale = "xh"; arch = "mac"; - sha256 = "413162df2930513c8411632b03f8efad8f41167e2b89abe53506c35808d32dd6"; + sha256 = "357ff8c9017c71574fb8aaaa8966c967876222dfbbcc54daec07836078a636ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/zh-CN/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/zh-CN/Firefox%20146.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "83b4b16e61fd9ecc47ba39b059a815835b9bf381f5c760fca0a705c04635be2c"; + sha256 = "e453a4afba5a7264d0e84e8f8c44117cd040a4f9f368d9f9a1f6d3e6147792d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/145.0.2/mac/zh-TW/Firefox%20145.0.2.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/146.0/mac/zh-TW/Firefox%20146.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "831ca84df620e0b86104da8ae6bf0bd88139e175fe52632aba86571f90dc5789"; + sha256 = "062e51db97087a1e8ec44fba3625fac85398a854444d2189fee58c85215a93d2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 3bfbca592ae1..df74e5e63ae3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "145.0b9"; + version = "146.0b9"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769"; + sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42"; }; meta = { 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 95fdff409565..dc3272612321 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.5.0esr"; + version = "140.6.0esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "412236a25cbea171bd5bd535e45c3ba40957a94e1f8dd3ab74241e0aa1c4075fcb8d394b9619599d60ce3e4563e712c825fa8bec441794f229356802f72b2861"; + sha512 = "ed66657bd4b2d94791892261d7c0c0d950b4f630d12ab28a777d93393427451a9aa125e5a01ee15f2ac0ff378d0be074a08583dcffd35609112ba4e6f9ada798"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index f7598deeab82..70053aff19b0 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 = "145.0.2"; + version = "146.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "99d28daf7054c80bc521c8b73d1cf5c1beb77ac9b66904fdbb5890f89ddf5b12a2715deaf867ed86a4806cf4f44952f7bcceb38cc5f2faf9290b0a07be823418"; + sha512 = "db6664310cdcdede832b29dea533b345a3ac86f9df7813118d44b1ec2c4a32e4de2b6e98044385ca6f6026eb3a9994c486a1ddb8b6f4ae7589ed46b122c05630"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 596c2cb0a849..3dbd8f717414 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -43,7 +43,7 @@ writeScript "update-${attrPath}" '' # - removes trailing slash # - sorts everything with semver in mind # - picks up latest release - version=`xidel -s $url --extract "//a" | \ + version=`xidel --trace -s $url --extract "//a" | \ grep "^${versionPrefix}[0-9.]*${versionSuffix}/$" | \ sed s/[/]$// | \ sort --version-sort | \ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index a8f86d0bdd8f..72bdbf5398e0 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -44,9 +44,12 @@ let # original mozilla signature (like 1Password) won't work with signatures # stripped, at least the wrapped browser will launch. if isDarwin then - browser_.overrideAttrs (oldAttrs: { - dontFixup = false; - }) + browser_.overrideAttrs ( + oldAttrs: + lib.optionalAttrs (oldAttrs.dontFixup or false) { + dontFixup = false; + } + ) else browser_; wrapper = diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index c24ffd52ddf8..d5ae1a805672 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-/I2fEVVQ89y8l95Ri0V5qxVj/SzXVqP0IT2vSdz8jC8="; + hash = "sha256-0ZonR8pV20bBbC2AkNCJhoseDVxNwwMa7coD/ON6clA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 6a6241f12134..df540e368944 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = "helm-git"; rev = "v${version}"; - sha256 = "sha256-gMx61fhAaiYHYd/so65DEBKANZZO826AFLU1FIE3hSs="; + sha256 = "sha256-jgHFmANmxDS75k0JQIiT8DDw9nSppw1EZeEWM3jirsg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 6b3be9fd1b43..936af3913b05 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,20 +2,25 @@ buildGoModule, fetchFromGitHub, lib, + yq-go, + nix-update-script, }: -buildGoModule rec { +let + version = "1.0.3"; +in +buildGoModule { pname = "helm-unittest"; - version = "0.7.2"; + inherit version; src = fetchFromGitHub { owner = "helm-unittest"; repo = "helm-unittest"; - rev = "v${version}"; - hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c="; + tag = "v${version}"; + hash = "sha256-wArRsC52ga485rpm8ns99NY/qUZ/FImK4C/L1q460HI="; }; - vendorHash = "sha256-tTM9n/ahtAJoQt0fwf1jrSokWER+cOnpPX7NTNrhKc4="; + vendorHash = "sha256-dkAzmFvLbhbIYCKsk1+TfckdNkNh6OkpDabJDDSwXJM="; # NOTE: Remove the install and upgrade hooks. postPatch = '' @@ -29,10 +34,21 @@ buildGoModule rec { install -m644 -Dt $out/helm-unittest plugin.yaml ''; - meta = with lib; { + nativeCheckInputs = [ + yq-go + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "BDD styled unit test framework for Kubernetes Helm charts as a Helm plugin"; homepage = "https://github.com/helm-unittest/helm-unittest"; - license = licenses.mit; - maintainers = with maintainers; [ yurrriq ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + booxter + yurrriq + ]; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; - sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; - sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json deleted file mode 100644 index a17aa3bd84cc..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "d6a0e04f107d223795869aa839b1e504716c4d90f40411cc158bd565c4bef171" - }, - "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "616b23148d7f81128861aa3793e972ffc8419f7f674eab6b248bd9e33d805696" - }, - "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "46519a25426c7db9ca8828fa518c7918d26c1088b48d5b309fd77e81a73e500d" - }, - "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "082c8b305b73b1a678c1d6549b77eae1d44b2f954d07d76acf9c13181a0b0718" - }, - "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "8ff705955f8c199b92a35554ed3c154c37920a5c6e6a46a9c18f884b979ea391" - }, - "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "b0968e1bf34d1109572e3795bae315ae7609be69b1c1f87dc0d6fce072790fe7" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix deleted file mode 100644 index 211e796b63d1..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.31.14+k3s1"; - k3sCommit = "a2ef79f53538e58982857c1820469792d582e470"; - k3sRepoSha256 = "0rww4z63vf13g3rssqfmp9444bs1mzb1y6wddysqfxj8fm3kakwl"; - k3sVendorHash = "sha256-FBNHUk04m8El4oTyJMznv8eyT8DSt5Q3ypqL9qT/WDU="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.8.0-k3s1"; - k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; - containerdVersion = "2.1.5-k3s1.32"; - containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn"; - criCtlVersion = "1.31.0-k3s2"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 9e9699fcd515..7825f8173191 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,16 +12,6 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in { - k3s_1_31 = common ( - (import ./1_31/versions.nix) - // { - updateScript = [ - ./update-script.sh - "31" - ]; - } - ) extraArgs; - k3s_1_32 = common ( (import ./1_32/versions.nix) // { diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 7d612b59ef2b..a2d3ff4d459e 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -17,14 +17,14 @@ buildGoModule rec { inherit pname; - version = "2.12.1"; + version = "2.12.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; tag = version; - hash = "sha256-9s89fiBFIP6azB1SDCZkTlQWAQ2C6htQXRMvyWrNch0="; + hash = "sha256-C/q3fCcMMnqjXeoO/t/YOKHLq8HDNfF+x75nCcjwwvE="; }; vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs="; diff --git a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json deleted file mode 100644 index 726157c3583c..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "c10f3cc19a37702666270c30f4e42696b054e63c9f0d23d02404905a90036c8b" - }, - "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "6ba63ee01aa9f4e5d07dfc3f02a9665961cac47e5ff5121edb5c3c55cdef1989" - }, - "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "d615557c7ed58155e2cbda620465635d7f6b4297660a83458b37cac3fddc5b52" - }, - "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "473582b2f3e2cb0b55fb6477c24d4fe5dd1ea965c8445d8ffe91a9a5a08ea5e6" - }, - "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "b0a5e0f80d8d10604a00d73462f0a5792c9a9fa7e4a236243121804c5adfc48f" - }, - "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "1999d5d42397f6c78a55f79c6b3ddc7f91dd50d1038206d5c513c8691cce1b67" - }, - "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "c431bc15cc130222a31a5edf5bbc5600bb4fb28ebd4c2aaa040cdac51d909dbb" - }, - "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "203eff3588c6be74834d2f9f96d39285c8b3fa447f6e3a656250e05d9592d3c7" - }, - "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "7b62e18e0235c6af0f1215235352a493fc535904e3302c7794cdb88a281d581b" - }, - "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "19dedf7d67b3d54519ae9c458e1b3a67535a282ba3ecb40d23352239f90a8146" - }, - "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "dc6d06744322dd8750efffba82914ee7dbb76d22762248fbdae77941ca38ebb5" - }, - "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "10e4b6ba4ef381e0cd95be4a37df7a090956334459d00a54de5559fdb73ed9fd" - }, - "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "a5e3bd13c6ebeca25e203a84749ee76c62eb7fcab271cf4ecebd4b3448bec47e" - }, - "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "6c18213b9cf97623bcc418c56b167e1b67187abefe6699ce6756245b3daf28e0" - }, - "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "37118c56b2b6064a5496a807a4c9cef9622e5c31dc13e4a1486e7879f290d71f" - }, - "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "d935a702d14e05c9571dfbd7f0010f229640c23140d44110e1b9de01465a825f" - }, - "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "e1454cfbeb79a2ee467a0f822ca19f45ab7fbdb9842709153b1383537206b2a6" - }, - "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "84f1d386437bd0070e70632da6575e461dbe695b269c8638f9a3f6545fdab8c1" - }, - "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "091decc4ca3352f79372c6ca66cb972c9eab0b30f0c93f932676faa6f09323de" - }, - "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "76d38238a2c40acc3075d7c9ceb6ae045cf24d7a8fefff7af39cf495720c8445" - }, - "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "e676d8f1f5ffe7614c1d920ee90e1186ed7176105e3cde21f7f11afd4aa5b78d" - }, - "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "5425055034714708e49e32b2bd1cf2b7aa5e4af7fea193c6689034a50521c7d7" - }, - "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "e43895b604b7090ff32b21bf91dbd0167ea9b6f16f35e9c8dc531333523f617a" - }, - "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "707589c7bfc89d60ee143192b635ed77fb3e9f15267626a6b527bbefc89b4750" - }, - "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "cd42054b9a7fb1ebfaed757f074822f61f1ccb87bd18236822e9f4cfcd1bb137" - }, - "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "a463a8262063e875cd0469ae347963e25d3bf60446bb57ec1fdd854d966f8c66" - }, - "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "aa0f48a9c78f10f041d49dccefcd6d38bf96d78b8dbeee0aea439264ee1e13f9" - }, - "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "4e586d06fcee46b38a2cec900ae3c98743cc1c12896d690b53e41e2112cc8315" - }, - "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "7b4b0b183ade57a0ad59c84337b8ffa6b883b29da51685e166e5b8eb2016c03a" - }, - "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "c3b91061a1cae5972cd5c70203cc65254192f2839059e49b17b2707fc88865f6" - }, - "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "9481a4840b903bf3d5e02b011e59006e5f09a98d3459584c9b5616311a0ea594" - }, - "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "f20f33dba9454912688f4ae511ed6df050b6e5a1fae8887ec5d5d525aefc3c03" - }, - "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "aa056d8f9c6094c7afa853e5cd9d83f600307a90e7bafaf32d254ce401ede328" - }, - "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "2a1eb46396f6b88cf4a285d8fca2b8098b69dbc5d8a8f62ce5b5916a88b49938" - } -} diff --git a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix deleted file mode 100644 index cd914ff73839..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - rke2Version = "1.31.11+rke2r1"; - rke2Commit = "48500b495b74b976f07ebd07a643e40e6c89f355"; - rke2TarballHash = "sha256-JPoeNB9jM4h+K5vKWi2KQfPJPTUftxwXYJY6eZN50Zs="; - rke2VendorHash = "sha256-CxNo9HcxuSS0LWawefF0VbtMDofQUzoCzTfBhWAUVrc="; - k8sImageTag = "v1.31.11-rke2r1-build20250716"; - etcdVersion = "v3.5.21-k3s1-build20250612"; - pauseVersion = "3.6"; - ccmVersion = "v1.31.9-rc1.0.20250516171836-812206503b28-build20250612"; - dockerizedVersion = "v1.31.11-rke2r1"; - imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); -} diff --git a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json index dda48323d2f2..89f972132e8d 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "b11ed8a7d6f18281fa22c2c975adcea60d8923964a746588b8f83cb7e593d4bd" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "5d833bca6808595318f80bf687a5556ed0db7ad55d399a7e1f159f91f58c3399" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "8773f5c02daef7917a544b653782db20ae52df49fddf2ca70e1164ce6fd8aa6b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "68bbc30990d83a8a7280555f9ce633462582de888c03c7d5f6627b0052527d6b" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "98b57990b29331e421d0d84f485d52d9b92333b02b3708ae3b78ba4b7ad8d3e6" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "083e270c4370a420499c94924041cf8aa84e730ed29718bb8f91075a421f329c" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "9c72b863ba3a763057ffa2a4a47f6460dfcf460a542760781b44f5bcfbaf4727" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "7ba9e0774559b091a9d6b3587fb39e2c106078f2e412bbdadf6b2b1986060e6f" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "c432125be3c277ec1d767db7dd6cefd018192a167489c5a3b3a2230bd77d60a1" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "51ffc6c9b718b0d5d12b034b69dab0c2394f38131d16aaf0c3f16cd68bab071a" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "5775feec3b2c433ffb8617b9e978ded2f83c7c0196aa970e5663f8ac9b43233b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "d96d183a2265eaf6d6c9a7787cbb9a191d690130542de45b67389c390fcccada" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "605bd7fb28e45d98d46d10ee8a315cb5d731c85be702aa49040a16847f1980da" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "2321bf1b453615ba8a50254fb02f260e96bb1a725c1cddee848ef44a0a88a527" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "639cb3e058c8ca960cc4bb35c1be0020ee9e8eb9d2f320ba7a0779c65ad0ab52" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "a0285e10bd977b93218231511b3ebbc8913d848c2b77bed73ecaa72a06e7a94a" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "04ad4081586445eb1f4d7e67a06e10bbf6cbe4190caf69c5bc188bc8d430dbae" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "d89bb5e9b608e4f949375ccecd2685f7317dcea24f39ee2657769e8d65aa02ae" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "fdfcffe5ff252cb8601e9b5e4caf154b9cd37a507bb1df994d0f40700e98ace9" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "997ddd67ba6636a139bd635c594e71e16b6c3a06a3e2e6f5260abd9500831fd6" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "3d5876c9faafeb9d0e7cc47e9b2fe486af864e5b7bdeaaa1d52f6c035604e465" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "1777e1e63b9087e157541acfcc03db9ed9ccf96ffd48850eb850c03653629a60" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "6ff8d074c544c271d88764e1320454bf51803c96bf05112203b7405b171a58de" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "fa3c6e9bc5a36fca572f777e37d43f53d632240a0807206ff88411c6e05e39c8" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "1d31c04d5f1815887c5f1c3ae53e470d52fb00811f4051c0c37d1badf403dd01" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "771fbd5957d04cb58038bea2f76f83c34c2040083ab544318f0cfda76f4066f7" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "299003de558a33a7d95d692e782e106f2c0973cb407b186b7a6c04bcc5c51430" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "3b0ef04fa3f5384892b3d9cd4e7f92d1b4de2ee6cd962104e40ddacd9e221fd4" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "826957890ac520ab6ee17d0e42ecae72c59381aabf16b789b4fe0f4c29481a9c" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "30558605dcae858acdb9206e5b60bd1df84053b35d48ee6ef3bb6d4cd416375b" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "864573769173dd7fd8c3faf9c4b0a47f0f3c12158c9b9e6bb068d4120ca72144" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "ff9bc0790e2dbaf4ff4514cb387b61f0659149e9ff9b345dae2604be39eb1d7f" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "16e3fd809403b784fdd56a41a22af00efd306cdad9a0f4a9fa2b8a8963c4cbc8" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "978b366bffae9e2b9aae3746832123f9063c029b6c0100413ff759a998aec357" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "4dd9569e1dab01e03a44299c6af145311a881909b1346ecf50062d2a478fe98b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "1e3d3e7ed0c815233a2d90eff6d828483575fe120070632a03dfdad313e38209" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "8c6bf4d4b8b80e0bd9505f9866c3e599b235c5df4350da9b968c95d75d7829d8" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "fe48db6c1e28526c2963a6d104ed6dc51200dfdedad79dd7dae6796808539e86" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "10a052f1b922df3b09767ff70fcbb8a623be372413b8fd88514333b977b082fc" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "3779149f30cdadf1102080e4b4766be922cd31abc58489fe5f69bb54fb98b4dc" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "644de27ee9ba95d9a36a534878a026b78e8e8d8fe4edd411cdf5219735ca98cf" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "8d4d35d196c0661ee52bfa29583042e388613ea13fd52928b3cfae9d7581fc36" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "242854fda683b11fe8ce6cb5e6b6e21fa55974270f70b2c3ff112903f8b09daa" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "7118609bc2158dfd0552cb581735a57f1ed270752125f6e7a543dbaac77dbbce" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "83d21b5074a527214af4f2b37d1ad472bf34bebf68f661ffb3deeba5d54a81a3" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "58caa6f91d1cd6ae8fcd7b3033599c88a3d37544298a13322aacb10c2c9e1fa6" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "b9ababeebfc37e8d60e801a45875c5fcf2d99b516bba884c65d3948f42aa681f" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "8420e153021708aa947adb2a39e751227a9f2aacced5c782f8ba22333c46e553" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "9abf1e7a8924e1d2cbb634047224ae032003869de2ba6d3f36e61413cbccaecf" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "b41e8cee051759e1626b2998419da06e91a713063fb55c2a26dd7fdc7b34973a" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "a89e6da9129fa0a95e751fc257a0e639f64ed832fb761ab4195d34b4aae28203" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "2908a31ef4d1d43940fc49279c5845a9536c1fdc5bb0e7a831f2e0bf4e6e8977" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "4a90df11d90c9f6f931051acb350eff153c2249acedc4905fbb1d56da2edd7be" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "9c7bdca941237c3cb8a18f606f6b62a890cf2b59650d4fb594f0c8b6f665103d" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "8166aa4ce63a150ba4c7b0f11072c7056158fe717ecc4e77c4d36f3e00b1bbf2" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "b7837f58c46abbdd9a0fdd810ad7fc660593ed38623342287aba6759e21583b5" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "ed596697022cd45639f3e9c5f8177772c887e9f859c1feb84f477d4cf1613c75" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "cbcf55b5e40d15557a316178363620d8d7bf8d858f73bed6081de82de127d51d" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "c6f75af96804b8fd5117a3986af5490010898d80a75697f72d9cfa58864148fd" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "ec1f4bf39d610276118048b0e8230e3d7079dbdcf2dd00ad7469c317b052d857" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "bd5a186c619a36b84c0cc71688d1a0e1e08f495668ad17aa432e00f891c30abc" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "04a242d8aebc07acf39758d5d93163ebf1efbeaf439f1e4f8e70775039a001fd" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "9f6ebb92eabb6f1ada3c7fb96b3e46874e3eb463f6ea6e4dc84e3dc357e990b0" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "62d3dabf8f62c7a98fed3aecbd88adf7ed8858a059bd1a4d2a31c175f119b6e5" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "65ff8f1fdf6c36986547e8466abe1d5cce01e974c33320119057930401c42564" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "75ecd15d83aea5e9068fae44a8f1a0b272afec8a3155f117e3b0d4da3e0a9277" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "4ec0dc77fdb25e7a2a5b85b3882d18962733915fc6bd024db502ceab50b9df41" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "d1a5f823829f1045948f5523b6156329610ed74c0f990f42ff8823a4988ffde8" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix index 75247067fd61..adec28e0c056 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix @@ -1,12 +1,12 @@ { - rke2Version = "1.32.9+rke2r1"; - rke2Commit = "d00da43053c862ae59b91d94844c4addd5bd056f"; - rke2TarballHash = "sha256-rpSHXLM06IckB3Je6Nx+riVXjd4stU4KcO9Sid/rSK0="; - rke2VendorHash = "sha256-MbDVrlv0FR8MKMpi3zjGx2PuAgvQzzwb/JBIWCVUcsI="; - k8sImageTag = "v1.32.9-rke2r1-build20250910"; - etcdVersion = "v3.5.21-k3s1-build20250910"; + rke2Version = "1.32.10+rke2r1"; + rke2Commit = "7a87b5095b6e5c8e73bb1524082a5d644dd5e46b"; + rke2TarballHash = "sha256-GDh7n5xAkeqbE2RDzj905fAf+ip8EU2pcpPPjWKQ3AQ="; + rke2VendorHash = "sha256-Hy10UPKyEU3enEitRchbLJILqzFa++7HlFkxth5pBag="; + k8sImageTag = "v1.32.10-rke2r1-build20251112"; + etcdVersion = "v3.5.21-k3s1-build20251017"; pauseVersion = "3.6"; - ccmVersion = "v1.32.8-rc1.0.20250814215348-fe896f7e7cf8-build20250908"; - dockerizedVersion = "v1.32.9-rke2r1"; + ccmVersion = "v1.32.10-0.20251010190908-d439f1a03318-build20251017"; + dockerizedVersion = "v1.32.10-rke2r1"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json index 662cf16e64b7..9507eb0bfc55 100644 --- a/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "4822c109b63d16e6e43f9ba2a6a63c3c95d845756319e7fb357c3975bca836c1" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "09c368f17a10e74dafc68188a5548011e7605398d36331699554073668c0e1f8" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "83c9a7ce50c43727576bb6386197ec9631b2ba82e7745200e2dd65a4cd91cc3a" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "70aa654347b671a3674e9bdf4f027423f441f35bd352a62302cbcae0ac6a9709" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "f9b3d1f0d363e5d4f64ba9d374aa62236e6489765c59d84ff1c59d031245bfed" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "e1bf14ab9ee37d236d5d81d298ae305f52d4b704326cb34b328c993a05110561" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "382eb06cc51f8a1298ccc07f4cf44c31fab3bc874f63373ca2952a9a321885cb" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "bc8b6bb30393380f9b9d115166a7f6c6424a9f75087bc6cce50788d4a85561d2" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "dd2a8599c63b5e547903f5c8b5ad0b328a31730b42120f1305d3ce5f942903cb" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "9bdd4622e92b0e77d6d42b17e920697024cd5429a67268af1cb69a2034aed8b3" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "bff7dfac0379c578d0804a3bd12efd689e189254c9d6a687fcf0f81e308a8d57" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "02d7fbfa8cf6e77f5aa98191f7698bd222244f749ec6b79a7d5cf7c62c86f66a" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "f47d9b067b4224342e3e54bb1d510fc09c43c7152f41b600c36f0e9f2f2dbcba" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "e28f38bce6f1ce6230f5ed6d7ad69397832d7cd7dc705b6221be2d152aa2ca6b" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "2012d17feea12d0e435f91d99538aa55d7b1d6f90082cf4074c4fefab9099c86" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "715c828e08936153f6cad0730474637c64e8c36e686ae2200fc14cc1bd9b040c" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "82acceef684f03a33527519c13cb16e587bee4466f4276b97def6ba20afa50f0" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "8051ec537f5a7cda0a069a4016e5cafcc5edc004543766767ff3fbec5fbbf12b" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "1da7506dae7f1bf4d9fe9b5b9b6f8be3be86346e9731c741d97312fbf007cb76" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "b933b21227faf6a55cb5535d3f010285b13fe54625b7890a083393f9a6b90ed5" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "d8051096f08c87b89122a10098d53b69cd12ff9d9a1c18845de4bd3c4112e9fa" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "ebfd5842d93451073438a44c6cf56285141005260c201f151aa09bf1b4a27c81" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "af68e29bbdcf50e2bf5c6e61baf8b2f572768379b3078d61458ecb11063d2220" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "4c4106746308370e57ee239a63308111eac17b2cfd6b31f07c49d8a97055ae53" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "e94597c1c91aea6e44fbae1b83311f81421f2d0f83ebf2fee17cd2f1685d0aaf" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "b8322b16df2ad433fda09cb78249ad938b495a769bae5e27b914bb2542c13f42" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "d1f853dceca9c667d5f200f1e26eb1759fbbb1bfae518e8f1ea7de5d6e40ac3e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "eb01422cbf955d11fe74eb746fff891579d2db62666e788dc82244d7991fbcd1" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "6441911dd26588f5ed29d86a7135a144e762fd810b4585dc2d97288ad97553c0" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "3f5d7021b071f63fa0ca4084367c36b0886c1e59626b30fbbc434065b047c80a" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "41bad41da37733ccf2873b8d94306aa00578212c131df54a715c1e323f03b0ef" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "e26daf41fc76f6b5f9e2285a459276a6302af9b72fa85edc73d76d7daff2b114" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "dc8824d892e7142903bd6b5cd41367e02827272afb81cbccdc9a933e1048dead" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "5e48442961327b025a309e7e9e0beeac3547de034fc267b22d74660b91c363b6" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "e22eeb26de0492cf713a7c48df947ae5f6b3e1017d28168c644495a7cc2b3b00" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "8d5317988078acc47163e7c5774b767c1b26e7f43ba919fdacde05232d589a8a" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "87f8e503251399fd2832b7eb75a554167f6c67a82535564bc32129d177283730" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "67c0713d617f1840c722747d802b5a5a47a58d7d6ed5d32f822965a546589bd8" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "7c7bf52ebf6cbe10b877b407a86a2f435d5e8246121bd8f3e4f8ebaaa550b71e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "aac6c722f7d07c41eaf80deb1bf8719cb93963fb9d713335fe8c0aef22d65d63" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "c55124168e2f3a0f8f3f7304c82f837627ebfdec9c01472b569dc97d0546fc29" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "5eb3e5ab6b0676d7197da756b46f94c7c9eb096d4d79b332eb74016f40136cb5" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "581cb09d9f8acc6d83dfe07ea822b0fb1d7d2a917a12b98aa3aa0730fe5943c8" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "f52fc26611fa766ad6781d295717199d81f0a21c2108bd333902bb5887689e89" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "647a27924c5dff0557540cf35921756edd07f8d5bd2fa525a0f06ea056d31fc6" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "612030145cc28528aebf773795deae0c2dfc83eddaf9b90179db978e6fa66330" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "458f9cc70fef19d2b27294b9ac71d2a81166edec25455be67eddbc995b9baceb" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "83501275b07b2632abbde646b07675bdf509dafdff90490f35af4d6cb402cd68" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "6187ad2bd870cd34703e62145907985bff67bfc6b6c878da6399d4a1b2a1dfbb" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "734f2833d156092afd85b0106779ae842745d71e4e226120d2450d9ad894127b" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "856a3622e66860187188ed7662048ae3a1332bec1fd06784417c0be34cb2fe8c" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "5da8147e6330b3b60723734afb5a2cc70a67c6282edf730f6bd3c1f2d89958e5" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "32e852248536b9a76514725e7f688d54b2161730bd1f6cb92da4dda407ea57e4" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "bd6e3efc21b83431ba3d49a8ecf514320046ce9ba5b35de6241ffb549883d2c7" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "83d9d2bb5c4f9ef6468a81d7c1b71e0987c3b7543b289dec8ac7cce61598a923" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "74c60dfa064c4ab636a15378d082338fe245875648c4fc2522905f81b9b56154" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "b0329bfc9974b5ee100bd2fd78c1179c80b58e77b20037366a70b70502e39c4b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "9c03f6d933412f3c084e2cccfcae0bd2f2da5833fdc9bab1d5a38224afcb6013" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "3f52786ebca9038b346c33d721448fcefd372af40d06a5b21aadca12ae888295" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "fdff38dee1bdba17f047c1d7575d8ee30ca4da36e54c856829bdc019d74f17fe" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "60395e42d368abd3508e29a1410fafb525d15d458802f730df4d061400e3761a" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "b990c68a76480620275a55f0db199aed84a2415add3575cae4ac116197ad4481" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "b3f78df17a070dffd0a99ec23f5f1ce11d878fa226c9659e8f60b8d4fb110335" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "a1e35cc62a5c9c16b5d9df99ec3a467bcf7cdb22c778435baa784ffcb13baf8f" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "a890298fc1652bc70e143cff75fd1989886093a28ba58231f90aec02f054e743" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "b73d6cd9caef5bc6617106def9af18c7bd6a56a68b87eb0bf3c107eb62a7b011" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "df84a62568b0ed1c3a764a7b66e929fdaa94724d3b0917d0df68bf0323222363" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "c9162d55c1129e83c1af956c6a0b9173857f0b2bccda889955b490df90578223" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix index c18b101117e4..7bbc0aca001a 100644 --- a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix @@ -1,12 +1,12 @@ { - rke2Version = "1.33.5+rke2r1"; - rke2Commit = "d1092839cf08cb901b1d40461b0fa6e7ae6f8fc4"; - rke2TarballHash = "sha256-u+pSJXcQ2KGs9VNi/ikV7lOVgwOeLBjhS/U3zwHE8ok="; - rke2VendorHash = "sha256-UouTBZUve+0dWzJU46rKGfo8BE/pYS/JSP9OsJnGGLM="; - k8sImageTag = "v1.33.5-rke2r1-build20250910"; - etcdVersion = "v3.5.21-k3s1-build20250910"; + rke2Version = "1.33.6+rke2r1"; + rke2Commit = "2c2298232b55a94bd16b059f893c76a950811489"; + rke2TarballHash = "sha256-K58K5jqOtabjyG1MIfvnaMo4pePgWaAd9SQ5BCNo3nw="; + rke2VendorHash = "sha256-taNWaULzVE3d4MhHvet3JFH3Mb4m/8no+DzIhqAjyVw="; + k8sImageTag = "v1.33.6-rke2r1-build20251112"; + etcdVersion = "v3.5.21-k3s1-build20251017"; pauseVersion = "3.6"; - ccmVersion = "v1.33.4-rc1.0.20250814212538-148243c49519-build20250908"; - dockerizedVersion = "v1.33.5-rke2r1"; + ccmVersion = "v1.33.6-0.20251010190850-d6b5244412d1-build20251017"; + dockerizedVersion = "v1.33.6-rke2r1"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json index a4b5f96c040e..f4e979d1504f 100644 --- a/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "44daa073cffc8ff77ac45bc9e37baedb8407b2d47bc155bf21f4d341f5468174" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "46f81e8114ddb829352d83ae3c45fc533659d474dbd19aeaf05971321885b9ad" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "0e933785d49b17d0b6b4b44160e6270cba1ec8699c009c44cc819639fd112710" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "2da3ed0859fa19b86deb78f39f7d4eea40b5322475d367bf95c2ca7ab3e5876c" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "7ba4c7932499f70738cea4ea5bfe4b2bcfadbff4bfffd595a042647f05830cbf" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "7166499d6aa70d2e08c2088db2edd7ac6be61dafbfcb7279767faad1608b4b06" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "cfdc02e557cb1f2e522e4c2e3d9935bbdbe45b256c2d9f7c5c1c8b30c7771092" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "858ab93a661a028d09f389f3b67cfc323dddb488976dd0a7fc6a98be352b09e4" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "e1df8a2f3387a8afc067534da042a1176f7ec76f935933ecd5753d6ca2ca204a" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "7d336b65888212130ccdd572343ebd806d1332b061ea210204c32d98c5e1c790" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "e0b97661a252fb2010c5475623e3c71c805769ad6f07934e4830737f745de0a6" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "c3e220b89fa78ea6522aaf8155d0c3d3b75521932cb412ffc776572e1731eefd" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "88bc80873be8c296f8794dd859f964f9fc56adc5cb7c1300fade249f9b6ac7e9" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "231c685f1412a67631aca0dac648e0484a23d219318eb110ee4f2b857dd734c4" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "c58aa1dadeaea61a62255bba1fc56be37ade2b9954ce92d72bb84946e7de316d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "05449ac08f395ca1df496d37d50cb2531b1dea73074e0eed4d46680d59c723e8" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "f7246b4da22df4aa3cb61bdcb11a11e25d08baae1397f02e0a91255ee6936bbe" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "181714ca655d22b4eb2bfe76f87ec94e86dde2e7b1d8770b9497ea4c987d81cd" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "dc5c2aafbff644826c122d4f9fff71d58054798cec254736f4600789ff20e3a1" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "bd32f93fe2abe41f404789382daaeedf30e609fe681bb8320e2ea1a3e6ea821a" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "efd5dfdd8e3c150bbe1f06b88421c3b686f62ffddfeb622d3fdb0ccd6202445d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "7638a5cef90a4d978b458e6e01604b902e90900dcc56c98e0693555baf7810b3" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "6a701d26e01d23e919d9c39be490a40f8387c6c43d12df22ae1a6707f598ba1f" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "30fd832859920a01768c951dde0e91261a543c3cf59448324b96ec543532a7a6" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "4d2d03bd545695993f6596343e3a9988c74a7d654990295c991ff7f07ce39bfc" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "429f4447439d293cf07ca50cedb64e2611c113ce0019abad82485198b57a2fbb" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "f2d9d41db5cf1699f588bbb9fd5910989492294fab33601a592af5dfb51cf809" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "a60e746be8075a67f2ded0e2beff192346fb0779f3e9896a86b20c3bb0a1ec36" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "d1a752bce2a54974453831e4ca9bf3e826957ee5768f6ad5f6c541a7a0c839a6" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "e1814a7f7f0f10c029e35fa3b49b9ede1039d60e47dfb1c17d7a730c4f7937c1" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "966295c7f54cf38169cf8c2b785046cbfe47c6eca57c95c9e526a1464b6bb78c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "83410a65484d691c280ee9fc29928dae53890b4623a2ffc2482b12c646fb56a9" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "17ace9aa358a8b613ea10c495c973ec8d985d4c959aab31abc59d91b15f90a46" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "45767364848ceaa3824d9767dc269d2c042d4c73861d02100dc68d5e423ebd9f" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "a74dad72c20670c1c16dde96f59fcf2ad80006325d0a829d955d4b512ef11b1b" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "cc77078e84b41ddf77c2eb7cb03e7e3fb6f70e07ada84daf2fdd553093aaa9b3" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "d4ffe9eb09e2f3375775982935f768afbf600e6073af0416d926b2c8315795ba" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "350c22c1980745d86f639376f4567d1da65488288cd1b85d0957c52bec8b2a4f" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "e46f8b0c0db64c70373c1b60e876580edaab6b4941ff6aff8740ea50985a2a1f" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "056ff1ed67c6fa75dd9653cb98d785349dbbcd7c4f47ca0847b9ec890f2e0afd" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "5b9f617297b41d71563a12def0ee2f45d54a52512da3633b7869e498f4a17e50" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "a876cfe3af3fa2630489e836729948257deb1056c0ad11083cd9ccd516f48ed0" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "e02124169205911a2829cba064c0cd6230f62f676473676a6fbef83135fffb35" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "8447aaa2c45b753fd37b9ea3e49deaa0e90d207c7b53d4cb53dd3ab83f7e25fa" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "8692250cc8876241bfa011035ff96a80d279b370952c3f3432077f12bf0a2151" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "5f957df8553c5c2678342e8138ef30f81483be94e1399c0f0c8de4e7cc9c0fda" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "ce7ddbfc7b39984359fa9b141eb98711e5783233e5d51651d42966fe309761c1" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "639db539e8e95ae6ff25f4af54b47144784975a06ec0091c52dc48606b79dad1" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "f2982e79105b5d8de817d067757f1c13575928d375ce8aec2d3641013eddefdc" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "61f03dbac2a3911d558d0dbdf685966d26982f799e837256cd7f9d353a00dd2b" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "17828e0567b04f538d34c373849e495a7f9c493c4e22128256f5edd403f5e779" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "8e2cf0a062b8b704f612ced0751e288278f63632d9444141036da933d847ebcf" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "d5d442a10b63fd48eb10a1201e02c8905a582acb662c34e93801222ae8ee198d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "a67e9317749743a30313bca5c919aa7300b83513eb330535669b411beb8b6220" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "4029375877ef6e5eaf5ca19d0dc283ae9909858c3c4c47dbf551d76de2785feb" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "611231207174f2c90dc767296d39b3da6c81acdb6809add4bb0e9ecf32c3eecf" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "67fe7c0c5a02328ae69556698927d5f21cc93a4203ba0a4a3656ce32074907c7" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "6d0d198443f3102a0160179d57645d98888ad5da4a22e7e3cde78d1661c0e0b3" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "e8db873c40c54e8352a555a8ad88abcf67c09846477f1a687bb33a2b8ae0dfa1" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "55e06739983ea113870d5e161797ad7fc9a045adb7424c6112b6fc7ef77f4613" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "9eb5ad3cf825ce353eaa57fc27e1fef90e08a582b524774006cdced526c8f4a3" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "34b8bd724ed79f471b5cd0f739cbaf6d6e7907fd2ea0f7fd9836fbe4c9d85d1c" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "939587177d312d9e34448f9705581bcbabed8ba9ce5d4448501cfe54c66e6b52" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "5a58a01484e0f1e1e5752cb303bf1127897a252ac3b38c67f29e087d5178364c" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "0b9131f7cb9fb2a4598889d5c10c9ff900556d0e12c7770cb022ed766c55705c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "887fc456a3092fa085081432a24600cbffa5118d0a04573e24c8dc040311d49b" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "4fe9904f0f11245f12cadc8cd6805f400a8a21685143522b246135465a85b188" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "1f159abf894d00e9aab001efc6ea7cef34ba8ce9a4c2e9ce4f1162860c57d25d" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix index 40072eafcb7e..fb39c241afdd 100644 --- a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix @@ -1,12 +1,12 @@ { - rke2Version = "1.34.1+rke2r1"; - rke2Commit = "98b87c78e2c5a09fd8ff07bcaf4f102db1894a93"; - rke2TarballHash = "sha256-dRmIDXeZabWxknqPod0RLZfT3I20llXELJhuQgDQHIc="; - rke2VendorHash = "sha256-i8VS4NviyVxjTJpsO/sL9grYyUzy72Ql6m3qHbtnLnw="; - k8sImageTag = "v1.34.1-rke2r1-build20250910"; - etcdVersion = "v3.6.4-k3s3-build20250908"; + rke2Version = "1.34.2+rke2r1"; + rke2Commit = "5e3fff8134a5269977762be64197d0cb9b26b48c"; + rke2TarballHash = "sha256-qd8oD51x2tiIRLWWA5rWUVp/stBB2ebe8dFIB5XuZME="; + rke2VendorHash = "sha256-0qsCo/9kttOaFqOwfNfwxaG9z+EAdk15Dde3Gw5tK98="; + k8sImageTag = "v1.34.2-rke2r1-build20251112"; + etcdVersion = "v3.6.5-k3s1-build20251017"; pauseVersion = "3.6"; - ccmVersion = "v1.33.0-rc1.0.20250905195603-857412ae5891-build20250908"; - dockerizedVersion = "v1.34.1-rke2r1"; + ccmVersion = "v1.34.2-0.20251010190833-cf0d35a732d1-build20251017"; + dockerizedVersion = "v1.34.2-rke2r1"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 91ec86ba707e..24e1550c065d 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -5,16 +5,6 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in rec { - rke2_1_31 = common ( - (import ./1_31/versions.nix) - // { - updateScript = [ - ./update-script.sh - "31" - ]; - } - ) extraArgs; - rke2_1_32 = common ( (import ./1_32/versions.nix) // { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0485582e51ac..e6f2c83a8d1b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,22 +45,22 @@ "vendorHash": "sha256-weHY7ZV3HaFBYlDNhwAYN9vDItkI+wtk9UNlM0uuwfY=" }, "aliyun_alicloud": { - "hash": "sha256-np2BlBqLTmn9UEatFhj3rn8/CQSyPfszL8cY6mDaGFU=", + "hash": "sha256-pDbTdKYTpRBN/o5bWg5VRfD+AJNhpqIWmGpzMAaHfAg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.264.0", + "rev": "v1.265.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LSvX63g4GWcr2Uo6H50dOWG0XWUhmbhUw9EYsQqs+HU=" }, "aminueza_minio": { - "hash": "sha256-ey2+vFfa1sTc87XRSlEoV0OjuEVqs3fqZ+U+uwyKzZk=", + "hash": "sha256-7nBNfOBzRJ2DkIErr48vTEkn1re7e2DapSx1RBQNZTc=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.11.4", + "rev": "v3.11.5", "spdx": "AGPL-3.0", - "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" + "vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA=" }, "auth0_auth0": { "hash": "sha256-J2fMZBWbLL4hEPTqN7aKrqSOPQPA11NGZ/yILZQot1Q=", @@ -91,22 +91,22 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "baidubce_baiducloud": { - "hash": "sha256-1iOsY90WvcR6ZL9ZgkDr4ctKUZLgVsN0kzw5vg6O2Wc=", + "hash": "sha256-YgHhxjnfk9Gjj7FKJmu2V4otA2CoXL6lUlzxDwY8LF8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.22.13", + "rev": "v1.22.15", "spdx": "MPL-2.0", "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-AznuJTtvnvUdhumCFaeagLr5NAVYEYISNuwe3s108mA=", + "hash": "sha256-HkTq5lG9Huh8kHZW2wCFIouKqG3RgaY4IzQrMTByooI=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.87.0", + "rev": "v0.88.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CPoYKzVha42Xfp8S8fdcHKGjL1y6pdsHsi4grerW7FI=" + "vendorHash": "sha256-pVnG/pfhkLw7evZte1+x1vS6yVvfMOtWsteDBKqN/2o=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -118,11 +118,11 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite_buildkite": { - "hash": "sha256-0jxyoT9cKSNetA5bE455B7JN6izrRAS1EvnaN0RvA44=", + "hash": "sha256-tADvbxvLl0PgttK6x4Ngjs5UtteR9BCKJOSoX9oc/w8=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.27.0", + "rev": "v1.27.1", "spdx": "MIT", "vendorHash": "sha256-IsviKF349jAXs55wadqWgjJMgwcAhU5MqZ0Tg9eGjeI=" }, @@ -145,13 +145,13 @@ "vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E=" }, "checkly_checkly": { - "hash": "sha256-V5k+UdniG7v8obDXAtvRxTHgJa4I9rbjDsG/QrCxYTo=", + "hash": "sha256-EYZoQTALazHWOj0dL3cDbgs/sNGkuPToWPD3hQeOcQA=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.16.0", + "rev": "v1.17.1", "spdx": null, - "vendorHash": "sha256-E0XnwBMCfyP6sbBFkh+ulNa3fSaAGa5lSUD/PIfKvhE=" + "vendorHash": "sha256-QOBjpG2pv9ngzslBIac15aWh21o1ctkM6ODC36H8bXU=" }, "ciscodevnet_aci": { "hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=", @@ -181,22 +181,22 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "cloudamqp_cloudamqp": { - "hash": "sha256-vhl9lROCRRM3g+Um60SnckViimZADL+mEzZ/EbsZDwI=", + "hash": "sha256-gYCVZ6CmiUt2X1za6/xjtRbnVRaAIlTt/whhBrP6q6E=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.38.3", + "rev": "v1.39.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rVrCozbmMR3rHA6oLLha6gdYEaFXD5r04CqY+bSWoZM=" }, "cloudflare_cloudflare": { - "hash": "sha256-CSTMb1pXG8KajJx+i+lNkUTEkH2tdXpv/zTluuKlQ3I=", + "hash": "sha256-+sp9u9Xl5MvAWjy5efA4CgL94yprCcBP8yYEPcVifgQ=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.13.0", + "rev": "v5.14.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-fWOC4Q9bqm8LqL2pSFeJhZrB6g/32xd4O1JIHXJ8vok=" + "vendorHash": "sha256-4OHJyp3Tdf/RpXFMJb91a/ygsb54pNzMtMi5Ye2RqOA=" }, "cloudfoundry-community_cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -300,11 +300,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-tfeSP2/3Eacvw5IfidiWqds1Z0DFwYRIj9maTGT4I8Y=", + "hash": "sha256-gip5PGqFtu0d5JYX8Ki4QeFWPQA3eLuRWRriJQcJaog=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.69.0", + "rev": "v2.70.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -462,20 +462,20 @@ "vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws=" }, "grafana_grafana": { - "hash": "sha256-/ygaIYisQW6Vx33KxoKHeZKo8OkQL6jcjsTomVGUCr4=", + "hash": "sha256-+LMaN6dmXSlFuu2jM/Ye1Pyut/TQ1zQ766y98hFQXHs=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.20.1", + "rev": "v4.21.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Nf0aUnV0jLNnXAbWkRYwG/DIqQwZ9fFlwwmE/cDMbGQ=" }, "gridscale_gridscale": { - "hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=", + "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v2.2.3", + "rev": "v2.3.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -489,13 +489,13 @@ "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" }, "hashicorp_aws": { - "hash": "sha256-3kQaeo+WisaBYpMhq/HGEmPDydW32VU1NEg6dIAkpbw=", + "hash": "sha256-OP3vYRhNvq3pRkem2wWioc/jnjn0neFu40DDfIGHcXU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.23.0", + "rev": "v6.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fgbcrOkv1sGMB8jyhFNo/kngd5VI2d7zVuRNA+Q6Ams=" + "vendorHash": "sha256-WFhO48sN8sLRztMBZsGRzOEJO3gi6j5o6wfikiFwuJM=" }, "hashicorp_awscc": { "hash": "sha256-G1lIrWSG5wnPv2H5C64I35M8K+AOwn3hlv2rjAGBPAc=", @@ -516,11 +516,11 @@ "vendorHash": null }, "hashicorp_azurerm": { - "hash": "sha256-t74oNkRchvTn3eletKAFlriOn/BOFUwNLK6NxILawpg=", + "hash": "sha256-/q33S2+m7C/ZYSnTqb3NDVdPPufSWTNs/3JlcGc9JCs=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.54.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -597,13 +597,13 @@ "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM=" }, "hashicorp_kubernetes": { - "hash": "sha256-QVHLGLTzr39liRcM5AKJ0unYoc/DW2elcJWisiHC2pw=", + "hash": "sha256-v68Tg6X+fM41dWAWY/b3RSRhzm7l7n25tKwDktFXxu0=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.38.0", + "rev": "v3.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LeMFN4pOJotTTqakEbVelHSTEb4p7CQIuKzeuX3SZUM=" + "vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M=" }, "hashicorp_local": { "hash": "sha256-Mdy4g8i26JeYd7MDZth5WRvKVWM7xpgd5/JHG9+Yqs0=", @@ -669,13 +669,13 @@ "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U=" }, "hashicorp_vault": { - "hash": "sha256-a3lCdcEO0i+xaWv/CsKcxOcGnVFWuCVWmuqHOR2tds8=", + "hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rpyfECDw9kXpm9CxFSrn9aVXxWMQXF5ZJdCLgAtXGlM=" + "vendorHash": "sha256-4ak7PkjQi6Nq/Xv8j3iKV8qB9tEfl1YxDbwlzTs8xBY=" }, "hashicorp_vsphere": { "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=", @@ -714,13 +714,13 @@ "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-72yJ6xqQLVAzQ6eFvYibJLVUoesYXLiAOM+WXQiP8C8=", + "hash": "sha256-S1Azsq42GEqgpqVB3Wpi6EJAL8x+s+i+oTJFPQCVfeI=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.85.0", + "rev": "v1.86.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pV7AMMGY6wAt9spq7v6w/CR12s7kTX+Y/6xqpZ84mBQ=" + "vendorHash": "sha256-IDv2L1fFqhbThc3kO6UNM+6hRJ+DZkT7voc/m3c5BCA=" }, "icinga_icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -741,11 +741,11 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-nQeuHl1S+iyTFKUwFQFIYTUYixxJt+ds12oaEiG1KOc=", + "hash": "sha256-WXvb8P5hN9P91ZrpDB9fuGYvXqhgfFbmPtx5irepJ+8=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.8.3", + "rev": "v6.9.0", "spdx": "MIT", "vendorHash": null }, @@ -859,13 +859,13 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "lxc_incus": { - "hash": "sha256-N+3OHJGK67iITA8DGDMZSYmCdkhPkXRlv4NzOLpu4y8=", + "hash": "sha256-OznwpRtSxf9XOJLjO732bwVh0dclGHAFuFUKGUdg3Xc=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v1.0.0", + "rev": "v1.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-eTCRjnC86O2q6YZj6ltOfiBKbFCeFR1zsF3QiJ73SYA=" + "vendorHash": "sha256-5FZFHzZGjIE49cszj5aeTDJRB7JXK6vLlsk8RJKRMpY=" }, "marcofranssen_dexidp": { "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=", @@ -886,13 +886,13 @@ "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0=" }, "metio_migadu": { - "hash": "sha256-WEgMbkB7NRv9z0n3C8pNCkPzy1gpog6xxseFr3kHRcU=", + "hash": "sha256-XQG/6jr1V4k1ZK/1dIdiFYkTy1t64wlWYtJk/eT/UhY=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.11.27", + "rev": "2025.12.4", "spdx": "0BSD", - "vendorHash": "sha256-RAM/3IDQaigS+xNZYkg7Ftm4MPP1FMiiXwd5y31zJzA=" + "vendorHash": "sha256-AmxcVO5mk9Jc8owEUQ2HDPxcYWMDMQlwLBBUCNihl1A=" }, "mongey_kafka": { "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=", @@ -949,13 +949,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-mRGLUSHwPu5U2vH8ZCHiiv4a8lrQDts32G5C/shpsc8=", + "hash": "sha256-3ZOttg3B4V76ke2RcQzxUTIgJx71lDf4MBDkRwMvoOM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.76.1", + "rev": "v3.76.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-SUALSNpd/d0chLtrCpzMTJ63Iudpf45DittU30+jark=" + "vendorHash": "sha256-qWuRxVSSIxJ9RwS5L5EHnvabLYfNcv6d+Oiox+SPyTY=" }, "ns1-terraform_ns1": { "hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=", @@ -1030,13 +1030,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-dKeoICBZca/IayPwX8HedPl+HgemC9IHPzzKlI8281Y=", + "hash": "sha256-9VqBRIaEzD3BBJjef7cXBCe2rVGjtzv1cTS6XxiHT1Q=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.53", + "rev": "v1.36.54", "spdx": "MPL-2.0", - "vendorHash": "sha256-JH7wPgkGKEUBOgv09sz4rfJm+RJQwy3Z2dqHxrF8lZU=" + "vendorHash": "sha256-P2d+naXmiTmX3dahOegW+24UVKePi8lauTpEpugVTGk=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", @@ -1075,11 +1075,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "pagerduty_pagerduty": { - "hash": "sha256-3SqhkSed8aO7CP4ONj02ahm5V9xV3xyRBPn03A7xlMA=", + "hash": "sha256-K3Gr3ivLPMFqR10HSino/ZlsYWNpDzyJalx6orTVa4k=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.30.7", + "rev": "v3.30.8", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1129,13 +1129,13 @@ "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8=" }, "rootlyhq_rootly": { - "hash": "sha256-2qDsqHwaTRfzTiMvLeTMEpMiYZAbL4yGoAOPZt73Wlg=", + "hash": "sha256-K4wkrWJK4a3uf9d0TkNFjmPdgLmwj6xGbuJjcDhsV9U=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v4.3.9", + "rev": "v4.3.13", "spdx": "MPL-2.0", - "vendorHash": "sha256-/KIUDgjyfZLyH8bTVbL0onUEXBR4nWemkugUykphqbU=" + "vendorHash": "sha256-IWhhYt1T4J5GNxj1LtbcN09L5hCntQa7swRWnK0Kjng=" }, "rundeck_rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", @@ -1147,13 +1147,13 @@ "vendorHash": null }, "sacloud_sakuracloud": { - "hash": "sha256-BNwGibmt6Ym8fqYtM3pB++Yo33LvOSBL+CY/FmSW/r0=", + "hash": "sha256-DQLchjPM3XIhVDD6fLFp5l3ZCnHU/P3wtUGy2XAp0M0=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.31.2", + "rev": "v2.32.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-b1ziyrDKVUbTrN31t1IRFcK8EjsDSBP4FfArPkHKlBc=" + "vendorHash": "sha256-zSzRVv7m+WxRqEpAhSOHATTh35dHnuFg6W5/PKaoTSI=" }, "sap-cloud-infrastructure_sci": { "hash": "sha256-m3degJZruqRkA/lSnNQrLfJIlpl5k8qCpbyIcsyV5/U=", @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-v+yPo9ueuhC8QNEeiQGngk7o5t+QeIJaxqKE5Yb1eug=" }, "scaleway_scaleway": { - "hash": "sha256-QVl06Yzl2QREcAIlyWeg0elq2yPL/VCgIM/OvOSELuI=", + "hash": "sha256-V0mR72RJa+DgWZxnvSCWI6HwZpqewbHT5FKLdSiwGw4=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.63.0", + "rev": "v2.64.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-MGIm9X9r08Ol/icDc1yopA0+BSC8phH/pXC1/jPOfzY=" + "vendorHash": "sha256-Z9EKIWBkmKptQMJFRh5SK2hhKwh5z5Lij0ZwXChOarY=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1237,22 +1237,22 @@ "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw=" }, "splunk-terraform_signalfx": { - "hash": "sha256-nhep3042bOUSQKCsS8gOIYLImgXnHmBNsDlXWOCixwI=", + "hash": "sha256-4szC65B96XkinJlGq2tTJBwnIYvjILnbSQtiA5Ujl64=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.22.3", + "rev": "v9.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320=" + "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8=" }, "spotinst_spotinst": { - "hash": "sha256-IcphMRvrv762wF1GxPAOyv/z6M+Cor9BEL0llKdr5n8=", + "hash": "sha256-AkuuUyMrc4GInuK+NNhTDQgW3vM/EupV4lkCV5Bn+n8=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.230.0", + "rev": "v1.231.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mcsiXXueAETbv3KIJiAw7xtGAWiaXAXPo1JTNhLao5s=" + "vendorHash": "sha256-sMwX6NU3nlpw5WMYGAM3LfPJgGQ9hOc89cUIQbMPqPg=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", @@ -1264,11 +1264,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-Ajc+3AiFZsC+32L9pWqZ9kqmmdJ5443khA8srC9khow=", + "hash": "sha256-fFy9zZIwEkhqFrzIsBWFiuacAKDifhatfn6TseyrKnU=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, @@ -1309,11 +1309,11 @@ "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-82Us5zLUD2UXcbmIhivqrymBbG+kkyzfARw/Wg5Mt5c=", + "hash": "sha256-ydbfbyxsS8ENWt4fWaSc/Nghy0KZvI5cWRbcWi0Kns8=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.39", + "rev": "v1.82.42", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1354,13 +1354,13 @@ "vendorHash": "sha256-CcbNooB1AjLbyMkTNmAklqNm6o6FVCBEBiEnD/U5yGU=" }, "terraform-routeros_routeros": { - "hash": "sha256-e9PJPjNyb9K5CpOsySnxIm209mnnL6bwzANQPClZLaE=", + "hash": "sha256-KhxNuzVaZFCO6XTCaj9wBddgw7TXULh/6LnMjiqPRLg=", "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros", "owner": "terraform-routeros", "repo": "terraform-provider-routeros", - "rev": "v1.92.1", + "rev": "v1.98.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3I8nOAJTrcP7nN36Emw1ztWHBOdHHfxgo2c63o45hQ8=" + "vendorHash": "sha256-+u00PWotHxCQ/BveXY23ulrQszoyG59GCkUIYKwlulc=" }, "timohirt_hetznerdns": { "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", @@ -1417,13 +1417,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-I0ZWvXP4U1cfGq7isXhAL+02La1N3SGt9fs/otstAVw=", + "hash": "sha256-jSXPx57EutEa0A4tV4mE16vtSUKxmVlqLwOoPetSYvM=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.38.1", + "rev": "v2.39.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-gk9r4fj8vHamCxPOSkXuj0UWZcyRVKBWTj23Vn2m7zs=" + "vendorHash": "sha256-4SpO31U25+6UUyVsqetFqjXQAj4gk2jTfLo/rSChOnI=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", @@ -1498,12 +1498,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-FxX0+xwITu/M5oCGYh8LE7lr3l2Vn+FCJVQpZRPk9bA=", + "hash": "sha256-PJ3ySL05fxj/9pq9tGqvCxrFZtTi6O5DyogS/YWPB9Q=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.173.0", + "rev": "v0.174.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HOP++zCWU9I3KCj1rKSGbr5TIvs6rEbffYJUNUREYnU=" + "vendorHash": "sha256-D6VDAtu+HqawsL4nXYdNqd12fOOp08BYRqHt50ZthbY=" } } diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 32ac01db0514..d85123e24952 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -10,9 +10,9 @@ "version": "0.0.93" }, "linux-ptb": { - "hash": "sha256-uz3QNIDzmB/4aLNRNgB1wzpNJlc8ous8aUvcqGaHE7c=", - "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.168/discord-ptb-0.0.168.tar.gz", - "version": "0.0.168" + "hash": "sha256-IK02ro+c2fzsu7vMf/zl0cFxA2jmf7NCv3M2XJ5/EMs=", + "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.169/discord-ptb-0.0.169.tar.gz", + "version": "0.0.169" }, "linux-stable": { "hash": "sha256-PN1E8GjVopEPGW9ISb0y1Lo7nnj30CXylW0nTR1Pc6U=", @@ -30,9 +30,9 @@ "version": "0.0.105" }, "osx-ptb": { - "hash": "sha256-Yk9q4GageNb/Tt+R1SGwWnJBRrjG4QIO6qYLjhak460=", - "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.200/DiscordPTB.dmg", - "version": "0.0.200" + "hash": "sha256-WWWeVzutLK8s1/asR95fMx6CuqM4Q/XFalMNWrBZbrc=", + "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.201/DiscordPTB.dmg", + "version": "0.0.201" }, "osx-stable": { "hash": "sha256-k4S9UyO2GLmT/nnR1BUcUVjhFvxjGeQv2tbuZzEh8Ro=", diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 6b6eb8ff58f3..41273eb64b05 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -8,8 +8,8 @@ makeScopeWithSplicing' { extra = self: { mkLinphoneDerivation = self.mk-linphone-derivation; - linphoneSdkVersion = "5.4.48"; - linphoneSdkHash = "sha256-sOkq73YWbhpKJOk1dVc4tkg2+RuGyRK8/t4ckMIVVG8="; + linphoneSdkVersion = "5.4.67"; + linphoneSdkHash = "sha256-QM4EVm7VJeOTt5Dc4DFAJOrGphCRcGniN0Tnfl4zab8="; }; f = self: diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix index efa510c3aad5..c8acc809ae15 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "linphone-desktop"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { group = "BC"; repo = "linphone-desktop"; rev = finalAttrs.version; - hash = "sha256-TO9JNsOnx4sTJEkai0nDKNyZWcLuGoWfuKLBM79tQvs="; + hash = "sha256-YBwN2d8Bhr876xDzzge1CutJEtWkoGJWwkybSKUDiM0="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 6f0c7267417a..141d18ab01b1 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { LC_ALL = "en_US.utf8"; meta = with lib; { - homepage = "http://www.profanity.im/"; + homepage = "https://profanity-im.github.io"; description = "Console based XMPP client"; mainProgram = "profanity"; longDescription = '' diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 45e1ea74e4b0..a3b067be3f69 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation { mainProgram = "communi"; homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; - maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index bb64123d643e..2df2a5ab3d8a 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -30,17 +30,17 @@ let in rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2025.13"; + version = "2025.14"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; tag = version; fetchSubmodules = true; - hash = "sha256-YDHO7NpZU5rxjCMpdKvpYcy0l8AEtiSN+fP2Ii8JXDQ="; + hash = "sha256-9HPOhhtbo7BocycuO7IgjyfWHXBh/5YQDNJ/VwKnKG0="; }; - cargoHash = "sha256-XaVgQRJcIqeKgwxlJSrW6WI7GC02lX3NtTJOGo4irzg="; + cargoHash = "sha256-PzUVwx72qkUDKCZ8hfpVT0bqnuakaitPedInn/EfW3o="; cargoBuildFlags = [ "-p mullvad-daemon --bin mullvad-daemon" diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index ea7e86b4295e..b9988c35e594 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -164,7 +164,6 @@ mkDerivation rec { "aarch64-linux" ]; maintainers = with maintainers; [ - jagajaga jraygauthier gador c4patino diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 012a4a8b1661..8e68c1e9f0a7 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -19,16 +19,16 @@ let }: buildGoModule rec { pname = stname; - version = "2.0.10"; + version = "2.0.12"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-N0+i5sj/cTPDv6q428b3Y0hsPRxIl96+RIuS1AyeTbc="; + hash = "sha256-bWClKODxzcSbKiKFcgDKbRGih8KaSeVpltiFDAE8sHM="; }; - vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs="; + vendorHash = "sha256-Xiod2Bd+uXcOpZ0rt8my8jkNdkdUhuoz5fcce+6JMXY="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ebd32c7f8b0a..955594eeaf0d 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -95,7 +95,6 @@ in homepage = "https://github.com/CyberShadow/znc-clientbuffer"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ - hrdinka szlend cybershadow ]; @@ -198,7 +197,6 @@ in description = "Advanced playback module for ZNC"; homepage = "https://github.com/jpnurmi/znc-playback"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hrdinka ]; }; }; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 96e2ae202815..d177d6efffc7 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; - maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1c267d792f2c..534bbbacae86 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -326,7 +326,7 @@ stdenv.mkDerivation rec { The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ korken89 ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; mainProgram = "kicad"; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 6d382ed87d3d..889613593601 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -9,6 +9,7 @@ maude, graphviz, glibcLocales, + fetchpatch, }: let @@ -32,9 +33,6 @@ let description = "Security protocol verification in the symbolic model"; maintainers = [ lib.maintainers.thoughtpolice ]; hydraPlatforms = lib.platforms.linux; # maude is broken on darwin - # Has been broken for a while now: - # https://hydra.nixos.org/job/nixpkgs/trunk/tamarin-prover.x86_64-linux - broken = true; }; # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries @@ -150,6 +148,16 @@ mkDerivation ( isLibrary = false; isExecutable = true; + patches = [ + # Allows tamarin-prover to run with Maude 3.5.1 + # This should be removed on the next release + (fetchpatch { + url = "https://github.com/tamarin-prover/tamarin-prover/commit/1a41b507e7f60d081d8c91cd465386d57f814f11.patch"; + includes = [ "src/Main/Console.hs" ]; + hash = "sha256-X8qhscwy+efATrl3rLtn0Xi9M5a2CsFrjBbiqvVRtSE="; + }) + ]; + # strip out unneeded deps manually doHaddock = false; enableSharedExecutables = false; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index b96228fe468e..00230a9f89c3 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -264,7 +264,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://shogun-toolbox.org/"; license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; maintainers = with maintainers; [ - edwtjo smancill ]; }; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 5ca46db3dcf9..df59adec8f1e 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -561,7 +561,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ wmertens - globin kashw2 me-and philiptaron diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8b95f6171a23..f2e1aa9663fe 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -347,7 +347,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mpv"; maintainers = with lib.maintainers; [ fpletz - globin SchweGELBin ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index ef18977c88a7..8cbcf2c509ff 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -43,6 +43,6 @@ buildLua { description = "Cut videos and concat them automatically"; homepage = "https://github.com/rushmj/mpv-video-cutter"; license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index e378e7c89f46..e0a7a9797b53 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.34.2"; + version = "1.34.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-StvHYzWe/LKgA9NQByfti/xAiHMRuRSF8QVsVcw/A+g="; + hash = "sha256-2Avq1EzK+i+16yoPM7j6IlavDi2oUS5A1hOIdzVThEQ="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 0d0abd7e9841..ebdfc38a2a5e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.29.1"; + version = "0.30.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-H7U44g4rw15c3Snx88YgAanSw4dWanmTugpGBIwfI6A="; + hash = "sha256-SffXgJWPPB+ZImknbYWU8AyypAfk2coXxyqWy6UCNMk="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index c02b5817bb1f..0c7e2792a62d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -6,21 +6,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.39.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; - rev = "v${version}"; - hash = "sha256-NDNyXK4E7TkviESHLp8M+OI56ME0Hatoi9eWjX+G1zo="; + tag = "v${version}"; + hash = "sha256-7g9l9SBxPY3jMS3DWZNI/fhOZN1oZo1qkUfhMfbzAaM="; }; - postPatch = '' - # entirely separate package that breaks the build - rm -rf pkg/e2e/ - ''; - - vendorHash = "sha256-Uqzul9BiXHAJ1BxlOtRS68Tg71SDva6kg3tv7c6ar2E="; + vendorHash = "sha256-COfB0MLBMOfTdLbpShBkMOEule/1cu6Bo5lm1ieO/nA="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 8f46a0930a58..06bb07268c07 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -39,6 +39,7 @@ let docker-sbom, docker-init, iptables, + nftables, e2fsprogs, xz, util-linuxMinimal, @@ -164,6 +165,7 @@ let buildInputs = [ sqlite ] + ++ lib.optionals (lib.versionAtLeast version "29.0.0") [ nftables ] ++ lib.optionals withLvm [ lvm2 ] ++ lib.optionals withBtrfs [ btrfs-progs ] ++ lib.optionals withSystemd [ systemd ] @@ -191,7 +193,10 @@ let ); postPatch = '' - patchShebangs hack/make.sh hack/make/ hack/with-go-mod.sh + patchShebangs hack/make.sh hack/make/ + '' + + lib.optionalString (lib.versionOlder version "29.0.0") '' + patchShebangs hack/with-go-mod.sh ''; buildPhase = '' @@ -217,7 +222,7 @@ let --prefix PATH : "$out/libexec/docker:$extraPath" ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") ''-runc-v2''} ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init @@ -409,20 +414,38 @@ in docker_28 = let - version = "28.5.1"; + version = "28.5.2"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; - cliHash = "sha256-iT5FLzX8Pg07V0Uo+07gy3ChP/WgLTPs/vtxnFVmCG8="; + cliHash = "sha256-11wbqvenTJooAzqOEp0UivPxhvWwSl1thCAzDMx0i/o="; mobyRev = "v${version}"; - mobyHash = "sha256-IlkEK4UeQjZsojbahzLy/rP3WqJUWXG9nthmBSEj10M="; - runcRev = "v1.3.0"; - runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY="; + mobyHash = "sha256-T5zz1lSLVdMR646CfhWAiVU4/VPAY1CRU+jIdjEWycs="; + runcRev = "v1.3.3"; + runcHash = "sha256-Ci/2otySB7FaFoutmzWeVaTU+tO/lnluQfneFSQM1RE="; containerdRev = "v1.7.28"; containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s="; tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; + docker_29 = + let + version = "29.1.2"; + in + callPackage dockerGen { + inherit version; + cliRev = "v${version}"; + cliHash = "sha256-dmoCHxXOYalJCaqq32MdsAEJ+xq0aH/8fOpJHVnBxxU="; + mobyRev = "docker-v${version}"; + mobyHash = "sha256-SRMaPAdg2nlWuKKQILZEGHZO6TGLh2Ci1UIWqcyo6IM="; + runcRev = "v1.3.4"; + runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8="; + containerdRev = "v2.2.0"; + containerdHash = "sha256-LXBGA03FTrrbxlH+DxPBFtp3/AYQf096YE2rpe6A+WM="; + tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; + tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; + }; + } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3694ae88d1e5..108a7f3de00e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -419,7 +419,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; homepage = "https://www.virtualbox.org/"; maintainers = with lib.maintainers; [ - sander friedrichaltheide blitz ]; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index cb3a6cea45db..92d6f7e3366b 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -24,7 +24,6 @@ fetchurl rec { license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ - sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 61862a140ae3..5b4f4e4263bb 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -14,7 +14,6 @@ fetchurl { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; maintainers = [ - lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 3f9c665fd945..94c4da5f53ef 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -171,7 +171,6 @@ stdenv.mkDerivation { sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Only; maintainers = [ - lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index a64467a2d8e4..81252598f64a 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,7 +8,7 @@ }: mkHyprlandPlugin (finalAttrs: { pluginName = "hyprsplit"; - version = "0.52.1"; + version = "0.52.2"; src = fetchFromGitHub { owner = "shezdy"; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 8ddbb3e0510a..2ada60594b5e 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.10.0"; + version = "0.10.1"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY="; + hash = "sha256-yiqtnsXxvC7vk22ZQ5OFt5uX40FCRGWpfZrax9GItAg="; }; postPatch = '' diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index b85cd9a04a6c..8bfd18461a18 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -46,6 +46,13 @@ let # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; + # What should lib be linked to: lib32 or lib64? + defaultLib = + { + "i686-linux" = "lib32"; + "x86_64-linux" = "lib64"; + } + .${stdenv.system} or (throw "Please expand list of system with defaultLib for '${stdenv.system}'"); # list of packages (usually programs) which match the host's architecture # (which includes stuff from multiPkgs) @@ -229,7 +236,7 @@ let ln -s /usr/lib $out/lib ln -s /usr/lib32 $out/lib32 ln -s /usr/lib64 $out/lib64 - ln -s /usr/lib64 $out/usr/lib + ln -s /usr/${defaultLib} $out/usr/lib ln -s /usr/libexec $out/libexec # symlink 32-bit ld-linux so it's visible in /lib diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index c064d5d4266f..3f20759e952e 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -45,6 +45,7 @@ in pkgs, stdenv, patchelf, + fetchpatch, # build time autoconf, @@ -328,6 +329,16 @@ buildStdenv.mkDerivation { # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch ] + # Revert apple sdk bump to 26.1 + ++ + lib.optionals (lib.versionAtLeast version "146" && lib.versionOlder apple-sdk_26.version "26.1") + [ + (fetchpatch { + url = "https://github.com/mozilla-firefox/firefox/commit/c1cd0d56e047a40afb2a59a56e1fd8043e448e05.patch"; + hash = "sha256-bFHLy3b0jOcROqltIwHwSAqWYve8OZHbiPMOdhLUCLc="; + revert = true; + }) + ] ++ extraPatches; postPatch = '' @@ -451,21 +462,7 @@ buildStdenv.mkDerivation { # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator # TODO: Default vm.max_map_count has been increased, retest without this export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so - '' - + - # fileport.h was exposed in SDK 15.4 but we have only 15.2 in nixpkgs so far. - lib.optionalString - ( - stdenv.hostPlatform.isDarwin - && lib.versionAtLeast version "143" - && lib.versionOlder version "145" - && lib.versionOlder apple-sdk_15.version "15.4" - ) - '' - mkdir -p xnu/sys - cp ${apple-sdk_15.sourceRelease "xnu"}/bsd/sys/fileport.h xnu/sys - export CXXFLAGS="-isystem $(pwd)/xnu" - ''; + ''; # firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags configurePlatforms = [ ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f5f6d7a98be5..fe23d342a014 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -125,8 +125,12 @@ let libc_bin = optionalString (libc != null) (getBin libc); libc_dev = optionalString (libc != null) (getDev libc); libc_lib = optionalString (libc != null) (getLib libc); - cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; - cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; + cc_solib = + optionalString (!nativeTools) (getLib cc) + + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; + cc_bin = + optionalString (!nativeTools) (getBin cc) + + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = optionalString (!nativeTools) (getBin coreutils); diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go index f91a90bdbdab..0edb1a95fce1 100644 --- a/pkgs/build-support/docker/tarsum.go +++ b/pkgs/build-support/docker/tarsum.go @@ -3,9 +3,8 @@ package main import ( "fmt" "io" - "io/ioutil" "os" - "github.com/docker/docker/pkg/tarsum" + "github.com/docker/docker/daemon/builder/remotecontext/tarsum" ) func main() { @@ -15,7 +14,7 @@ func main() { os.Exit(1) } - if _, err = io.Copy(ioutil.Discard, ts); err != nil { + if _, err = io.Copy(io.Discard, ts); err != nil { fmt.Println(err) os.Exit(1) } diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/build-support/docker/tarsum.nix index f97c7a2e113b..9358c571e94b 100644 --- a/pkgs/build-support/docker/tarsum.nix +++ b/pkgs/build-support/docker/tarsum.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" - mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + mkdir -p src/github.com/docker/docker/daemon/builder/remotecontext + # We need to drop the internal as otherwise go refuses to use it. + ln -sT ${docker.moby-src}/daemon/builder/remotecontext/internal/tarsum src/github.com/docker/docker/daemon/builder/remotecontext/tarsum go build runHook postBuild ''; diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index e1c5d7745d35..adc9c55939c3 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,3 +1,5 @@ +set -u + tagtext="" tagflags="" # Darcs hashes are sha1 (120 bits, 40-character hex) @@ -12,8 +14,19 @@ elif test -n "$context"; then tagflags="--context=$context" fi -echo "Cloning $url $partial ${tagtext} into $out" +# Repository list may contain ?. No glob expansion for that. +set -o noglob -darcs clone --lazy $tagflags "$url" "$out" -# remove metadata, because it can change -rm -rf "$out/_darcs" +for repository in $repositories; do + echo "Trying to clone $repository $tagtext into $out …" + if darcs clone --lazy $tagflags "$repository" "$out"; then + # remove metadata, because it can change + rm -rf "$out/_darcs" + exit 0 + fi +done + +set +o noglob + +echo "Error: couldn’t clone repository from any mirror" 1>&2 +exit 1 diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 2d24ddaecbd4..d6a9093c76dc 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -8,7 +8,11 @@ lib.makeOverridable ( lib.fetchers.withNormalizedHash { } ( { + # Repository to fetch url, + # Additional list of repositories specifying alternative download + # location to be tried in order, if the prior repository failed to fetch. + mirrors ? [ ], rev ? null, context ? null, outputHash ? lib.fakeHash, @@ -27,11 +31,12 @@ lib.makeOverridable ( outputHashMode = "recursive"; inherit - url rev context name ; + + repositories = [ url ] ++ mirrors; } ) ) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 8f72881d3b91..704f14598dea 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -19,7 +19,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name" ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ ${fetchTags:+--fetch-tags} \ - ${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \ + ${sparseCheckoutText:+--sparse-checkout "$sparseCheckoutText"} \ ${nonConeMode:+--non-cone-mode} \ ${branchName:+--branch-name "$branchName"} \ ${rootDir:+--root-dir "$rootDir"} diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 5a8ea3cf0488..2a175a71ccd2 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -47,7 +47,7 @@ lib.makeOverridable ( # Hashes, handled by `lib.fetchers.withNormalizedHash` # whose outputs contain outputHash* attributes. - "hash" + # Use `hash` when overriding with `.overrideAttrs`. "sha256" ]; @@ -66,14 +66,17 @@ lib.makeOverridable ( # when rootDir is specified, avoid invalidating the result when rev changes append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else ""; }, - leaveDotGit ? deepClone || fetchTags, + # When null, will default to: `deepClone || fetchTags` + leaveDotGit ? null, outputHash ? lib.fakeHash, outputHashAlgo ? null, fetchSubmodules ? true, deepClone ? false, branchName ? null, - sparseCheckout ? lib.optional (rootDir != "") rootDir, - nonConeMode ? rootDir != "", + # When null, will default to: `lib.optional (rootdir != "") rootdir` + sparseCheckout ? null, + # When null, will default to: `rootDir != ""` + nonConeMode ? null, nativeBuildInputs ? [ ], # Shell code executed before the file has been fetched. This, in # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to @@ -128,99 +131,125 @@ lib.makeOverridable ( server admins start using the new version? */ - assert nonConeMode -> (sparseCheckout != [ ]); - assert fetchTags -> leaveDotGit; - assert rootDir != "" -> !leaveDotGit; + let + finalHashHasColon = lib.hasInfix ":" finalAttrs.hash; + finalHashColonMatch = lib.match "([^:]+)[:](.*)" finalAttrs.hash; + in - if builtins.isString sparseCheckout then - # Changed to throw on 2023-06-04 - throw - "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." - else - derivationArgs - // { - inherit name; + derivationArgs + // { + inherit name; - builder = ./builder.sh; - fetcher = ./nix-prefetch-git; + builder = ./builder.sh; + fetcher = ./nix-prefetch-git; - nativeBuildInputs = [ - git - cacert - ] - ++ lib.optionals fetchLFS [ git-lfs ] - ++ nativeBuildInputs; + nativeBuildInputs = [ + git + cacert + ] + ++ lib.optionals fetchLFS [ git-lfs ] + ++ nativeBuildInputs; - inherit outputHash outputHashAlgo; - outputHashMode = "recursive"; + hash = + if outputHashAlgo == null || outputHash == "" || lib.hasPrefix outputHashAlgo outputHash then + outputHash + else + "${outputHashAlgo}:${outputHash}"; + outputHash = + if finalAttrs.hash == "" then + lib.fakeHash + else if finalHashHasColon then + lib.elemAt finalHashColonMatch 1 + else + finalAttrs.hash; + outputHashAlgo = if finalHashHasColon then lib.head finalHashColonMatch else null; + outputHashMode = "recursive"; + + sparseCheckout = + let + default = lib.optional (finalAttrs.rootDir != "") finalAttrs.rootDir; + in + lib.defaultTo default sparseCheckout; + sparseCheckoutText = + # Changed to throw on 2023-06-04 + assert ( + lib.assertMsg (lib.isList finalAttrs.sparseCheckout) "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." + ); + assert finalAttrs.nonConeMode -> (finalAttrs.sparseCheckout != [ ]); # git-sparse-checkout(1) says: # > When the --stdin option is provided, the directories or patterns are read # > from standard in as a newline-delimited list instead of from the arguments. - sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout; + builtins.concatStringsSep "\n" finalAttrs.sparseCheckout; - inherit - url + inherit + url + fetchLFS + fetchSubmodules + deepClone + branchName + preFetch + postFetch + fetchTags + rootDir + gitConfigFile + ; + leaveDotGit = + if leaveDotGit != null then + assert fetchTags -> leaveDotGit; + assert rootDir != "" -> !leaveDotGit; leaveDotGit - fetchLFS - fetchSubmodules - deepClone - branchName - nonConeMode - preFetch - postFetch - fetchTags - rootDir - gitConfigFile - ; - inherit tag; - revCustom = rev; - rev = getRevWithTag { - inherit (finalAttrs) tag; - rev = finalAttrs.revCustom; - }; + else + deepClone || fetchTags; + nonConeMode = lib.defaultTo (finalAttrs.rootDir != "") nonConeMode; + inherit tag; + revCustom = rev; + rev = getRevWithTag { + inherit (finalAttrs) tag; + rev = finalAttrs.revCustom; + }; - postHook = - if netrcPhase == null then - null - else - '' - ${netrcPhase} - # required that git uses the netrc file - mv {,.}netrc - export NETRC=$PWD/.netrc - export HOME=$PWD - ''; + postHook = + if netrcPhase == null then + null + else + '' + ${netrcPhase} + # required that git uses the netrc file + mv {,.}netrc + export NETRC=$PWD/.netrc + export HOME=$PWD + ''; - impureEnvVars = - lib.fetchers.proxyImpureEnvVars - ++ netrcImpureEnvVars - ++ [ - "GIT_PROXY_COMMAND" - "NIX_GIT_SSL_CAINFO" - "SOCKS_SERVER" + impureEnvVars = + lib.fetchers.proxyImpureEnvVars + ++ netrcImpureEnvVars + ++ [ + "GIT_PROXY_COMMAND" + "NIX_GIT_SSL_CAINFO" + "SOCKS_SERVER" - # This is a parameter intended to be set by setup hooks or preFetch - # scripts that want per-URL control over HTTP proxies used by Git - # (if per-URL control isn't needed, `http_proxy` etc. will - # suffice). It must be a whitespace-separated (with backslash as an - # escape character) list of pairs like this: - # - # http://domain1/path1 proxy1 https://domain2/path2 proxy2 - # - # where the URLs are as documented in the `git-config` manual page - # under `http..*`, and the proxies are as documented on the - # same page under `http.proxy`. - "FETCHGIT_HTTP_PROXIES" - ]; + # This is a parameter intended to be set by setup hooks or preFetch + # scripts that want per-URL control over HTTP proxies used by Git + # (if per-URL control isn't needed, `http_proxy` etc. will + # suffice). It must be a whitespace-separated (with backslash as an + # escape character) list of pairs like this: + # + # http://domain1/path1 proxy1 https://domain2/path2 proxy2 + # + # where the URLs are as documented in the `git-config` manual page + # under `http..*`, and the proxies are as documented on the + # same page under `http.proxy`. + "FETCHGIT_HTTP_PROXIES" + ]; - inherit preferLocalBuild meta allowedRequisites; + inherit preferLocalBuild meta allowedRequisites; - passthru = { - gitRepoUrl = url; - } - // passthru; + passthru = { + gitRepoUrl = url; } + // passthru; + } ); # No ellipsis. diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index ae5ff338264a..1283dcd7d25a 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -13,6 +13,8 @@ lib.makeOverridable ( rev ? null, # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github", + # `fetchFromGitHub` defaults to use `fetchzip` for better hash stability. + # We default not to fetch submodules, which is contrary to `fetchgit`'s default. fetchSubmodules ? false, leaveDotGit ? null, deepClone ? false, @@ -20,7 +22,7 @@ lib.makeOverridable ( forceFetchGit ? false, fetchLFS ? false, rootDir ? "", - sparseCheckout ? lib.optional (rootDir != "") rootDir, + sparseCheckout ? null, githubBase ? "github.com", varPrefix ? null, passthru ? { }, @@ -68,12 +70,12 @@ lib.makeOverridable ( varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_"; useFetchGit = fetchSubmodules - || (leaveDotGit == true) + || lib.defaultTo false leaveDotGit == true || deepClone || forceFetchGit || fetchLFS || (rootDir != "") - || (sparseCheckout != [ ]); + || lib.defaultTo [ ] sparseCheckout != [ ]; # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. fetcher = @@ -122,6 +124,7 @@ lib.makeOverridable ( rev deepClone fetchSubmodules + leaveDotGit sparseCheckout fetchLFS ; @@ -135,7 +138,6 @@ lib.makeOverridable ( ; }; } - // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else let revWithTag = finalAttrs.rev; diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index 3f056b26c6b7..f204c654bf8f 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -7,7 +7,11 @@ lib.makeOverridable ( { + # Remote to fetch url, + # Additional list of remotes specifying alternative download location to be + # tried in order, if the prior remote failed to fetch. + mirrors ? [ ], hash ? "", change ? null, state ? null, @@ -36,12 +40,25 @@ lib.makeOverridable ( installPhase = '' runHook preInstall - pijul clone \ - ''${change:+--change "$change"} \ - ''${state:+--state "$state"} \ - --channel "$channel" \ - "$url" \ - "$out" + success= + for remote in $remotes; do + if + pijul clone \ + ''${change:+--change "$change"} \ + ''${state:+--state "$state"} \ + --channel "$channel" \ + "$remote" \ + "$out" + then + success=1 + break + fi + done + + if [ -z "$success" ]; then + echo "Error: couldn’t clone remote from any mirror" 1>&2 + exit 1 + fi runHook postInstall ''; @@ -59,12 +76,13 @@ lib.makeOverridable ( outputHash = if hash != "" then hash else lib.fakeHash; inherit - url change state channel ; + remotes = [ url ] ++ mirrors; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } ) diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index 3e3f6c9adfb8..69d47d589998 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -29,11 +29,6 @@ let ''; license = lib.licenses.cc-by-30; homepage = "https://durian.blender.org/"; - - # Reported in https://github.com/NixOS/nixpkgs/pull/458193#issuecomment-3575753211 that these - # tests are causing Hydra to spin for hours. They all pass locally, and we don't care too much - # about running them on Hydra. - hydraPlatforms = [ ]; }; # Via https://webtorrent.io/free-torrents @@ -64,10 +59,20 @@ let popd ''; - # Fixed output derivation hash is identical for all derivations: the empty - # directory. fetchtorrentWithHash = - args: fetchtorrent ({ hash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; } // args); + args: + fetchtorrent ( + { + # Fixed output derivation hash is identical for all derivations: the empty directory. + hash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # Reported in https://github.com/NixOS/nixpkgs/pull/458193#issuecomment-3575753211 + # that these tests are causing Hydra to spin for hours on macOS. + # They all pass locally, and we don't care too much about running them on Hydra. + meta.hydraPlatforms = [ ]; + } + // args + ); in # Seems almost but not quite worth using lib.mapCartesianProduct... builtins.mapAttrs (n: v: testers.invalidateFetcherByDrvHash fetchtorrentWithHash v) { diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 5ffb70e3a9f8..4d0f525a15c5 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -64,7 +64,6 @@ lib.extendMkDerivation { "derivationArgs" # Hash attributes will be map to the corresponding outputHash* - "hash" "sha1" "sha256" "sha512" @@ -214,12 +213,15 @@ lib.extendMkDerivation { } else if cacert != null then { - outputHashAlgo = "sha256"; - outputHash = ""; + outputHashAlgo = null; + outputHash = lib.fakeHash; } else throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}"; + finalHashHasColon = lib.hasInfix ":" finalAttrs.hash; + finalHashColonMatch = lib.match "([^:]+)[:](.*)" finalAttrs.hash; + resolvedUrl = let mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url; @@ -259,7 +261,23 @@ lib.extendMkDerivation { preferHashedMirrors = false; # New-style output content requirements. - inherit (hash_) outputHashAlgo outputHash; + hash = + if + hash_.outputHashAlgo == null + || hash_.outputHash == "" + || lib.hasPrefix hash_.outputHashAlgo hash_.outputHash + then + hash_.outputHash + else + "${hash_.outputHashAlgo}:${hash_.outputHash}"; + outputHashAlgo = if finalHashHasColon then lib.head finalHashColonMatch else null; + outputHash = + if finalAttrs.hash == "" then + lib.fakeHash + else if finalHashHasColon then + lib.elemAt finalHashColonMatch 1 + else + finalAttrs.hash; # Disable TLS verification only when we know the hash and no credentials are # needed to access the resource diff --git a/pkgs/build-support/lib/cmake.nix b/pkgs/build-support/lib/cmake.nix index 796f69235475..f495f3d1d6bf 100644 --- a/pkgs/build-support/lib/cmake.nix +++ b/pkgs/build-support/lib/cmake.nix @@ -12,7 +12,9 @@ let [ "-DCMAKE_SYSTEM_NAME=${ findFirst isString "Generic" ( - optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system + # uname -s is CYGWIN_NT[...] on cygwin, but cmake expects CYGWIN + optional (stdenv.hostPlatform.isCygwin) "CYGWIN" + ++ optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system ) }" ] diff --git a/pkgs/by-name/_3/_3mux/package.nix b/pkgs/by-name/_3/_3mux/package.nix index 8f72b9b32d97..b130f4b861f5 100644 --- a/pkgs/by-name/_3/_3mux/package.nix +++ b/pkgs/by-name/_3/_3mux/package.nix @@ -61,7 +61,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ aaronjanse - Br1ght0ne ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix index 4e4da7039586..29fcdc928f63 100644 --- a/pkgs/by-name/_6/_6tunnel/package.nix +++ b/pkgs/by-name/_6/_6tunnel/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wojtekka/6tunnel"; changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ Br1ght0ne ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index f7731964920d..33ed2e4d6ba6 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; tag = "v${version}"; - hash = "sha256-bVsEsQMQhXyDES5mlBHRK1Uf7UwbX6iKhTF17peokAk="; + hash = "sha256-HSWu3gHpgCUkmr63mAi2Hd67Rap5vDZ/oHRh6O7y6uA="; }; - cargoHash = "sha256-TDpNT62jkkP+g2w1HXmPJiblHXFOuAuzYRY5cpzRW/M="; + cargoHash = "sha256-jzEwblYsA7tgoJE6HhdtdDyOS50DyL87/J/T+cNKB3M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/abi-compliance-checker/package.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix index 08b0161b220f..c08d64e5d26c 100644 --- a/pkgs/by-name/ab/abi-compliance-checker/package.nix +++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { description = "Tool for checking backward API/ABI compatibility of a C/C++ library"; mainProgram = "abi-compliance-checker"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ bhipple ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix index fc0eaffc4e55..aedefd7b022c 100644 --- a/pkgs/by-name/ab/abi-dumper/package.nix +++ b/pkgs/by-name/ab/abi-dumper/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { description = "Dump ABI of an ELF object containing DWARF debug info"; mainProgram = "abi-dumper"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ bhipple ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ab/abook/package.nix b/pkgs/by-name/ab/abook/package.nix index f0cf91fb19e7..9f91e82a44d8 100644 --- a/pkgs/by-name/ab/abook/package.nix +++ b/pkgs/by-name/ab/abook/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.edwtjo ]; platforms = lib.platforms.unix; mainProgram = "abook"; }; diff --git a/pkgs/by-name/ac/acd-cli/package.nix b/pkgs/by-name/ac/acd-cli/package.nix index 54f2e51368ad..89c51bcd1731 100644 --- a/pkgs/by-name/ac/acd-cli/package.nix +++ b/pkgs/by-name/ac/acd-cli/package.nix @@ -46,6 +46,5 @@ python3Packages.buildPythonApplication rec { description = "Command line interface and FUSE filesystem for Amazon Cloud Drive"; homepage = "https://github.com/yadayada/acd_cli"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index b407ba2b7c57..c7020e8af676 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.82"; + version = "0.2.83"; in buildGoModule { pname = "act"; @@ -18,7 +18,7 @@ buildGoModule { owner = "nektos"; repo = "act"; tag = "v${version}"; - hash = "sha256-NIslUM0kvgS4szejCngb1zJ+cjlJ970XkeegDjyOYIs="; + hash = "sha256-3z6+WcfxHyPTgsOHs2NPd4x7buMBr3jCA2zqd6kBb6k="; }; vendorHash = "sha256-EQgW+I0HjJhKioN0Moke9i+OggyJOSOHyatYnED4NX4="; @@ -46,7 +46,6 @@ buildGoModule { changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne kashw2 ]; }; diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json index 9185933a2983..71bbdac4ea6f 100644 --- a/pkgs/by-name/ac/actual-server/missing-hashes.json +++ b/pkgs/by-name/ac/actual-server/missing-hashes.json @@ -25,6 +25,20 @@ "@esbuild/win32-arm64@npm:0.25.10": "16fce99202539f6319f439a0db7b078b95ac4f18c1d9736a6fe0cbea1e88faf725e798af2f1a5ff3f39f9b47eb2fc70ec78b1b5dae35d06682748b245096a2e8", "@esbuild/win32-ia32@npm:0.25.10": "c6db22bb001c8da006ee83b622b2ae2403583f1bc8e11ae88190801fb19e1c16da6e2356a15b0534463aac1170d6208a230a5aa26cacad4e85fda9991b77a389", "@esbuild/win32-x64@npm:0.25.10": "ec3c325501843d502292cc36a6ddb08ce13fdf5accc5c73b3c2084e6862a757edc4f46677ae5c9c32a0087fcbff2a894181b7e1881137641cc91a2ca146d7cc2", + "@node-rs/jieba-android-arm-eabi@npm:1.10.4": "60a55caf33f914d1b6b2947c88ea5fa9a58a84d2bedfccb8639162991b9092ec86964b64979c0ca0cf0d5e5be2766236a612b67ea03b3b3c4ec4d608dde2475a", + "@node-rs/jieba-android-arm64@npm:1.10.4": "e54d5d1c8fab348ef86c1e0aaf4aea8e2e52924ac1c4bed6ef76588b7446122c332b593e4b471b3268eae4386ab991e9eb0337962b8f17bd2dafa1baf1b7c755", + "@node-rs/jieba-darwin-arm64@npm:1.10.4": "6ec6503fd063d03c0284210b869e31b8db306777ae7acca8be3a9fa979f57cb7729a35723eda3c76ed6366e7b4022c4b9c5f350ff65cd82925f381965640999c", + "@node-rs/jieba-darwin-x64@npm:1.10.4": "e3ef6ff89aa3f1777f57aeb3f8c18d2d4bfdaaafb6138883a10db8d6e42c2bc55a90320d5dfc54d0ebdd7398e0d8257dc97a9a7209a0d7a018be5c494c0f7f75", + "@node-rs/jieba-freebsd-x64@npm:1.10.4": "25c321b9dabc98fdae7c6671e058d58df4dcfd3d39452dde819217db5acec04f35de969b10f10c6700f94915c6be6fa1cc9f507c7cf5fa945a787b9b92033a81", + "@node-rs/jieba-linux-arm-gnueabihf@npm:1.10.4": "5594e56494f25080fccef4fe1e33165f90bcb8831f3a10f0619a9748800ea0ceb1d336bbdaefd021620756dbd5285f5c43cab7109413e3cbd568b106d5dc204a", + "@node-rs/jieba-linux-arm64-gnu@npm:1.10.4": "40d4ea4fd9fa3537e486b7be2e77fd0b9e82013e1e78541810918665417d91073d17349bde7bc9a3500afdc2bb62ef11d6de9f06542a7ca08874d6a09f535f9d", + "@node-rs/jieba-linux-arm64-musl@npm:1.10.4": "95a8cb8e2f09d7fdf44535b43c585a5b2342807aaee05997a324f3c0ccc0c4853b86e93cb35dc60797fe5a223446c18787e807d216e6785c09935d2e57d783c3", + "@node-rs/jieba-linux-x64-gnu@npm:1.10.4": "66f03554b9859b8428c59c8a4abf09b6e4c9e97173b6a6cdfa5adae7317ae38b8d9c333e83e4a34b211171c864c5ef8acdb37d763a5f781d55252c36408920ee", + "@node-rs/jieba-linux-x64-musl@npm:1.10.4": "adb8369606cf44c2e43841b2b9ee61214b00c3544bdd4b1606a8abdcf0bb4cb564c391d812ad99415f42310bd1ccba0a17db32b56684612bdb37924c7f82a309", + "@node-rs/jieba-wasm32-wasi@npm:1.10.4": "b23a4ec8bfc166f08e7f00b436f463ea272e424ac8d7080a5630e18e8ec560714392efe5c12b3a8377147c44770df5b4cb3f02f34d318c6e3b9d709589d6115d", + "@node-rs/jieba-win32-arm64-msvc@npm:1.10.4": "68146cf2b5324c461847da9fd36aa851aeb5655f94b0178a194630c80926e914b71f5fe60a6853c9197516e2b2680303bf28c405963f8655d0099d335c5178bd", + "@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93", + "@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -58,16 +72,16 @@ "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f", "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185", "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2", - "@swc/core-darwin-arm64@npm:1.13.20": "82a9547c1cfe78b2e5fc158758b668847df20b2e0c9c2e3689d0cf1208922fe220a834ebd657e1e9d8343c5db11fa5316a2c603246cbc096ae0a11ec8f4a2706", - "@swc/core-darwin-x64@npm:1.13.20": "12b1971afcc32afd0fe9dedb84e0123d2b5c14303420ff319230ab3a2a54423acd48f05ee2413e09b2df075cc5f629d59e2b1bb980e3128b0775355b4b578274", - "@swc/core-linux-arm-gnueabihf@npm:1.13.20": "516157572537e90f498c193076ef6beef0ecde443171fa272fdab894b4717c704133de4dc0df94cd3e82ea3bde8e68ae7a7d6ba9501082084de9b5b11bac721c", - "@swc/core-linux-arm64-gnu@npm:1.13.20": "337b956f1631d7dac49fc458ff3d707cca2d573e36cbd7ae50cff3267d239cfdcfe3900aaa90e5c96900d02e358de7ea5208cbfa76fdb59434aa7d331d1fc2f3", - "@swc/core-linux-arm64-musl@npm:1.13.20": "9fd86addf26398fe9efd3fb30faaebfd03ea0c285ed4c622716d2194e19b1886a28bdf52768cf3b5d58681cf700711af177da9bdc2e1a7631166cf7bb0cb4e3e", - "@swc/core-linux-x64-gnu@npm:1.13.20": "d1b3e867bae834188a0f6001c8cdc1539b627e7576d32a3a8c38fbe283d01cb2a3fae9a9c61fe7b128d4ce0a77783a490ff645c90b9c72a9d7dd26b3cf40d768", - "@swc/core-linux-x64-musl@npm:1.13.20": "8f442fa87c044167ddf48289f0abfd0c00f13e7dc0750fb0ea74c4a39b7a6536aad73b5fffa9629c36fab5d0ea797f560ff776b3d9e146288471528f10f58570", - "@swc/core-win32-arm64-msvc@npm:1.13.20": "2898da180055257f3f32ad311191afa1ebe605948781bee75850ff15d99f1798b118d351ff3ba6383423b3160a3ecba5e1fc8d677930c565e5127199df6e0634", - "@swc/core-win32-ia32-msvc@npm:1.13.20": "1f7746115c238af550709d9423784e158dd764d3d145cb4d1e77519861ed35ed4fbf666fed395212be455d6fe5c78bc7b6e62d317a2c806b0ff6fdf19ad56feb", - "@swc/core-win32-x64-msvc@npm:1.13.20": "4ce573935a62d4d037264052bae640174de28576adccaefde8f3b238540971f18b4a72c5d417477be39c0cbafe05675adbf67b40851f08964bdd19d7b07a57c7", + "@swc/core-darwin-arm64@npm:1.15.2": "811bb38ede1d92045c3c84169f7b2202bbf7caf2745d26cb9b141cb188465dd94a700733b0d9dc8a97590d9ebb1a92ef5ed40346d3fac7f88832365cca5d2678", + "@swc/core-darwin-x64@npm:1.15.2": "b0fce366539c7daae5aab6041f10e9e70a767b277fff0f6ad3fea09b46d95f0208961ce1c6a0a55486718a3997ffa8dc38bd03030faa09395f9261792a42752e", + "@swc/core-linux-arm-gnueabihf@npm:1.15.2": "b55975abf42d5af0db4a149ad5e8a4935619473517acfccba978d90a300f5d97c4b883f2c3fe95bce57be36b0f0d21ad889a681f492e9e1338a87751d9858602", + "@swc/core-linux-arm64-gnu@npm:1.15.2": "6345874a4385e8a1793a2c80b1e20e7883faed348e118619420c58cfcf6f7106ce76b179c10220f8fdccfa92bd5ca45c3749bc2e36075e8684b58df367a714df", + "@swc/core-linux-arm64-musl@npm:1.15.2": "7b1d51d7f566e42b178b49dd8dde9d630afc6e5d9cf89dcee1af39ad9c1016759e9cc5da37b58c52df50801c3a410edf0c00cc1a7f7ac93027a0628b5a5d05f4", + "@swc/core-linux-x64-gnu@npm:1.15.2": "5e888708763bbe3ddf4e7c4f6de75247ca3eede869fc7964999c7e950ffeace38e36f50ffd67e4644055913a0af5d18dab895c701cf94c83321a48c31044d26b", + "@swc/core-linux-x64-musl@npm:1.15.2": "aadabca760a39a4f4425b83557a836960998d250f7c0b5e3d8104bf4e9597cb00539d89461678dc592053d68dc0bfa4da64de215b5af74890cd1d455dec90728", + "@swc/core-win32-arm64-msvc@npm:1.15.2": "1c009bc927578943b5e08f43ef69dd6997545feeaedacc7fcd415e5a6e7d669186f0591f1e3617b0218a67567216dfa134d77c133a75f44c8f11f44d52c73532", + "@swc/core-win32-ia32-msvc@npm:1.15.2": "88e9beeafa768fb212a64b0652f66d2aa2f6728a0309ce6f8962200d65ff370638578f13b783a83d499e91ffafbfeb9160b3a5fb37521d1120b506e9ddf1e89e", + "@swc/core-win32-x64-msvc@npm:1.15.2": "df51454cdd0a5ea999d267a3230e9c51daef93f0fefec3c3aed5d3f8c8409f89514971edb99270fece2e3342bccf3c55a28a32a87e5cd250f25c2410218ddb8f", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "5c8769703d724915224711f718085f541d8558e95d8646c6cca5709f1f7dd00ce65d0e2d0bc03bb1c0c74d22d70d54cfc490176dbb7c6f5d06072365ec7ef6b6", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "7ab93a01b7f4cbc99bfaf8cd35a1454f78826bb2840f0387a19491cb4835b16d81d30ca2b4b71a43643f58aaceb83a63cd89274a3f16637e35887e67a93ea21e", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "f8bd59a69ca200f9590a94de5699a0cecbcba120f5b82b2295468d36f943be48d957a8ca466f3fb30466abafee4a9672831c382ff9dea4ccdaa0a92992bb41b1", diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 7b2724ee50f3..846b8df66115 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -12,13 +12,13 @@ }: let yarn-berry = yarn-berry_4; - version = "25.11.0"; + version = "25.12.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-Skpfhhxd8MUoVpwPv4j8/bnFYYEAJkjKN2g1HVwWH/w="; + hash = "sha256-hu5Y67vomAJI1IJ1gLAdapRACDW/Q+cOAB+Bo4uQ9+w="; }; translations = fetchFromGitHub { name = "actualbudget-translations-source"; @@ -26,8 +26,8 @@ let repo = "translations"; # Note to updaters: this repo is not tagged, so just update this to the Git # tip at the time the update is performed. - rev = "8f6353763f28d1690c97c04f46a6479668130ec7"; - hash = "sha256-E+RTa2OvT8fzwuscHhTY4Fd3LhWle9x5X+j9siHnUPM="; + rev = "570f8db9dd436810e014d587b4d27105bce7dfda"; + hash = "sha256-fVyO4rMgbdI1Hm3J4ka9/72sNcwlfLS6Ef06YUvx4Gs="; }; in @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; NODE_JQ_SKIP_INSTALL_BINARY = "true"; + SHARP_IGNORE_GLOBAL_LIBVIPS = "1"; }; postPatch = '' @@ -74,6 +75,9 @@ stdenv.mkDerivation (finalAttrs: { # Disable building @swc/core from source - use the pre-built binaries instead cat <<< $(${lib.getExe jq} '.dependenciesMeta."@swc/core".built = false' ./package.json) > ./package.json + + # Disable the install script for sharp to prevent it from trying to download binaries + cat <<< $(${lib.getExe jq} '.dependenciesMeta."sharp".built = false' ./package.json) > ./package.json ''; buildPhase = '' @@ -90,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-soP7oHCufTL7RekU479evFSe2LUq2OM56A9TbJ13Nmg="; + hash = "sha256-Hlc/UMPfZCBbBcmCzmNgDSX+uH8WDEIp/KE9H5jYr2Y="; }; pname = "actual-server"; diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index 33cf4825cb9e..286d5377912d 100644 --- a/pkgs/by-name/ad/adminneo/package.nix +++ b/pkgs/by-name/ad/adminneo/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adminneo"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "adminneo-org"; repo = "adminneo"; tag = "v${finalAttrs.version}"; - hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8="; + hash = "sha256-NCQqjIJsAiz1At/oYsuuUejr5A7PVLyzROI5Ev3zxlM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adw-bluetooth/package.nix b/pkgs/by-name/ad/adw-bluetooth/package.nix new file mode 100644 index 000000000000..fde7d2367c9a --- /dev/null +++ b/pkgs/by-name/ad/adw-bluetooth/package.nix @@ -0,0 +1,49 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + blueprint-compiler, + typescript, + desktop-file-utils, + wrapGAppsHook4, + gjs, + libadwaita, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "adw-bluetooth"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ezratweaver"; + repo = "adw-bluetooth"; + tag = finalAttrs.version; + hash = "sha256-/KJpB9i6tFDnB3C0tPtJtt8tTDfNftIkHmP1JSVSZNY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + blueprint-compiler + typescript + desktop-file-utils + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + libadwaita + ]; + + meta = { + description = "GNOME Inspired LibAdwaita Bluetooth Applet"; + homepage = "https://github.com/ezratweaver/adw-bluetooth"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ezratweaver ]; + }; +}) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 057f3729ff63..e2e4f01170f6 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -46,12 +46,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.25.5"; + version = "0.25.6"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-oUTnI0jCIm1PtQepfYGYFSZhhIh0blcyWXWkRmAB0DI="; + hash = "sha256-5dvt2ngpVd9TI/Rdvs/yzRGFLchQqizAKN1fHveb4w0="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-iULgio5zpmJhKofkUxA98Ze7Qy+kRfbbi5oEHYw5vzY="; + outputHash = "sha256-E0ZN5DS5MbgPvr7Fs86hqkwvHnFW1PanKct4evL05ps="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 481bb38f4244..6ac4c9ed8e7a 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -105,9 +105,9 @@ buildGoModule rec { changelog = "https://github.com/Aylur/ags/releases/tag/v${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ + PerchunPak foo-dogsquared johnrtitor - perchun ]; mainProgram = "ags"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix index da9e31f3d1c1..239c35c590cd 100644 --- a/pkgs/by-name/ai/aircrack-ng/package.nix +++ b/pkgs/by-name/ai/aircrack-ng/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ethtool pciutils ] - ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.hostPlatform.isClang) libiconv + ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.cc.isClang) libiconv ++ lib.optional enableAirolib sqlite ++ lib.optional enableRegex pcre2 ++ lib.optional useAirpcap airpcap-sdk; diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix index 1f1a3240624d..277092539143 100644 --- a/pkgs/by-name/ai/airtame/package.nix +++ b/pkgs/by-name/ai/airtame/package.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "airtame-application"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { url = "https://downloads.airtame.com/app/latest/linux/Airtame-${finalAttrs.version}.deb"; - hash = "sha256-zOLafN4QFDt2xnn+B8ytz+IvN8R6qje+Sge2Zb5mRZI="; + hash = "sha256-NCk//XCtn5wguMh2FjGpW28ksfUg2+euEln4gczBweY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index ad870d41515e..cec15da97f48 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -49,8 +49,8 @@ let clapJuceExtensions = fetchFromGitHub { owner = "free-audio"; repo = "clap-juce-extensions"; - rev = "4f33b4930b6af806018c009f0f24b3a50808af99"; - hash = "sha256-M+T7ll3Ap6VIP5ub+kfEKwT2RW2IxxY4wUPRQKFIotk="; + rev = "645ed2fd0949d36639e3d63333f26136df6df769"; + hash = "sha256-Lx88nyEFjPLA5yh8rrqBdyZIxe/j0FgIHoyKcbjuuI4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ai/airwindows-lv2/package.nix b/pkgs/by-name/ai/airwindows-lv2/package.nix index 6b6d3638fc21..e72c0d7444f1 100644 --- a/pkgs/by-name/ai/airwindows-lv2/package.nix +++ b/pkgs/by-name/ai/airwindows-lv2/package.nix @@ -8,14 +8,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "airwindows-lv2"; - version = "28.0"; + version = "34.0"; src = fetchFromSourcehut { owner = "~hannes"; repo = "airwindows-lv2"; - rev = "v${version}"; - sha256 = "sha256-1GWkdNCn98ttsF2rPLZE0+GJdatgkLewFQyx9Frr2sM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BLoDQ02DbTTaJ7UPh1eqSrgWe9t9PbDdgylBOI0ENGQ="; }; nativeBuildInputs = [ @@ -23,13 +23,14 @@ stdenv.mkDerivation rec { ninja pkg-config ]; + buildInputs = [ lv2 ]; - meta = with lib; { + meta = { description = "Airwindows plugins (ported to LV2)"; homepage = "https://sr.ht/~hannes/airwindows-lv2"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index adf01accaeab..8b31364ec709 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-11-28"; + version = "0-unstable-2025-12-07"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "824cfc024de0fb3894899c652277cf87faf916d2"; - hash = "sha256-P6JTgj8gL4uvrzOAIhFTM8q7tafOh03ziGTqpk9MqzQ="; + rev = "bfff4df7e63a3f6fde744e890849b21895c94e78"; + hash = "sha256-Ss91Ld2bNYD4HiO7Mgth5fwg3OVBYvZBaDQstBvvVKU="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix index c83a3c759b0b..9256ce3914c1 100644 --- a/pkgs/by-name/ak/akira-unstable/package.nix +++ b/pkgs/by-name/ak/akira-unstable/package.nix @@ -68,9 +68,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - Br1ght0ne - ]; + maintainers = [ ]; teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.akiraux.akira"; diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix index 91a4425ffda5..1a42c78c3805 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.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "Azure"; repo = "aks-mcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-VkX9zqR10h5bvFAfnNpei3f89dv7RQoZysjSRvxkdHQ="; + hash = "sha256-WkAfyaJn0iSJTe97rSpAPhjPyjhtezSqjkrbj3YAMYk="; }; - vendorHash = "sha256-qN7qqzMnl3l3Z40Mfv9jNWP7Ux7bgDCxKm+QocoruRk="; + vendorHash = "sha256-4WF3mxn5eTT6b3Xe34ju4sMLU80Whabc1scGluu7gKk="; subPackages = [ "cmd/aks-mcp" ]; diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 1614c54183c7..c2fc017a3740 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -161,7 +161,6 @@ rustPlatform.buildRustPackage (finalAttrs: { with lib.maintainers; if !withGraphics then [ - Br1ght0ne rvdp ] else diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix index 383c8887a2aa..322c6bbc13ba 100644 --- a/pkgs/by-name/al/albyhub/package.nix +++ b/pkgs/by-name/al/albyhub/package.nix @@ -23,16 +23,16 @@ in buildGoModule (finalAttrs: { pname = "albyhub"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-MbEKRdPyLlZE23UbwwWO1tSFhXG0Hs/m0NaHo9d4pD8="; + hash = "sha256-9NtXnEOHgzYM3QUwFKBJ90ZGghgU2/i+hATim4N/JSs="; }; - vendorHash = "sha256-oTyMR/Nc2CngKB2f0tAqrms6E1tsqymBr1x4OhNyK/Q="; + vendorHash = "sha256-V3uWofAchbLgIadwH4IGyv2lr0cLSz2QCQ6ffhPP9n0="; proxyVendor = true; # needed for secp256k1-zkp CGO bindings nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { frontendYarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/frontend/yarn.lock"; - hash = "sha256-fCzrNdiZTOY/fnakwheDNny9ip1Mg/gGX7+Z2N4w6lw="; + hash = "sha256-ikGH45JKheivNKwF7juC6rmwU51S3qiicDdYLzjgFJE="; }; preBuild = '' diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 96b85e6e3334..9737d8d35ecd 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "algia"; - version = "0.0.91"; + version = "0.0.93"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${version}"; - hash = "sha256-VsQBiD8OE2NHwMlYrCG43ukuBHE0bkKFt4BxsNUvLAo="; + hash = "sha256-B1win7mTU1vrdhhm8jtbemVYwUWYlEpoLN4d4FI65Is="; }; - vendorHash = "sha256-kp52vbvE6QY0SEY/2D1f1EbDzqweQkNOepN0We4I9ko="; + vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 15e15148b331..fa227de7d5e2 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -9,16 +9,15 @@ versionCheckHook, callPackage, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "alist"; - version = "3.45.0"; - webVersion = "3.45.0"; + version = "3.55.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; - tag = "v${version}"; - hash = "sha256-h8oWeTX3z3xye5O4+s7LA7Wm36JOrsU+UdKGZXaDKXk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/psFL/dCG82y1uWEcg45JG6S7+MD0avqU/HjrR+vklA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,13 +29,9 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - web = fetchzip { - url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-rNVa+dr/SX2aYHBzeV8QdD5XYCFyelhbqkTpvhF+S2g="; - }; proxyVendor = true; - vendorHash = "sha256-IMoLVAgOaVM1xIFDe8BGOpzyBnDMfD9Q6VogFfOWFzU="; + vendorHash = "sha256-aRnS3LLG25FK1ELKd7K1e5aGLmKnQ7w/3QVe4P9RRLI="; buildInputs = [ fuse ]; @@ -46,13 +41,13 @@ buildGoModule rec { "-s" "-w" "-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe \"" - "-X github.com/alist-org/alist/v3/internal/conf.Version=${version}" - "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${webVersion}" + "-X github.com/alist-org/alist/v3/internal/conf.Version=${finalAttrs.version}" + "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${finalAttrs.passthru.webVersion}" ]; preConfigure = '' rm -rf public/dist - cp -r ${web} public/dist + cp -r ${finalAttrs.passthru.web} public/dist ''; preBuild = '' @@ -92,12 +87,17 @@ buildGoModule rec { passthru = { updateScript = lib.getExe (callPackage ./update.nix { }); + webVersion = "3.55.0"; + web = fetchzip { + url = "https://github.com/AlistGo/alist-web/releases/download/${finalAttrs.passthru.webVersion}/dist.tar.gz"; + hash = "sha256-v0o4G2mzd63sShJZRjijIFAUB+ocvF4jspxf841lZ8U="; + }; }; meta = { description = "File list/WebDAV program that supports multiple storages"; homepage = "https://github.com/alist-org/alist"; - changelog = "https://github.com/alist-org/alist/releases/tag/v${version}"; + changelog = "https://github.com/alist-org/alist/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ agpl3Only # alist-web @@ -115,4 +115,4 @@ buildGoModule rec { ]; mainProgram = "alist"; }; -} +}) diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index 613c2fced83e..a94c8219489f 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alistral"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "RustyNova016"; repo = "Alistral"; tag = "v${finalAttrs.version}"; - hash = "sha256-IJ12v/mmrs6jW6jWPHEjtS74lSLWSIvJejQz4BTFbEQ="; + hash = "sha256-lbdyE/k28fJzrOQEKDL8ZLnm6tNcAM4tsfHpcGlJB9s="; }; - cargoHash = "sha256-x695jOKR/s5J/51LUqPlNMgGzsoq8D8KR9gLjyLPfkA="; + cargoHash = "sha256-smoUGJSMmRKdnUz4L+LvPOH/A6CHVmkiHxdyesu+BTw="; buildNoDefaultFeatures = true; # Would be cleaner with an "--all-features" option diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 4a79630308b3..1548ed75cc53 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-H0+XAOVXg9UAvWQC1hVUQs5AbqCVpw9NKtRKhm7m9Lw="; + hash = "sha256-JZ0LbULvUwovGtKMiENV6OiBhOQMOqBMdLs874x95HA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 62f7ad8193e0..3c2d21d9bc92 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2283"; + version = "2.0.2290"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-5AT8ZJ0PmKPckTAS4sOwMlqdMmiaoZmrhVAj1J+z9d8="; + hash = "sha256-cumzHLrvUdHT/mKhgyE1Fb3AP6pWmAuJ06a86RUE/BM="; }; - npmDepsHash = "sha256-9ix3O5vf0KLNAl43gyWX+e2K6Vj/kEU24N+mcOE8U0w="; + npmDepsHash = "sha256-0dnBcikS6EvoIDqNhiKovyoj/d5IGiSNhPwRP6eDhIg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index ca26df86d19d..d5b8599491b4 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -22,7 +22,6 @@ pipewire, glib-networking, bash, - fetchpatch, }: let @@ -34,24 +33,16 @@ let in pythonPackages.buildPythonApplication rec { pname = "alpaca"; - version = "8.3.1"; + version = "8.5.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-X3kITzZBcpN3kYDiT2PTu9UvuWQ/XSq3tVYYMa1btnY="; + hash = "sha256-1/Tg1L7/6ODhSdHYiEky5E33cNC5ZTCzLNd369yTz7o="; }; - # TODO: remove in the next release - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Jeffser/Alpaca/pull/1043.patch"; - hash = "sha256-y0NiT0FvyB/fKvi+5E0hSzDs1Ds2ydqRO1My83bnmYY="; - }) - ]; - postPatch = '' substituteInPlace src/widgets/activities/terminal.py \ --replace-fail "['bash', '-c', ';\n'.join(self.prepare_script())]," "['${bash}/bin/bash', '-c', ';\n'.join(self.prepare_script())]," diff --git a/pkgs/by-name/al/alpine-make-rootfs/package.nix b/pkgs/by-name/al/alpine-make-rootfs/package.nix index a4ca51ba7495..af1302b7c80c 100644 --- a/pkgs/by-name/al/alpine-make-rootfs/package.nix +++ b/pkgs/by-name/al/alpine-make-rootfs/package.nix @@ -16,13 +16,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "alpine-make-rootfs"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "alpinelinux"; repo = "alpine-make-rootfs"; tag = "v${version}"; - hash = "sha256-sNqaMBtbklSBcKxsc3ROI30bE1PUzJJeZqLqC9p3H+U="; + hash = "sha256-ktGJXPJK94RbdqcgsA3fA8+MO0inaRcwaDLx18KFo1w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 2bcdd3b50dc1..ff6861a29cdc 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -6,7 +6,7 @@ darwin, fetchFromGitHub, coreutils, - net-tools, + unixtools, util-linux, stdenv, dmidecode, @@ -90,7 +90,7 @@ buildGoModule rec { substituteInPlace agent/platform/platform_unix.go \ --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace-fail '"/bin", "hostname"' '"${net-tools}/bin/hostname"' \ + --replace-fail '"/bin", "hostname"' '"${unixtools.hostname}/bin/hostname"' \ --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix index 5a867c83cceb..2223debdcacc 100644 --- a/pkgs/by-name/am/amneziawg-go/package.nix +++ b/pkgs/by-name/am/amneziawg-go/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "amneziawg-go"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amneziawg-go"; tag = "v${version}"; - hash = "sha256-xz807BLNoh1sMfyDXMAXPU9mHSxfxI3k5ayEVQM+HH0="; + hash = "sha256-JGmWMPVgereSZmdHUHC7ZqWCwUNfxfj3xBf/XDDHhpo="; }; postPatch = '' @@ -21,7 +21,7 @@ buildGoModule rec { rm -f format_test.go ''; - vendorHash = "sha256-VYDc6oI0CqW1T3tVX0CWQLfLIOvqHCawVA8BWASWLLY="; + vendorHash = "sha256-ZO8sLOaEY3bii9RSxzXDTCcwlsQEYmZDI+X1WPXbE9c="; subPackages = [ "." ]; diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 7c03c5d2da9a..b2bfa353734b 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1764374502-g55c558" + "@sourcegraph/amp": "^0.0.1764921674-g2aab2c" } }, "node_modules/@napi-rs/keyring": { @@ -228,10 +228,10 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1764374502-g55c558", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1764374502-g55c558.tgz", - "integrity": "sha512-YYJXFvE5a3kDmXWU4RjUHuIpwMehHXgiJOLmOuA/ztmLV9H5vRRlx4Nfk6BsOLWbN+HyF45hW/HZUzse3kJF8Q==", - "license": "Sourcegraph Commercial License", + "version": "0.0.1764921674-g2aab2c", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1764921674-g2aab2c.tgz", + "integrity": "sha512-TWDUHrEX1qK0nS1bg740q2+m0z3O/Udr5+8rqU97lchgYBVVzlrNhDrvy/dbzOoAc0m0FX9R1WFsdRTcgWv7bQ==", + "license": "Amp Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.9" }, diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index d60561871b9d..3b5c9dfa7587 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1764374502-g55c558"; + version = "0.0.1764921674-g2aab2c"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-klsg2qYdrOCfYsTnLNEqXOJtbeGRKcJxQVyv7jGr77o="; + hash = "sha256-N4BSXADVFAkvpVTDVJTnwGwmavydRT2Utq2SZdQiiVI="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-l5z57KOyJst0OZIcYK4qS7+KuZkmJLrpXR3nAJKorfE="; + npmDepsHash = "sha256-RtvUbBeHyKmMMplg+vy49ZW5SulZIFcNXIHhw6kDgpU="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 46143ee1b2a3..feb57d9803d2 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-11-29"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "e1c45b0e0dcc50065913f6953466f1eef1028440"; - hash = "sha256-BICDRJfewohoSHNq1DPjZ7b69S4FxPeSLotp5JeSBrQ="; + rev = "5a3820ed34f3ca149fd2aa7a795cf7aed4891374"; + hash = "sha256-VLleaYgqpLXGDj762zQPQQeitWP/mtiEQ8ffx/9bUvA="; }; dontConfigure = true; diff --git a/pkgs/data/themes/andromeda-gtk-theme/default.nix b/pkgs/by-name/an/andromeda-gtk-theme/package.nix similarity index 93% rename from pkgs/data/themes/andromeda-gtk-theme/default.nix rename to pkgs/by-name/an/andromeda-gtk-theme/package.nix index da49e70adeba..281c0eee0b57 100644 --- a/pkgs/data/themes/andromeda-gtk-theme/default.nix +++ b/pkgs/by-name/an/andromeda-gtk-theme/package.nix @@ -56,12 +56,12 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Elegant dark theme for gnome, mate, budgie, cinnamon, xfce"; homepage = "https://github.com/EliverLara/Andromeda-gtk"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jakedevs romildo ]; diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix index 48e150b19463..36ec20e30d36 100644 --- a/pkgs/by-name/an/angrr/package.nix +++ b/pkgs/by-name/an/angrr/package.nix @@ -11,26 +11,32 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "angrr"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "linyinfeng"; repo = "angrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-pBVbzrTy/IWIo6WlhM1qgowfxSU31awyHcRDHNArBMo="; + hash = "sha256-PT3oCNPRvEroyVNiICeO0hSHDzKUC6KcP9HnIw1kMQE="; }; - cargoHash = "sha256-DoQIJCs36ZmTxdsDCzquKAeOSIUBbo2V+DTx68FZiu4="; + cargoHash = "sha256-lDOH4Ceap69fX6VWbgQoQfmYWZI+jPE0LJiXmqrTRn8="; + + buildAndTestSubdir = "angrr"; nativeBuildInputs = [ installShellFiles ]; + postBuild = '' + mkdir --parents build/{man-pages,shell-completions} + cargo xtask man-pages --out build/man-pages + cargo xtask shell-completions --out build/shell-completions + ''; postInstall = '' install -m400 -D ./direnv/angrr.sh $out/share/direnv/lib/angrr.sh - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installManPage build/man-pages/* installShellCompletion --cmd angrr \ - --bash <($out/bin/angrr completion bash) \ - --fish <($out/bin/angrr completion fish) \ - --zsh <($out/bin/angrr completion zsh) + --bash build/shell-completions/angrr.bash \ + --fish build/shell-completions/angrr.fish \ + --zsh build/shell-completions/_angrr ''; passthru = { @@ -44,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "Tool for auto Nix GC roots retention"; + description = "Temporary GC Roots Cleaner"; homepage = "https://github.com/linyinfeng/angrr"; license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ yinfeng ]; diff --git a/pkgs/by-name/an/anki/addons/anki-connect/default.nix b/pkgs/by-name/an/anki/addons/anki-connect/default.nix index 9f401e93ce60..f585a5358ecf 100644 --- a/pkgs/by-name/an/anki/addons/anki-connect/default.nix +++ b/pkgs/by-name/an/anki/addons/anki-connect/default.nix @@ -6,12 +6,12 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "anki-connect"; - version = "25.9.6.0"; + version = "25.11.9.0"; src = fetchFromSourcehut { owner = "~foosoft"; repo = "anki-connect"; tag = finalAttrs.version; - hash = "sha256-ZPjGqyxTyLg5DtOUPJWCBC/IMfDVxtWt86VeFrsE41k="; + hash = "sha256-cnAH4qIuxSJIM7vmSDU+eppnRi6Out9oSWHBHKCGLZI="; }; sourceRoot = "${finalAttrs.src.name}/plugin"; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix index 2c552d249beb..a6cd86a9178c 100644 --- a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix +++ b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix @@ -6,12 +6,12 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "anki-quizlet-importer-extended"; - version = "2025.03.13"; + version = "2025.09.28"; src = fetchFromGitHub { owner = "sviatoslav-lebediev"; repo = "anki-quizlet-importer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-46j/CXhsrehu00P5QLuOj/08gNlFeJttslAFLgz7AJ8="; + hash = "sha256-j/ow/HCc70dD/BpMDqGx7rib7G0FfxazzjuPmEQbYTk="; }; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix b/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix index 7ba361c8590c..a2bee74f9053 100644 --- a/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix +++ b/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix @@ -7,13 +7,13 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "local-audio-yomichan"; - version = "0-unstable-2025-04-26"; + version = "0-unstable-2025-08-07"; src = fetchFromGitHub { owner = "yomidevs"; repo = "local-audio-yomichan"; - rev = "34750f1d8ca1cb473128fea7976a4d981e5e78a4"; + rev = "14d33271303d0f6c99675a0b91f3041c49aba125"; sparseCheckout = [ "plugin" ]; - hash = "sha256-2gyggcvxParay+1B7Sg2COKyocoxaRO1WTz+ymdRp4w="; + hash = "sha256-Ce0ejEWTDMpbhPnOlY18I/hQD4VodkLncvg15VCJ0gI="; }; sourceRoot = "${finalAttrs.src.name}/plugin"; processUserFiles = '' diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 18d3abb17da3..f7199744612f 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-11-24"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "ad51ae48c533ad6a7d5f70c1477beb0f853cb107"; - hash = "sha256-HB5h75jaJ9gPaxCuS7OlPcCZfukVycT6yYq1NrxpwAA="; + rev = "845679e472b40f092d574d1bcb71e9e95d3366da"; + hash = "sha256-6aB6sBDh/0XGLK3M206oxCTBPqy+AbDJL4DrvNbSFU4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 70bf4c82dc06..4e8ad58e7b43 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -1,30 +1,28 @@ { - fetchurl, lib, stdenv, + fetchFromGitLab, pkg-config, - boost, - lua, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ansifilter"; version = "2.22"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - hash = "sha256-zP9BynQLgTv5EDhotQAPQkPTKnUwTqkpohTEm5Q+zJM="; + src = fetchFromGitLab { + owner = "saalen"; + repo = "ansifilter"; + tag = finalAttrs.version; + hash = "sha256-jCgucC5mHkDwVtTKP92RBStxpouQCR7PHWkDt0y+9BM="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost - lua + nativeBuildInputs = [ + pkg-config ]; postPatch = '' # avoid timestamp non-determinism with '-n' - substituteInPlace makefile --replace 'gzip -9f' 'gzip -9nf' + substituteInPlace makefile --replace-fail 'gzip -9f' 'gzip -9nf' ''; makeFlags = [ @@ -32,16 +30,17 @@ stdenv.mkDerivation rec { "conf_dir=/etc/ansifilter" ]; - meta = with lib; { - description = "Tool to convert ANSI to other formats"; + meta = { + description = "ANSI sequence filter"; mainProgram = "ansifilter"; longDescription = '' - Tool to remove ANSI or convert them to another format - (HTML, TeX, LaTeX, RTF, Pango or BBCode) + Ansifilter handles text files containing ANSI terminal escape codes. + The command sequences may be stripped or be interpreted to generate formatted + output (HTML, RTF, TeX, LaTeX, BBCode, Pango). ''; - homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://gitlab.com/saalen/ansifilter"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/an/antibody/package.nix b/pkgs/by-name/an/antibody/package.nix index a526eadc61ae..d013cc767dc4 100644 --- a/pkgs/by-name/an/antibody/package.nix +++ b/pkgs/by-name/an/antibody/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { mainProgram = "antibody"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; # golang.org/x/sys needs to be updated due to: # diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index a3af8a55d4cb..5a93df560882 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.11.9", + "version": "1.11.17", "vscodeVersion": "1.104.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/linux-x64/Antigravity.tar.gz", - "sha256": "193a4a61da608c526fbc329670e892ab0a961d3a65ce49485de1ca08804e472d" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/linux-x64/Antigravity.tar.gz", + "sha256": "4548789f5e30ad13ef341ef112f3a399b2d6b0e0cc95e7bf5a0625b08a5a7120" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/linux-arm/Antigravity.tar.gz", - "sha256": "26bd6a220f10c449e6552f9f6a9b7c7c40aaf70324113877a8339539cf0c3bdc" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/linux-arm/Antigravity.tar.gz", + "sha256": "6f12c3f5909368846b771b7bcd61db1cb1a79774957a542373bdc5e059b264f6" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/darwin-x64/Antigravity.zip", - "sha256": "bdd0d0f239cf408ac21ff264785882285a4790758e48f407893ee035adbbe917" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/darwin-x64/Antigravity.zip", + "sha256": "24a91f781a27cf9843deb13c9f47525ad9ea762b4fe62fdd65e98dac92261d3b" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/darwin-arm/Antigravity.zip", - "sha256": "3536282e726713b1f0b0d4fc4f162c15e18584f73466b285c05550a895a21d76" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/darwin-arm/Antigravity.zip", + "sha256": "179f61df2b5b72660761ba5110fdc8f6bf68b0224ca1bebb88d5b9a2c5690e7a" } } } diff --git a/pkgs/by-name/an/anyrun-provider/package.nix b/pkgs/by-name/an/anyrun-provider/package.nix new file mode 100644 index 000000000000..fae29181f492 --- /dev/null +++ b/pkgs/by-name/an/anyrun-provider/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "anyrun-provider"; + version = "25.12.0"; + + src = fetchFromGitHub { + owner = "anyrun-org"; + repo = "anyrun-provider"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4rN2vWicM6Pn6eTo3Nu7IB5isbkc9u4arNMnY2+S8iM="; + }; + + cargoHash = "sha256-xd1FnYsIjWuAYGfqTdRhzje3ALis5VaHIKeImlAjVVI="; + + strictDeps = true; + enableParallelBuilding = true; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple program to load Anyrun plugins and interact with them"; + homepage = "https://github.com/anyrun-org/anyrun-provider"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + khaneliman + NotAShelf + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 219f5760b084..65cf9d4ee3dc 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, wrapGAppsHook4, + anyrun-provider, cairo, gdk-pixbuf, glib, @@ -16,16 +17,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "anyrun"; - version = "25.9.3"; + version = "25.12.0"; src = fetchFromGitHub { owner = "anyrun-org"; repo = "anyrun"; tag = "v${finalAttrs.version}"; - hash = "sha256-IlnFA/a9Clgbt+FuavIKWtauhtH4Fo/rGJIjJDDeYRs="; + hash = "sha256-KEEJLERvo04AsPo/SWHFJUmHaGGOVjUoGwA9e8GVIQQ="; }; - cargoHash = "sha256-gP324zqfoNSYKIuTJFTWRr2fKBreVZFfZNR+jUasp/8="; + cargoHash = "sha256-IDrDgmksDdKw5JYY/kw+CCEIDJ6S2KARxUDSul713pw="; strictDeps = true; enableParallelBuilding = true; @@ -48,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { preFixup = '' gappsWrapperArgs+=( + --prefix PATH ":" ${lib.makeBinPath [ anyrun-provider ]} --prefix ANYRUN_PLUGINS : $out/lib ) ''; @@ -56,7 +58,11 @@ rustPlatform.buildRustPackage (finalAttrs: { install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/ ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + # This is used for detecting whether or not an Anyrun package has the provider + inherit anyrun-provider; + }; meta = { description = "Wayland-native, highly customizable runner"; diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix index f8ab850e37c2..b32ab0553bc6 100644 --- a/pkgs/by-name/ao/ao3downloader/package.nix +++ b/pkgs/by-name/ao/ao3downloader/package.nix @@ -8,14 +8,14 @@ # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8 python312Packages.buildPythonApplication rec { pname = "ao3downloader"; - version = "2025.6.1"; + version = "2025.11.0"; pyproject = true; src = fetchFromGitHub { owner = "nianeyna"; repo = "ao3downloader"; tag = "v${version}"; - hash = "sha256-ukS3uku8OW5nhM2Nr0IxAiG03XfqUn/Xyd0lZDGGkWw="; + hash = "sha256-EXoDUeadR25XpUNkXIALbZOqUJIdTNdbfYZoVwgZq7U="; }; build-system = with python312Packages; [ diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index 93f1369d6b71..f50d76e6161a 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -336,7 +336,6 @@ buildPythonPackage rec { homepage = "https://airflow.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ - bhipple gbpdt ingenieroariel ]; diff --git a/pkgs/by-name/ap/apkg/package.nix b/pkgs/by-name/ap/apkg/package.nix index 73866d43c3b8..0fcca3c6e04e 100644 --- a/pkgs/by-name/ap/apkg/package.nix +++ b/pkgs/by-name/ap/apkg/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "apkg"; - version = "0.7.1"; + version = "1.0.0"; format = "pyproject"; src = fetchFromGitLab { @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "packaging"; repo = "apkg"; tag = "v${version}"; - hash = "sha256-YiuJVwwLnka2KUh0xNPkcBuMSQHMyMzgoipiDzZvDI4="; + hash = "sha256-UQHiG6clAt+pmc0MTCkO4NIzr8TZmJ6Yd/T0YTkBxv0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 63105c63311a..d2daa5a58443 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -5,7 +5,7 @@ libspelling, fetchFromGitHub, python312Packages, - nodePackages, + mathjax, meson, ninja, pkg-config, @@ -57,7 +57,7 @@ python312Packages.buildPythonApplication { # Use mathjax from nixpkgs to avoid loading from CDN + '' substituteInPlace apostrophe/preview_converter.py \ - --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" + --replace-fail "--mathjax" "--mathjax=file://${mathjax}/lib/node_modules/mathjax/tex-chtml-full.js" ''; # Should be done in postInstall, but meson checks this eagerly before build diff --git a/pkgs/by-name/ap/appmenu-glib-translator/package.nix b/pkgs/by-name/ap/appmenu-glib-translator/package.nix index 310b3e5b5548..efb480c32452 100644 --- a/pkgs/by-name/ap/appmenu-glib-translator/package.nix +++ b/pkgs/by-name/ap/appmenu-glib-translator/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for translating from DBusMenu to GMenuModel"; homepage = "https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/tree/${finalAttrs.version}/subprojects/appmenu-glib-translator"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ap/apulse/package.nix b/pkgs/by-name/ap/apulse/package.nix index ac2ab9763b6f..67a79a6ef5bd 100644 --- a/pkgs/by-name/ap/apulse/package.nix +++ b/pkgs/by-name/ap/apulse/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/i-rinat/apulse/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.jagajaga ]; mainProgram = "apulse"; }; }) diff --git a/pkgs/by-name/ap/apx/package.nix b/pkgs/by-name/ap/apx/package.nix index a03aae7eb73c..1c0d2a083888 100644 --- a/pkgs/by-name/ap/apx/package.nix +++ b/pkgs/by-name/ap/apx/package.nix @@ -6,6 +6,10 @@ distrobox, podman, writableTmpDirAsHomeHook, + curl, + jq, + common-updater-scripts, + writeShellScript, }: buildGoModule rec { @@ -76,6 +80,26 @@ buildGoModule rec { --zsh <($out/bin/apx completion zsh) ''; + passthru.updateScript = writeShellScript "update-apx" '' + set -euo pipefail + PATH=${ + lib.makeBinPath [ + curl + jq + common-updater-scripts + ] + }:$PATH + + echo "Fetching latest version for vanilla-apx-configs..." + LATEST_CONFIG=$(curl -s https://api.github.com/repos/Vanilla-OS/vanilla-apx-configs/releases/latest | jq -r .tag_name | sed 's/^v//') + + echo "Updating versionConfig to $LATEST_CONFIG..." + update-source-version apx "$LATEST_CONFIG" --version-key=versionConfig --source-key=configsSrc + + echo "Updating main apx package..." + nix-update apx + ''; + meta = { description = "Vanilla OS package manager"; longDescription = '' @@ -94,6 +118,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ dit7ya chewblacka + masrlinu ]; mainProgram = "apx"; }; diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 40e50b6b8176..87eb027d78b5 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -7,19 +7,21 @@ glibcLocales, fetchFromGitHub, installShellFiles, + versionCheckHook, + nix-update-script, }: let canExecuteHost = stdenv.buildPlatform.canExecute stdenv.hostPlatform; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "argc"; version = "1.23.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-in2ymxiSZbs3wZwo/aKfu11x8SLx4OHOoa/tVxr3FyM="; }; @@ -45,7 +47,12 @@ rustPlatform.buildRustPackage rec { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--argc-version"; + passthru = { + update-script = nix-update-script { }; tests = { cross = ( @@ -63,12 +70,12 @@ rustPlatform.buildRustPackage rec { description = "Command-line options, arguments and sub-commands parser for bash"; mainProgram = "argc"; homepage = "https://github.com/sigoden/argc"; - changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; + changelog = "https://github.com/sigoden/argc/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit # or asl20 ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 34961c75eb1b..ccec9fd24637 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -46,7 +46,7 @@ buildGoModule rec { if (stdenv.buildPlatform == stdenv.hostPlatform) then "$out/bin/argo" else - "${pkgsBuildBuild.argo}/bin/argo" + "${pkgsBuildBuild.argo-workflows}/bin/argo" } completion $shell > argo.$shell installShellCompletion argo.$shell done diff --git a/pkgs/by-name/ar/aria2/package.nix b/pkgs/by-name/ar/aria2/package.nix index aaab59f0fb4c..6eb58a32fb3e 100644 --- a/pkgs/by-name/ar/aria2/package.nix +++ b/pkgs/by-name/ar/aria2/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - Br1ght0ne koral timhae ]; diff --git a/pkgs/by-name/ar/arj/package.nix b/pkgs/by-name/ar/arj/package.nix index e094a87cd245..b3184062ad49 100644 --- a/pkgs/by-name/ar/arj/package.nix +++ b/pkgs/by-name/ar/arj/package.nix @@ -61,7 +61,6 @@ gccStdenv.mkDerivation (finalAttrs: { provided by ARJ Software, Inc. ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix index 9ee50a47a602..08469ca6f0a4 100644 --- a/pkgs/by-name/ar/artix-games-launcher/package.nix +++ b/pkgs/by-name/ar/artix-games-launcher/package.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { description = "Launcher for games by Artix Entertainment"; homepage = "https://www.artix.com/downloads/artixlauncher"; license = lib.licenses.unfree; - mainProgram = "artix-game-launcher"; + mainProgram = "artix-games-launcher"; maintainers = with lib.maintainers; [ jtliang24 ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix index aa41b8204d54..3583b61e5e93 100644 --- a/pkgs/by-name/as/ascii-draw/package.nix +++ b/pkgs/by-name/as/ascii-draw/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "ascii-draw"; - version = "1.2.0"; + version = "1.3.0"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; tag = "v${version}"; - hash = "sha256-M+cRJ6gJBbgWM6HodrYK0MTvqP+AAMjz3B6pJftypEM="; + hash = "sha256-AwcOFqPWPJoZt3spWdl0AlGZ25aEIhP45EO3pjb14hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index 2d8d7e6137f3..e81f5b3460e1 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; - maintainers = with maintainers; [ garbas ]; license = with licenses; [ mit ]; mainProgram = "asciinema-scenario"; }; diff --git a/pkgs/by-name/as/asio/package.nix b/pkgs/by-name/as/asio/package.nix new file mode 100644 index 000000000000..01b982933956 --- /dev/null +++ b/pkgs/by-name/as/asio/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + openssl, + boost, + testers, + asioVersion ? "1.36.0", +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "asio"; + version = asioVersion; + + src = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "asio"; + tag = "asio-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; + hash = + { + # Preserve 1.32.0 because some project depends on asio/io_service.hpp + "1.32.0" = "sha256-PBoa4OAOOmHas9wCutjz80rWXc3zGONntb9vTQk3FNY="; + "1.36.0" = "sha256-BhJpE5+t0WXsuQ5CtncU0P8Kf483uFoV+OGlFLc7TpQ="; + } + .${asioVersion} or (throw "Unsupported asio version. Please use overrideAttrs directly"); + }; + + sourceRoot = "${finalAttrs.src.name}/asio"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + # Only used for test coverage + checkInputs = [ + openssl + boost + ]; + + configureFlags = lib.optionals finalAttrs.finalPackage.doCheck [ + # Only used in tests, "HAVE_BOOST_COROUTINE" + "--enable-boost-coroutine" + + # There is also the "--with-boost" flag, but + # after several tests, it doesn't make any difference + # in the output. + ]; + + enableParallelBuilding = true; + + doCheck = true; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + homepage = "https://think-async.com/Asio"; + description = "Cross-platform C++ library for network and low-level I/O programming"; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ "asio" ]; + }; +}) diff --git a/pkgs/by-name/as/asleap/package.nix b/pkgs/by-name/as/asleap/package.nix index 8c6697c33435..605d1dc0ee4f 100644 --- a/pkgs/by-name/as/asleap/package.nix +++ b/pkgs/by-name/as/asleap/package.nix @@ -5,17 +5,18 @@ openssl, libpcap, libxcrypt, + nix-update-script, }: stdenv.mkDerivation { pname = "asleap"; - version = "0-unstable-2021-06-20"; + version = "0-unstable-2020-11-28"; src = fetchFromGitHub { - owner = "zackw"; + owner = "joswr1ght"; repo = "asleap"; - rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f"; - hash = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8="; + rev = "254acabba34cb44608c9d2dcf7a147553d3d5ba3"; + hash = "sha256-MQjPup3EX7DCXY/zyroTj/+U2GIq12+VQQJD0gru7C8="; }; buildInputs = [ @@ -33,11 +34,14 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { homepage = "https://github.com/zackw/asleap"; description = "Recovers weak LEAP and PPTP passwords"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "asleap"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/as/asmjit/package.nix b/pkgs/by-name/as/asmjit/package.nix index b00a9944c81d..007affbf0340 100644 --- a/pkgs/by-name/as/asmjit/package.nix +++ b/pkgs/by-name/as/asmjit/package.nix @@ -4,17 +4,18 @@ cmake, ninja, lib, + nix-update-script, }: stdenv.mkDerivation { pname = "asmjit"; - version = "0-unstable-2025-02-12"; + version = "1.18-unstable-2025-11-03"; src = fetchFromGitHub { owner = "asmjit"; repo = "asmjit"; - rev = "029075b84bf0161a761beb63e6eda519a29020db"; - hash = "sha256-/9F1rFNPwJUrVOVeK9sIA+Q7UrqQpQy8T6g4ywcoJc8="; + rev = "b56f4176cb9b0c0501da659ac54d4c5877862c7b"; + hash = "sha256-fOYJak+DiGM3vazKwOffTGuqPuUi7p+I0phBmtfqzME="; }; nativeBuildInputs = [ @@ -24,6 +25,8 @@ stdenv.mkDerivation { strictDeps = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = with lib; { description = "Machine code generation for C++"; longDescription = '' diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 9959222ab73d..3eea4d0d4c76 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.16.1"; + version = "2.16.2"; src = fetchFromGitHub { owner = "withastro"; repo = "astro"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-nZ00Zvks5O+6PvT68kiA3Y6/5yfOwKEpyIf8sPoURNo="; + hash = "sha256-ZH+g1pnasVvbNVg3Id6/rlwqjIr7qRgitqOSilgpX64="; }; # https://pnpm.io/filtering#--filter-package_name-1 @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { prePnpmInstall ; fetcherVersion = 2; - hash = "sha256-RVQfXvCRz8+t/En8FP+wQZD2qJiwlIUzmDK2aYfEK28="; + hash = "sha256-M2Xef5yTEQCLPzzx7WGQYplTrND+DPMy1hyEuahK+kM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/by-name/as/asymptote/package.nix similarity index 94% rename from pkgs/tools/graphics/asymptote/default.nix rename to pkgs/by-name/as/asymptote/package.nix index c40eef77c647..c5ab1571c8a5 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -6,7 +6,6 @@ bison, glm, flex, - wrapQtAppsHook, cmake, pkg-config, libglut, @@ -14,6 +13,7 @@ imagemagick, fftw, eigen, + libsForQt5, libtirpc, boehmgc, libGLU, @@ -24,8 +24,6 @@ gsl, libsigsegv, python3, - qtbase, - qtsvg, boost186, zlib, perl, @@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { flex bison texinfo - wrapQtAppsHook + libsForQt5.wrapQtAppsHook cmake ghostscriptX perl @@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { zlib perl curl - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg # relies on removed asio::io_service # https://github.com/kuafuwang/LspCpp/issues/52 boost186 @@ -199,11 +197,11 @@ stdenv.mkDerivation (finalAttrs: { # make: *** [Makefile:272: install-asy] Error 1 enableParallelInstalling = false; - meta = with lib; { + meta = { description = "Tool for programming graphics intended to replace Metapost"; homepage = "https://asymptote.sourceforge.io/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix index 0b3714faf8cd..39c82ef9715a 100644 --- a/pkgs/by-name/at/atproto-goat/package.nix +++ b/pkgs/by-name/at/atproto-goat/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "atproto-goat"; - version = "0.1.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "goat"; tag = "v${finalAttrs.version}"; - hash = "sha256-xbvSO3keFheklnzPNEceS01CjIG3pPB+8e2M+3PD85U="; + hash = "sha256-ECkazbwg25L8W8w7B6hlKD1rEAjGBRKaZ76rKSfR0vI="; }; postPatch = '' @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { --replace-fail '"github.com/earthboundkid/versioninfo/v2"' "" ''; - vendorHash = "sha256-hLsMme054E23NV8GDHsmZTYh/vY/w8gKWvpVIPeAiCY="; + vendorHash = "sha256-t35Y+llIr2vpBr/LA6WurqxUH7fVTgT9Y8OHX8v8xP4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 7e67e3fedee2..4a5cbbcd09f9 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation { description = "Frontend for arcade cabinets and media PCs"; homepage = "http://attractmode.org"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.hrdinka ]; platforms = lib.platforms.unix; mainProgram = "attract"; }; diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index af849e4513f1..601c56d7bbca 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -19,17 +19,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin-desktop"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "atuinsh"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-XuPbfD6yEt82kHOIiKyxXyKcOkXEF/AsuE7Cde6QNNA="; + hash = "sha256-VDIC1BGgaFTiTnydJdEhVeUgVrH43MzpF4VkfgQ+Nas="; }; cargoRoot = "./."; - cargoHash = "sha256-nmxF7IKmdLr2l6y///7pqcEBe7ijTYWSmB3cy6tTf9E="; + cargoHash = "sha256-gYYmtxMWst0ZB/YzJf/0FGOedoVpMgTq5qq+3m2R7T8="; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 919298baf10e..b5f091610d45 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "audacity"; - version = "3.7.5"; + version = "3.7.6"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${finalAttrs.version}"; - hash = "sha256-gTky+wORQ6n3EepOUA8Y2zc8AocqjGP42N42G6FXRS8="; + hash = "sha256-Y59bKs0l97HJWiCHYBkzbbHJsmraUkM2qRGfKSXjT80="; }; patches = [ diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 14a33d3d05c5..d40d6e50dd11 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-PndZRmgbM2d/hQgdxM1ZJ7jkOxlogxV5z0IFiowWM1g="; + hash = "sha256-tZAjZXBh/uxvn/wlPdCQaS4CoIgMb+SWKYQfcIzTTnk="; }; - vendorHash = "sha256-QH0DRhuq6ErtvRfkbVwNyKRqXlqVYYgk4fR/UTLet78="; + vendorHash = "sha256-sc3tbsY26AJK6TiyehxaWzpZtGoJaUs6Hgef1DkMogk="; ldflags = [ "-s" diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index e2bf4633bae5..dc93f6fc4fa6 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.7.13"; + version = "7.8.1"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${version}"; - hash = "sha256-frwLoksLHa8/YqedpDaWjfdZsE5PkYlzqQzP217nA88="; + hash = "sha256-QB967n8UEDaqgQl2HaBHag66r75M6aERkkf+9PeZQlw="; }; proxyVendor = true; - vendorHash = "sha256-doEgENt/ceyhxhVNsQej6vA6xw5OgftJ/pGVFBKh4jo="; + vendorHash = "sha256-gpStE66S/0oyt7hpyllwx2pxgfua3AUR0OIPvgAMq0k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 2e25db120539..18ecc92b4754 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -208,7 +208,6 @@ py.pkgs.buildPythonApplication rec { changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ - bhipple davegallant devusb anthonyroussel diff --git a/pkgs/by-name/aw/awslimitchecker/package.nix b/pkgs/by-name/aw/awslimitchecker/package.nix index e309decf0818..e4c9d704ebe7 100644 --- a/pkgs/by-name/aw/awslimitchecker/package.nix +++ b/pkgs/by-name/aw/awslimitchecker/package.nix @@ -57,7 +57,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "http://awslimitchecker.readthedocs.org"; changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ zakame ]; mainProgram = "awslimitchecker"; }; } diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 5f40fe492596..075ae9673996 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -246,9 +246,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.6.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.1-py2.py3-none-any.whl", - "hash": "sha256-kfhttzgrlnyAoD6pe7PKjGHdKE0U6G1GYNe1a4ZA3f0=", + "version": "1.6.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.2-py2.py3-none-any.whl", + "hash": "sha256-le+/kTHWOoDqV/DDgl2yjTboQhx+X/S92PHt8Yqqpf4=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { @@ -316,9 +316,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.7.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.7.0-py3-none-any.whl", - "hash": "sha256-4JG0UHInWxi49cXPUoLlfP8FIg9VTjmzFiWfn0to3LQ=", + "version": "1.7.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.7.1-py3-none-any.whl", + "hash": "sha256-zwyUqKbMpIxrRiN54GKigcok/spfBle2lPojqWpSVs0=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { @@ -405,6 +405,13 @@ "hash": "sha256-gS+82UbXH2fh7TrIsAxDqyaeM0iMwebt4v0ImJIs07Y=", "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" }, + "edge-action": { + "pname": "edge-action", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b2-py3-none-any.whl", + "hash": "sha256-wtIkeQPRlEAEL/PXTVuPaUoQbabFKDKLc/RML+qaBGM=", + "description": "Microsoft Azure Command-Line Tools Extension for Azure Front Door Edge Actions" + }, "edgeorder": { "pname": "edgeorder", "version": "0.1.0", @@ -687,9 +694,9 @@ }, "migrate": { "pname": "migrate", - "version": "2.0.1b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-2.0.1b1-py3-none-any.whl", - "hash": "sha256-vRMg/oeqSFXwZaB6J6RO51U6kjWdE4O7EWc/i4LxOmU=", + "version": "3.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b1-py3-none-any.whl", + "hash": "sha256-/u8DKXNf95To56AMM3dm4eXueSW7JylQgzW/fBiqB0U=", "description": "Support for Azure Migrate preview" }, "mixed-reality": { @@ -974,9 +981,9 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.11.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.1-py3-none-any.whl", - "hash": "sha256-VMxvHxjPVpnUcLZRMUv8PR95lT490FPulbAXutW9pDo=", + "version": "1.11.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.3-py3-none-any.whl", + "hash": "sha256-InE7FOgJKt68+9lpaskYhpINxLAR2VrIKdAbKt7hBOw=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { @@ -1121,9 +1128,9 @@ }, "workload-orchestration": { "pname": "workload-orchestration", - "version": "4.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.1.0-py3-none-any.whl", - "hash": "sha256-9+pQFtpZzIEk4971hNJuB6gxu7WtRtDO69zt6jgq60A=", + "version": "4.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.2.0-py3-none-any.whl", + "hash": "sha256-gl+8YfetxLgAKUzvehihHGGWTLpi0T57LKRzmuwvWww=", "description": "Microsoft Azure Command-Line Tools WorkloadOperations Extension" }, "workloads": { diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 13f234ebdbe8..84f7ec3ae088 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -196,14 +196,15 @@ connectedk8s = mkAzExtension rec { pname = "connectedk8s"; - version = "1.9.3"; + version = "1.11.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedk8s-${version}-py2.py3-none-any.whl"; - hash = "sha256-4OuN92PXzIWgOWhWu/S4ofQ4AbITH6XSG1soUOljY+8="; + hash = "sha256-Hl/+mS1Aj5Vsq2VFWrJuYmhXglt/wCr0ld67tK+tMak="; description = "Microsoft Azure Command-Line Tools Connectedk8s Extension"; propagatedBuildInputs = with python3Packages; [ azure-graphrbac azure-mgmt-hybridcompute kubernetes + oras pycryptodome pyyaml ]; diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index b6066170892b..313926ebeb3a 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.80.0"; + version = "2.81.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-PIsOBltX2WBFCV4kdHkGPefBe/FGF9GQ5otXznE87aA="; + hash = "sha256-Z8luIR1G9rLlt9GSOsCIAU87JZ9uolv2kHaDz6xlKYU="; }; # put packages that needs to be overridden in the py package scope diff --git a/pkgs/by-name/ba/babeldoc/package.nix b/pkgs/by-name/ba/babeldoc/package.nix new file mode 100644 index 000000000000..9555945b107c --- /dev/null +++ b/pkgs/by-name/ba/babeldoc/package.nix @@ -0,0 +1,90 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch2, + writableTmpDirAsHomeHook, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "babeldoc"; + version = "0.5.22"; + pyproject = true; + + src = fetchFromGitHub { + owner = "funstory-ai"; + repo = "BabelDOC"; + tag = "v${version}"; + hash = "sha256-ArLTv5AjpUdbsN8bQs03ATwg5ugXetld2FmHhicU8OE="; + }; + + patches = [ + (fetchpatch2 { + name = "rename-python-levenshtein-to-levenshtein"; + url = "https://github.com/funstory-ai/BabelDOC/pull/542.patch?full_index=1"; + hash = "sha256-rjXhKVFivkJo54WdYiihqB3lrlu4YEwVZZkE4WBatWs="; + }) + ]; + + build-system = with python3Packages; [ hatchling ]; + + dependencies = + with python3Packages; + [ + bitstring + configargparse + httpx + huggingface-hub + numpy + onnx + onnxruntime + openai + orjson + charset-normalizer + cryptography + peewee + psutil + pymupdf + rich + toml + tqdm + xsdata + msgpack + pydantic + tenacity + scikit-image + freetype-py + tiktoken + levenshtein + opencv-python-headless + rapidocr-onnxruntime + pyzstd + hyperscan + rtree + chardet + scipy + uharfbuzz + scikit-learn + ] + ++ httpx.optional-dependencies.socks + ++ (with xsdata.optional-dependencies; cli ++ lxml ++ soap); + + pythonImportsCheck = [ "babeldoc" ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + python3Packages.pytestCheckHook + versionCheckHook + ]; + versionCheckKeepEnvironment = "HOME"; + + meta = { + description = "PDF scientific paper translation and bilingual comparison library"; + homepage = "https://github.com/funstory-ai/BabelDOC"; + changelog = "https://github.com/funstory-ai/BabelDOC/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ryota2357 ]; + mainProgram = "babeldoc"; + }; +} diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix index 2bf5dd4392c5..95f5f51dfcaf 100644 --- a/pkgs/by-name/ba/backblaze-b2/package.nix +++ b/pkgs/by-name/ba/backblaze-b2/package.nix @@ -105,7 +105,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ hrdinka ]; mainProgram = "backblaze-b2"; }; } diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index fdfd40d1c701..0c2104ae9cb7 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -21,16 +21,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "23.2.2"; + version = "23.2.8"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-HAcsFGLUUaeNxEBAFgYjDipu8QTsd+8yptC6kAX0C4g="; + hash = "sha256-qczkG1+6sn/n+Ew/HD5Ki8epZW3UEpREc3fjS2VS1go="; }; - npmDepsHash = "sha256-dT5WrrzrO5tcP4/NFe5WTG7boYTOlFRNut52X2AWaao="; + npmDepsHash = "sha256-b5LNCOai6DyJx5VDaNHWFq9rvj5g9kwXqnUoS7fb8z4="; makeCacheWritable = true; diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix index f88ee2795720..d3ff5f1baf73 100644 --- a/pkgs/by-name/ba/bandwhich/package.nix +++ b/pkgs/by-name/ba/bandwhich/package.nix @@ -48,8 +48,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/imsnif/bandwhich"; changelog = "https://github.com/imsnif/bandwhich/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - Br1ght0ne + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "bandwhich"; diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix index 67b472979183..6769751b6c04 100644 --- a/pkgs/by-name/ba/bazaar/package.nix +++ b/pkgs/by-name/ba/bazaar/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bazaar"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kolunmi"; repo = "bazaar"; tag = "v${finalAttrs.version}"; - hash = "sha256-isswXfOJZ04MQbaQ6AcNSxasNllGSRS6vukskS0FvCk="; + hash = "sha256-78X2Vxytxan0OD7cNgL1y4LUBaqgoKb+k80sCIi9ag4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index 1d4e0db9b8d0..84d4445c5f64 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ps.pillow ps.setuptools ps.psycopg2 + ps.webrtcvad ])) ] ++ runtimeProgDeps; diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix index b75df275c641..22c6bf019ee2 100644 --- a/pkgs/by-name/ba/bazel-buildtools/package.nix +++ b/pkgs/by-name/ba/bazel-buildtools/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ elasticdog - uri-canva ]; teams = [ lib.teams.bazel ]; }; diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix index faebda902e1a..b88e1803456a 100644 --- a/pkgs/by-name/ba/bazel-watcher/package.nix +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bazel-watcher"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - hash = "sha256-b99Fx9OY9SKYp56hQd39kmVQI5NvYnxKyIsqIxkQ2tE="; + hash = "sha256-zbZhV1IjFW4USdj3MGdyfPabfCPUmAAaGBaguXqmcnY="; }; vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY="; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 4b9196ea4a96..cc8db4bff9ef 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.32.1"; + version = "1.33.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-SY1dKFAlLHOyAGaBmqCMDM6pAHKByHEyTcv1EAHQBVU="; + hash = "sha256-beIZtDc38p5P/S4xS3qDIvLoYbqDbExwqHac2OvgmBY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-LLodbtdUc8WGUkZmwiKrmjd7EaxkFP7QqEbLoESAKAQ="; + hash = "sha256-tZ6YfDycssQPdwz+Db5p+CQz5AblgLzKPVr4z/EDhEg="; }; postPatch = '' diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix similarity index 74% rename from pkgs/data/icons/beauty-line-icon-theme/default.nix rename to pkgs/by-name/be/beauty-line-icon-theme/package.nix index af4c09e9adff..c92199cd7dc0 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix @@ -2,16 +2,16 @@ lib, stdenvNoCC, fetchFromGitLab, - breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon, jdupes, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "BeautyLine"; version = "2.4"; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme hicolor-icon-theme mint-x-icons @@ -44,20 +44,20 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/icons/${pname} - cp -r * $out/share/icons/${pname}/ - gtk-update-icon-cache $out/share/icons/${pname} + mkdir -p $out/share/icons/BeautyLine + cp -r * $out/share/icons/BeautyLine/ + gtk-update-icon-cache $out/share/icons/BeautyLine jdupes --link-soft --recurse $out/share runHook postInstall ''; - meta = with lib; { + meta = { description = "BeautyLine icon theme"; homepage = "https://www.gnome-look.org/p/1425426/"; - platforms = platforms.linux; - license = [ licenses.publicDomain ]; - maintainers = with maintainers; [ lwb-2021 ]; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ lwb-2021 ]; }; } diff --git a/pkgs/by-name/be/beets/package.nix b/pkgs/by-name/be/beets/package.nix index e6b2b42c61b4..0d8837e0c0d8 100644 --- a/pkgs/by-name/be/beets/package.nix +++ b/pkgs/by-name/be/beets/package.nix @@ -1,10 +1,5 @@ { - ffmpeg, - python3Packages, + python3, }: -python3Packages.toPythonApplication ( - python3Packages.beets.override { - inherit ffmpeg; - } -) +python3.pkgs.toPythonApplication python3.pkgs.beets diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 6be77b9f5eef..fdebf9c68d12 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-KW/qq2hntXcG26atA1yRJUzSMns0e1n2U5nascU1Ci8="; + hash = "sha256-5UzicbR+JzLgPLilPHO9HKteC632cJc5EQanPPc0lj8="; }; proxyVendor = true; - vendorHash = "sha256-YPCC8xK4lRtRzNjx6U8O7/+PqhhOaM/QofnOvH1rg9Y="; + vendorHash = "sha256-wZPhjzDD2T7CYz0Y0QkFarnTOsJzm5snlp9KnBuOc3U="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix index 6b6e9f67eab1..7b5ee7064910 100644 --- a/pkgs/by-name/be/betula/package.nix +++ b/pkgs/by-name/be/betula/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "betula"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromSourcehut { owner = "~bouncepaw"; repo = "betula"; rev = "v${version}"; - hash = "sha256-f2F0YRhDnKdMqcUvpcRFNAI62gbusfzIUKQSZ65onMU="; + hash = "sha256-zrJkQNQmkp0JiXZL3YSPEkeavEJhu5KnONfOze9pttY="; }; - vendorHash = "sha256-3PS4fIyHbGGjnbMOy2VIQBXsnIyYDKR/ecl/i5jwSVM="; + vendorHash = "sha256-8YDilb03J7fd6dj9CohvDDe9ylwXrrREvCP83yGpTyg="; env.CGO_ENABLED = 1; # These tests use internet, so are failing in Nix build. diff --git a/pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch b/pkgs/by-name/bi/bibata-cursors-translucent/0001-fix-broken-symlinks.patch similarity index 100% rename from pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch rename to pkgs/by-name/bi/bibata-cursors-translucent/0001-fix-broken-symlinks.patch diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix similarity index 100% rename from pkgs/data/icons/bibata-cursors/translucent.nix rename to pkgs/by-name/bi/bibata-cursors-translucent/package.nix diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix index 2774c5e7d208..cbe0a347ebfc 100644 --- a/pkgs/by-name/bi/bikeshed/package.nix +++ b/pkgs/by-name/bi/bikeshed/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "bikeshed"; - version = "5.4.2"; + version = "7.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6V4hj+Ech/vft9cNPwg2LqKTPzGqgVERooOok3lda94="; + hash = "sha256-KDa751bPpyu++7N5rTN1XvOXZ2qOFSaajw7dIe7CAWw="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 42dead3fbe99..66614552c970 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.3-2"; - arm64-hash = "sha256-MhMeOVTex4W9qTAWXMx88kjOgoN0REHBqDY25K25tYc="; - x86_64-hash = "sha256-os6wN0gOKIYRTHXrN66T2J1wYgyH/J1VLTq4GPtk5tQ="; + version = "1.17.4-1"; + arm64-hash = "sha256-76Ac+nTDkAsv9YpSaOwer8PeC8g5asVJw4xMYQ7B5Jo="; + x86_64-hash = "sha256-ajB3ojue6+e5aSgzhgyonHl+ACKnt7PqsUe/s3xY568="; } diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 44e30ee403ff..db693ab7d95e 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "bililiverecorder"; - version = "2.17.3"; + version = "2.18.0"; src = fetchzip { url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; - hash = "sha256-bmwRa8pQWCzP3SeZQsUZ9r0UbGypN5c6oeGa6XR/Hqo="; + hash = "sha256-b1hHLf0w+XwBBbnvP07Ik6bwIWSs13MPVjIN5b1n+C4="; stripRoot = false; }; diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix index 91fb2c200f5f..0ddf9cae4d8e 100644 --- a/pkgs/by-name/bi/bingo/package.nix +++ b/pkgs/by-name/bi/bingo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "bingo"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; tag = "v${finalAttrs.version}"; - hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54="; + hash = "sha256-8rkKYX1LlDLR2NK59YyH15KyP0HQsbwN/K1uKXg1nq8="; }; - vendorHash = "sha256-cDeeRkTwuwEKNTqK/6ZEKANrjTIUTeR3o5oClkJQ4AE="; + vendorHash = "sha256-7Si2TyH9RKnD5+TvcLSbgZ95ZyEvs7BfadIsnxuEY1U="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go diff --git a/pkgs/by-name/bi/bitwarden-desktop/electron-builder-package-lock.patch b/pkgs/by-name/bi/bitwarden-desktop/electron-builder-package-lock.patch index 7a31b4a06076..d0e75a1f7068 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/electron-builder-package-lock.patch +++ b/pkgs/by-name/bi/bitwarden-desktop/electron-builder-package-lock.patch @@ -1,28 +1,12 @@ -From 0629bb5b90e54491263e371bc5594e9f97ba0af4 Mon Sep 17 00:00:00 2001 -From: Andrew Marshall -Date: Tue, 12 Mar 2024 11:48:15 -0400 -Subject: [PATCH] Fix using unlocked dependencies in electron-builder - -electron-builder will perform its "installing production dependencies" -step using this package.json, and without the package-lock.json, NPM -will try to fetch package metadata to install the latest, unlocked -dependencies. ---- - apps/desktop/webpack.main.js | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js -index 9d683457d9..0ad707956e 100644 ---- a/apps/desktop/webpack.main.js -+++ b/apps/desktop/webpack.main.js -@@ -70,6 +70,7 @@ const main = { - new CopyWebpackPlugin({ - patterns: [ - "./src/package.json", -+ "./src/package-lock.json", - { from: "./src/images", to: "images" }, - { from: "./src/locales", to: "locales" }, - ], --- -2.43.2 - +diff --git a/apps/desktop/webpack.base.js b/apps/desktop/webpack.base.js +index c9da84cd2e..3738bac27e 100644 +--- a/apps/desktop/webpack.base.js ++++ b/apps/desktop/webpack.base.js +@@ -110,6 +110,7 @@ module.exports.buildConfig = function buildConfig(params) { + new CopyWebpackPlugin({ + patterns: [ + path.resolve(__dirname, "src/package.json"), ++ path.resolve(__dirname, "src/package-lock.json"), + { from: path.resolve(__dirname, "src/images"), to: "images" }, + { from: path.resolve(__dirname, "src/locales"), to: "locales" }, + ], diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 486745feac1f..1a189b89ec96 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,10 +3,10 @@ buildNpmPackage, cargo, copyDesktopItems, + dart, darwin, electron_37, fetchFromGitHub, - fetchpatch2, gnome-keyring, jq, llvmPackages_18, @@ -34,13 +34,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2025.10.0"; + version = "2025.11.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-A7bxAdFDChr7yiexV70N3tqhaUVAwJdGhhRKJyX0ra8="; + hash = "sha256-0djpeXHHqA8tVcQsE/yCDZVnoEuYwUpln2Hhj2chGNc="; }; patches = [ @@ -55,11 +55,6 @@ buildNpmPackage' rec { ./skip-afterpack-and-aftersign.patch # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node ./dont-use-platform-triple.patch - - (fetchpatch2 { - url = "https://github.com/bitwarden/clients/commit/cd56d01894c38cf046a7e44dcacc7e0ff2aa2a37.patch?full_index=1"; - hash = "sha256-NRZiM+Y/ifh77vS+8mldbiwv/vPDr1JUOJzSu2tFMS8="; - }) ]; postPatch = '' @@ -92,7 +87,7 @@ buildNpmPackage' rec { "--ignore-scripts" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-Qhj8Lh25vNnJzbUm/M+mKIc6Fa5plSCiy53vjevs7Tc="; + npmDepsHash = "sha256-l5Lcm1ggF7qFqNuSYRoRPf1Gbt/gH3g6dYu30YTXgsI="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -102,7 +97,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-fgnf+yT3UV8dHTE2tDHdBWTBW+LHAYI/JGgfS0J/Bgk="; + hash = "sha256-WhiKqN+FCR/c9BuwhQT0EoidGUkP2ueSlsnupUflVlM="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -135,6 +130,9 @@ buildNpmPackage' rec { exit 1 fi + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail "\''${compiler_module_1.compilerModule}/dart-sass/src/dart" "${lib.getExe' dart "dartaotruntime"}" + pushd apps/desktop/desktop_native/napi npm run build popd diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index c8046c46e19b..0216baee623c 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -16,52 +16,57 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.48"; + version = "1.92.51"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-QrZxLPpybFhx07zaorbziEumcTFhPvcr7Jp+YPev978="; - "8.2" = "sha256-tdKr+LWQVC1yFUpJeUMDXbADNf5YEDbtFQaKDDBPH5g="; - "8.3" = "sha256-1Bix9VvBj2fJxFrLe3oQgOoWUw56yBOBgHr5TFVy/kM="; - "8.4" = "sha256-WAPBF6WC2zjE8lcs+oYlDc4uw9AL3xh74BwthTGWRR0="; + "8.1" = "sha256-HxVqkPupo3LrKfbQGOqoxpGJjFN17Jlkdya4BjBsBVw="; + "8.2" = "sha256-ssbMa4Wa27nwhJZ16FT+qrB4LH/HztOtCx+MI+i16Pg="; + "8.3" = "sha256-p9SXxHQGmsjtSeRFt9vYS5XK6nouT7qbqmlWbEpb2Hk="; + "8.4" = "sha256-ArI/SNjPIbjwEBMHvKCdSOkth8qqBWT6W0RnoWyWA+o="; + "8.5" = "sha256-5e4f9iEn5QPZY6Z+05O7QxTwaW+cjmP6nB5fkpValoM="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-sVvlvZU1orXVcoL//6LREjKoolBMYCbp1kdLGmu2n5A="; - "8.2" = "sha256-+ki66xW3g/LB2gtkb2RR3NOQa53ni+ZwcyMMz9sAPlY="; - "8.3" = "sha256-OyljLCFUyrdKh11760t9KdqJ4PX2dVYNEL09xJZed3Q="; - "8.4" = "sha256-QH8vFkFDGyR+MaSX5cVfxPN8MOfyAuWhMKVfqPUhjnk="; + "8.1" = "sha256-mTw8v5DaP7D5qb3XwRZvx8XH4bTiuu2xzzo82KsrrZU="; + "8.2" = "sha256-Vtb0DVfPBC0JtK1XOPQ8KmA0Jq0pBBA3jkDaCV7icGg="; + "8.3" = "sha256-vnL8gfA6ejMcpnfKXalSOvl7vixwQLJBC3DTO4Dafow="; + "8.4" = "sha256-x9/BcZPJib0hal6M2vUVk1cLmN1gc3k6hypViTqForo="; + "8.5" = "sha256-aVmQ8vHS/oQeb44RyV5hggOt+VXLqP7wKDxgfpbopQQ="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-1mgubWu32VjdoQSzHrdpGOBeh0cwPUwplMg4KlZZT0o="; - "8.2" = "sha256-7xc4lLE6ZHUstFxTWQ9ACdGuM+gk5oDGvKwFew65Mpk="; - "8.3" = "sha256-yBSSEb6clcn01Jl3rsVrak5xaOgYq8NuWE/m+hwtzxY="; - "8.4" = "sha256-+YdfU0t9r1rqK0FYKkZYvJXSFscmSZqn59mpEYBdgck="; + "8.1" = "sha256-S41qr5wU2dsK0IBsR/mTALguPQU+SKYVTLP7DwGQo40="; + "8.2" = "sha256-eQkvDRxwQNXlkZ9XzcSRfkKjp/CTZGaFwolXq6TZWaE="; + "8.3" = "sha256-GBjjx0cSJjYCOdDiArUPA4iqOcgpk3y9o0wi6b6UJgM="; + "8.4" = "sha256-s4zcHogsOy1GjTAGJuO6i7S6dp/lmRVzbjJk3/t8Zn4="; + "8.5" = "sha256-/lFwv6p9izXj7X+pqZe9clcp+wSYtzIPnwqeE/HFqNk="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-xadHLt5wwbjYVFPJ85Crim2jwpCFIB3u3UrKguo5dKs="; - "8.2" = "sha256-yypsjRm5wQFWpnxwki0ySmabhW4OnRuxghCgF3g/gC8="; - "8.3" = "sha256-xbZnN0FAMSb5PKU6UFjC60+d/Y9rINyFjrBsJpSKUhA="; - "8.4" = "sha256-7iX3Pa7+hxY4rKM9hfaoMJWwGC8MbYjOpSY+iP3vUhc="; + "8.1" = "sha256-+ko465G24UELdMmEg4ZqOA9p0/0DSs3p+On6Gg2IVMM="; + "8.2" = "sha256-TERILY6E1vnl+L6t+oel+1H3HTHWTTeEb1rVXtriJ8w="; + "8.3" = "sha256-R5Ue3erVCe1gOPk1SuDRXGA05WPm1IisHCnbXfmjFcw="; + "8.4" = "sha256-qqbmZa4qd7Ck87GylHeHP9m3K47DAEiTxlKdtXEnzVo="; + "8.5" = "sha256-3d9glqfXCMXwtLZm8fuj9DVzCIczynX7MRxnbMC7/NE="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-CpbeEqyi/QyapWuZQI16E6cNalvRZVCmvHy2dv/RSQo="; - "8.2" = "sha256-v68HLqnFKm88LAMbC8VCJgdWSuW4fWCQyPm1kNgG/K4="; - "8.3" = "sha256-QLsyUKKbqi/1leNKqADbvsRmwe2f387tQ4NlKGiftOc="; - "8.4" = "sha256-hc+BxTod1UcMYIBsiC/MPE9IbNO1/q+MIU+xv6dF/YU="; + "8.1" = "sha256-XvV6x8LKjR4j081PIdKpYCVl+ayXOmPsXf+gsMeFOro="; + "8.2" = "sha256-qxFWj1HpWokwzsFTiRhi4vw67H8yLwu1xbhja+fAxqY="; + "8.3" = "sha256-ffrwc48MZzX0MJHbaDmWQpday1LicOxhR2+fwylItD0="; + "8.4" = "sha256-P8j8gc8lZRbuVd1UmSpYmle88h50vhJfNxTZp3v9/Sg="; + "8.5" = "sha256-zy24hLCTajY+BVdkJCiXoy8abhQ82Ntw7Wuqn6zJKOQ="; }; }; }; diff --git a/pkgs/by-name/bl/blend2d/package.nix b/pkgs/by-name/bl/blend2d/package.nix index 6963e12f5b9d..85b1dec72dbf 100644 --- a/pkgs/by-name/bl/blend2d/package.nix +++ b/pkgs/by-name/bl/blend2d/package.nix @@ -4,17 +4,18 @@ fetchFromGitHub, cmake, asmjit, + nix-update-script, }: stdenv.mkDerivation { pname = "blend2d"; - version = "0.12"; + version = "0.21.2-unstable-2025-11-03"; src = fetchFromGitHub { owner = "blend2d"; repo = "blend2d"; - rev = "717cbf4bc0f2ca164cf2f0c48f0497779241b6c5"; - hash = "sha256-L3wDsjy0cocncZqKLy8in2yirrFJoqU3tFBfeBxlhs0="; + rev = "def0d1238c3e5d0983bb848e5676049d829e435b"; + hash = "sha256-b9DlgJNpMSLMM+xrM7sKVRH/DAoGHhOrwq5sw4OKH+k="; }; outputs = [ @@ -26,6 +27,8 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeFeature "ASMJIT_DIR" (toString asmjit.src)) ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "2D Vector Graphics Engine Powered by a JIT Compiler"; homepage = "https://blend2d.com"; diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index e61c102be3e4..f1650b8b90b8 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -1,23 +1,24 @@ { lib, - # Module requires Go 1.25, drop pin once buildGoModule uses Go >= 1.25. - buildGo125Module, + buildGoModule, fetchFromGitHub, nix-update-script, }: -buildGo125Module (finalAttrs: { +buildGoModule (finalAttrs: { pname = "bluetuith"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "darkhz"; repo = "bluetuith"; tag = "v${finalAttrs.version}"; - hash = "sha256-h7SMGI8wIiu4i2kcKRsmLHM4tu7ZZK0usBXh5zFu94E="; + hash = "sha256-jxN4FLefv+edlpBnwDN/pBxZ7sHkv2w+R2tUeNCI6Tw="; }; - vendorHash = null; + vendorHash = "sha256-baSiOHiB02hfqDt95ldeKwz+tJgunXheTvREznxPUSc="; + + subPackages = [ "." ]; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index c85585dd0b27..1bfd9cf6d8b8 100644 --- a/pkgs/by-name/bo/bookstack/package.nix +++ b/pkgs/by-name/bo/bookstack/package.nix @@ -8,16 +8,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "bookstack"; - version = "25.11.4"; + version = "25.11.6"; src = fetchFromGitHub { owner = "bookstackapp"; repo = "bookstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hyob7OF9AOsu4AjS6qu8A93AsumSXiyWPDKWGAz6mJ0="; + hash = "sha256-2JyWCP2ISgl82P6W5dL5Zbl+phgREQEonQ+12fu3q/E="; }; - vendorHash = "sha256-srlqwp0/Gfs6hWO9IGSCwR3yTxz+euYgoVkU+UnaLio="; + vendorHash = "sha256-7T2pdzjqkT0bRw1d7IVVFHjJ22qKNj4czf5q8Xbs/aw="; passthru = { phpPackage = php83; diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index f4051cc380cb..14179a18a3a4 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "bootdev-cli"; - version = "1.20.6"; + version = "1.21.1"; src = fetchFromGitHub { owner = "bootdotdev"; repo = "bootdev"; tag = "v${version}"; - hash = "sha256-/53s+XYMhxo9i1ZeWuV3xiZnhcS5rBJUvM3acb8TiWM="; + hash = "sha256-1uPI//w8RVqwRO1sVkI3vtdXduyuFp8632CVyAjkaSA="; }; vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index 035a28d2f0c6..d64d4f105631 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -161,7 +161,6 @@ python.pkgs.buildPythonApplication rec { mainProgram = "borg"; maintainers = with maintainers; [ dotlambda - globin ]; }; } diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 4b5f708223f8..44e29be66877 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.9.14"; + version = "7.9.15"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "bosh-cli"; rev = "v${version}"; - sha256 = "sha256-Chsnok59Q0lmYa9J8XGX3SlDsUjRoUcPArLVHTGkt3k="; + sha256 = "sha256-+dkRPK4RFVainDa4SNiA9B14uz3vaIfAjv09T3dDGIw="; }; vendorHash = null; diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix index bf412476d179..71a066a55262 100644 --- a/pkgs/by-name/bo/boulder/package.nix +++ b/pkgs/by-name/bo/boulder/package.nix @@ -4,17 +4,18 @@ buildGoModule, testers, boulder, + minica, nix-update-script, }: buildGoModule rec { pname = "boulder"; - version = "2025-04-17"; + version = "0.20251118.0"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; - tag = "release-${version}"; + tag = "v${version}"; leaveDotGit = true; postFetch = '' pushd $out @@ -22,11 +23,16 @@ buildGoModule rec { find $out -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-FXk+JZJ1azpgN6IQ9aYmpUEO1CGs9/3sog1NjrfB4d8="; + hash = "sha256-JVkIu8Fh5F8WQXa45I0hnSedAaIQIOFidtWVpVHbAWA="; }; vendorHash = null; + postPatch = '' + # We already built the application with custom settings. This fails, so we have to disable it. + substituteInPlace test/certs/generate.sh --replace-fail 'make build' "" + ''; + subPackages = [ "cmd/boulder" ]; ldflags = [ @@ -40,9 +46,14 @@ buildGoModule rec { ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\"" ''; + nativeCheckInputs = [ minica ]; + preCheck = '' # Test all targets. unset subPackages + # Generate integration test certificates, but skip webpki certificates that are hard to make without errors and are currently unneeded. + mkdir test/certs/webpki + bash test/certs/generate.sh ''; # Tests that fail or require additional services. @@ -58,6 +69,7 @@ buildGoModule rec { "TestAddPrecertificateIncomplete" "TestAddPrecertificateKeyHash" "TestAddPrecertificateNoOCSP" + "TestAddRateLimitOverride" "TestAddRegistration" "TestAddReplacementOrder" "TestAddSerial" @@ -110,6 +122,7 @@ buildGoModule rec { "TestEnforceJWSAuthType" "TestExactPublicSuffixCertLimit" "TestExtractJWK" + "TestExtractRequestTarget" "TestFQDNSetExists" "TestFQDNSetTimestampsForWindow" "TestFQDNSets" @@ -249,6 +262,8 @@ buildGoModule rec { "TestRecheckCAAFail" "TestRecheckCAAInternalServerError" "TestRecheckCAASuccess" + "TestRecheckInvalidIdentifierType" + "TestRecheckSkipIPAddress" "TestRedisSource_BatchSetAndGet" "TestRedisSource_Ping" "TestRegistrationsPerIPOverrideUsage" diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 4774de09fa63..e9707cb6561a 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.84.141"; + version = "1.85.111"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-hB+sy+jeI+c2EE6nty2awmKmNRCldQ98JtjNh9eXVxQ="; + hash = "sha256-qBxlZ4xgjRb2zWrbwd+HKJXWoJxk4OICQtvutoNME00="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Pp/jZmu6vTMJctVYGUeRZYhzWc2LS9jC4Niz9cPvkoE="; + hash = "sha256-+Lz9Bv2Llc2twk0QzHmozxhsJzdlTKAakY/j2NaF7a0="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-Y/r8rFog2lyqBSBgqI1dIOsHZHTF2W8YckCJPFJ5mzc="; + hash = "sha256-39/nuKXnsslcVhy4i/YN4XEor5csMk2Ej1hsygChjXo="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-GDr1U40jT5nJscmqotluA/Wln/v9UnPVJoy2ViWAy+A="; + hash = "sha256-us6FnZZ980SnGW+1fNSajRgAUxhBQA2dcM+iKb8TWaE="; }; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 4a8a6839e94c..64543f14f4fa 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.53.0"; + version = "1.54.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-iiKfS1r62G9cBKa/KEW/SPwhZ/Pebw0mUvHy40DFCqA="; + hash = "sha256-c7q6VTXoToUSx8gsOLcsLUvriZYYyYwGAjO8VTF3JFk="; }; - cargoHash = "sha256-Hp+Fx1b0bQptNJKQeThZ3W7lSGdo6YsVAHAu69/YTX4="; + cargoHash = "sha256-jErnCexuu8PPUugsI+fRqWpqtpspDiVjnfn3it5jeK4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 7dd37842804d..3b6125b61ebb 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -20,13 +20,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-rHum5wQFQ3MuPCelJYzPo5ce4vlHA34ARgSQ6uJTE60="; + hash = "sha256-REK3rJ+Svf6bLIfLwizlLa3rIBgnhQHbhzTTe8VPoc4="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index ae9a75e7828c..96252ce5e273 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -18,13 +18,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.42.1"; + version = "1.42.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-ABZe+Ei30o7vy156Fiux9r+B5PBSW8ECYpdwnwCn66k="; + hash = "sha256-YWyA2wTIlJNwuqcPHOBFZ2wr46Z0I83FWRew/FC3Wxs="; }; outputs = [ diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix index a49c7559b328..0e9e50de1c7b 100644 --- a/pkgs/by-name/bu/bully/package.nix +++ b/pkgs/by-name/bu/bully/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; mainProgram = "bully"; }; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 18d7239562b3..924e309a48c7 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.3.3"; + version = "1.3.4"; pname = "bun"; src = @@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-9Q9cx2fDiCxGZ1++B+C3sd9xpzzlRKrbU3rZJhrwC7E="; + hash = "sha256-iAN3TkxsVcilF0ZMUI8Cgh5ttX+Uyhu1zCo59NIyalE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-Qbn08lJW24l8LBNTIOT5bDc+IK5vBtgBUYfayDWR78g="; + hash = "sha256-xG6EH+2FNHUhkVsbOQTW0XXY4v2RXhjgHBETGCGRFaQ="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-oANEA7/9GLpms1yrL3nuU+2QmNfkbijgjn+2TYL58k4="; + hash = "sha256-D3lW1Rr+1BTIJaOk+OzJvGE/9k5IkBZ3XoUU21E3s18="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-9cVGc2+VUUFFneIxFntv33sBQY6L42CfLN6d/kapOj0="; + hash = "sha256-M8aZYEno036LgVlZsUsF5bb0lhITUr8RuufQRxk8KL8="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 56f4620e854a..62458690bfa9 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.26.5"; + version = "0.26.6"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-l21tGPvbHgJOBzK+RQTa8RpeKJ8A/K6Z6CsPAjLTCUw="; + hash = "sha256-Gv5/GN4bdXoam8pctGRSkx7O3h1Xt9jJuBvygZrMKNA="; }; - cargoHash = "sha256-T3cpfujue5tMAiCCqOprG+rfqACiw4OLMsbOr2G23Jc="; + cargoHash = "sha256-ZO7SH+D1bae4wt8rb33Vsa0bKe5JbzlRjQSCm/BYZKU="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 789dee9314dc..43e2ce68aa5d 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -19,13 +19,13 @@ in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c${optionalString debug "-debug"}"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-k2XMPA+MCvPJKO3fJn/YLTkcdPFj4Hi4pEYzM4EMNUM="; + hash = "sha256-c3eZ4vczZnTRN87uOxJq605hsqtDN9n+yN5E1gggca0="; }; cmakeBuildType = if debug then "Debug" else "Release"; diff --git a/pkgs/by-name/ca/cachix/package.nix b/pkgs/by-name/ca/cachix/package.nix new file mode 100644 index 000000000000..b0f3203c5956 --- /dev/null +++ b/pkgs/by-name/ca/cachix/package.nix @@ -0,0 +1,13 @@ +{ + lib, + haskell, + haskellPackages, +}: +let + inherit (haskell.lib) compose; +in +lib.pipe haskellPackages.cachix [ + compose.justStaticExecutables + (compose.overrideCabal { mainProgram = "cachix"; }) + lib.getBin +] diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 87ab46c64e38..714f07a606b6 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -94,7 +94,6 @@ buildGo125Module (finalAttrs: { license = lib.licenses.asl20; mainProgram = "caddy"; maintainers = with lib.maintainers; [ - Br1ght0ne stepbrobd techknowlogick ryan4yin diff --git a/pkgs/by-name/ca/calcurse/package.nix b/pkgs/by-name/ca/calcurse/package.nix index 944b7c5ef7f7..4ba26ec4ee70 100644 --- a/pkgs/by-name/ca/calcurse/package.nix +++ b/pkgs/by-name/ca/calcurse/package.nix @@ -1,5 +1,6 @@ { lib, + pkg-config, stdenv, fetchurl, ncurses, @@ -11,14 +12,15 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - hash = "sha256-2GuzcBT9abjYPMuQSsl5xrjd9Z7j28gPWidFJeTVgwo="; + hash = "sha256-hJuoUsfze2dyNlywxCqUzeD+de+6kTY+lqDn73l7pWU="; }; buildInputs = [ + pkg-config ncurses gettext python3 diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 38c5e282c063..2bfc9144085b 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -3,6 +3,10 @@ python3, fetchFromGitHub, nixosTests, + perl, + radicale, + which, + xandikos, }: python3.pkgs.buildPythonApplication rec { @@ -17,6 +21,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE="; }; + postPatch = '' + patchShebangs tests + substituteInPlace tests/test_calendar-cli.sh \ + --replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" \ + --replace-fail "../bin/calendar-cli" "$out/bin/calendar-cli" + ''; + build-system = with python3.pkgs; [ setuptools ]; @@ -29,10 +40,25 @@ python3.pkgs.buildPythonApplication rec { tzlocal click six + vobject ]; - # tests require networking - doCheck = false; + nativeCheckInputs = [ + perl + (python3.pkgs.toPythonModule (radicale.override { inherit python3; })) + which + xandikos + ]; + + checkPhase = '' + runHook preCheck + + pushd tests + ./test_calendar-cli.sh + popd + + runHook postCheck + ''; passthru.tests = { inherit (nixosTests) radicale; diff --git a/pkgs/by-name/ca/capnproto-java/package.nix b/pkgs/by-name/ca/capnproto-java/package.nix index e960dc968bda..5540b1eeff75 100644 --- a/pkgs/by-name/ca/capnproto-java/package.nix +++ b/pkgs/by-name/ca/capnproto-java/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://dwrensha.github.io/capnproto-java/index.html"; license = licenses.mit; maintainers = with maintainers; [ - bhipple solson ]; }; diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 1e3bd2cb53fa..6dfb746009f1 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; tag = version; - sha256 = "sha256-MRrcSVWcvp0E135ViKbPo7a60TcYjWZNj8ZL/lJ/XDM="; + sha256 = "sha256-QbmZIbn/xPZUTXNpUjGuWTjoh8RpsMRuVIfJRO9M3xM="; }; - cargoHash = "sha256-KIc3LPkFGMvNusyRAhaejv6wZjQnDmrGn4cOTYb70KM="; + cargoHash = "sha256-oO5Kp5A2v1w6EUwgcHhyagZDIK7a/2d9uTiCoXHuHhY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix index c81559855a73..e802bbf99f41 100644 --- a/pkgs/by-name/ca/cargo-benchcmp/package.nix +++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, replaceVars, stdenv, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-benchcmp"; version = "0.4.5"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "cargo-benchcmp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I="; }; @@ -31,14 +32,16 @@ rustPlatform.buildRustPackage rec { "--skip=different_input_colored" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Small utility to compare Rust micro-benchmarks"; mainProgram = "cargo-benchcmp"; homepage = "https://github.com/BurntSushi/cargo-benchcmp"; - license = with licenses; [ + license = with lib.licenses; [ mit unlicense ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index db34248362d3..ab542c8e4628 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${version}"; - hash = "sha256-jaBIVR8N1UXihRDjQVdJtx5ErlrOHXBVs68SzD0bbPc="; + hash = "sha256-FZWBpt8QtHgPLrgck/2Yhq6hYwwP7ZLjCyA01+Jqk8M="; }; - cargoHash = "sha256-Qn/eRQ1GDFPepwgrnZObz7Bgxm9UzFNAZsdwP36A+dM="; + cargoHash = "sha256-ntW5oenx80BL51qWgqkXuLebJsBCRsyl/sevh0Hi/K0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-cache/package.nix b/pkgs/by-name/ca/cargo-cache/package.nix index adb7d99abb9a..43f827d1ad55 100644 --- a/pkgs/by-name/ca/cargo-cache/package.nix +++ b/pkgs/by-name/ca/cargo-cache/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { mit ]; maintainers = with maintainers; [ - Br1ght0ne matthiasbeyer ]; }; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 237829ae0dcf..c3b68694e7ca 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -4,16 +4,18 @@ fetchFromGitHub, pkg-config, openssl, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-component"; version = "0.21.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Tlx14q/2k/0jZZ1nECX7zF/xNTeMCZg/fN+fhRM4uhc="; }; @@ -30,12 +32,18 @@ rustPlatform.buildRustPackage rec { # requires the wasm32-wasi target doCheck = false; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Cargo subcommand for creating WebAssembly components based on the component model proposal"; homepage = "https://github.com/bytecodealliance/cargo-component"; - changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = [ ]; + changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "cargo-component"; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix index e03271e5b52c..1b8dca6d1caf 100644 --- a/pkgs/by-name/ca/cargo-cranky/package.nix +++ b/pkgs/by-name/ca/cargo-cranky/package.nix @@ -2,30 +2,33 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-cranky"; version = "0.3.0"; src = fetchFromGitHub { owner = "ericseppanen"; repo = "cargo-cranky"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas="; }; cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY="; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Easy to configure wrapper for Rust's clippy"; mainProgram = "cargo-cranky"; homepage = "https://github.com/ericseppanen/cargo-cranky"; - changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}"; - license = with licenses; [ + changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index adbde81caf1e..ae3f8f99a351 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -53,7 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kornelski/cargo-deb"; license = licenses.mit; maintainers = with maintainers; [ - Br1ght0ne matthiasbeyer ]; }; diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index 523d18ea52f0..facc5772dae0 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { mit ]; maintainers = with lib.maintainers; [ - Br1ght0ne gerschtli jb55 killercup diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix index 755648279144..367d2319b7c4 100644 --- a/pkgs/by-name/ca/cargo-fuzz/package.nix +++ b/pkgs/by-name/ca/cargo-fuzz/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { asl20 ]; maintainers = with maintainers; [ - ekleog matthiasbeyer ]; }; diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix index 400c97e58db7..1f6b7ebe1d97 100644 --- a/pkgs/by-name/ca/cargo-insta/package.nix +++ b/pkgs/by-name/ca/cargo-insta/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.44.2"; + version = "1.44.3"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; tag = version; - hash = "sha256-Wi68dVKPsCCzt726N21pga73hW1WDDUtSv+o/sJMWpk="; + hash = "sha256-xXp5XqE6teDK519IKM1FAZAAXcQHXlQF2kdRIhS7mYA="; }; - cargoHash = "sha256-ks/icINVa7oVfK5yO8H0sUCRFWWzTwURHVALUVZ8uw0="; + cargoHash = "sha256-XdeQ4BQb0/X3R4ST3ZrOo/XvSCzhRR1eqcp3uRWgX9g="; checkFlags = [ # Depends on `rustfmt` and does not matter for packaging. diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index ac8bea9754ac..48b57c5399d2 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -7,16 +7,18 @@ libgit2, openssl, zlib, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-local-registry"; version = "0.2.9"; src = fetchFromGitHub { owner = "dhovart"; repo = "cargo-local-registry"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DzBD7N7GQZ9nhF22DnxRse0P8MUGReOcXHQ56KOqW6I="; }; @@ -37,15 +39,21 @@ rustPlatform.buildRustPackage rec { # tests require internet access doCheck = false; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Cargo subcommand to manage local registries"; mainProgram = "cargo-local-registry"; homepage = "https://github.com/dhovart/cargo-local-registry"; - changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/${src.rev}"; - license = with licenses; [ + changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index 3a90d9d2c976..6fc869706b68 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -2,16 +2,17 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-mutants"; version = "25.3.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-T+BMLjp74IO71u/ftNfz67FPSt1LYCgsRP65gL0wScg="; }; @@ -20,12 +21,14 @@ rustPlatform.buildRustPackage rec { # too many tests require internet access doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Mutation testing tool for Rust"; mainProgram = "cargo-mutants"; homepage = "https://github.com/sourcefrog/cargo-mutants"; - changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 32cba7c2542b..1708d4974b12 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec { asl20 ]; maintainers = with maintainers; [ - ekleog matthiasbeyer ]; }; diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix index ead15cb184a1..8cdf0a59b69c 100644 --- a/pkgs/by-name/ca/cargo-play/package.nix +++ b/pkgs/by-name/ca/cargo-play/package.nix @@ -2,16 +2,18 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-play"; version = "0.5.1"; src = fetchFromGitHub { owner = "fanzeyi"; repo = "cargo-play"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; @@ -23,11 +25,18 @@ rustPlatform.buildRustPackage rec { "--skip=infer_override" ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Run your rust code without setting up cargo"; mainProgram = "cargo-play"; homepage = "https://github.com/fanzeyi/cargo-play"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/fanzeyi/cargo-play/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 64d3256ebc57..e2e677dbf97a 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -8,16 +8,17 @@ stdenv, curl, git, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-release"; version = "0.25.22"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NFI7UIHbo1xcH+pXim3ar8hvkn2EdIFpI2rpsivhVHg="; }; @@ -42,17 +43,20 @@ rustPlatform.buildRustPackage rec { # disable vendored-libgit2 and vendored-openssl buildNoDefaultFeatures = true; + passthru.updateScript = nix-update-script { }; + meta = { description = ''Cargo subcommand "release": everything about releasing a rust crate''; mainProgram = "cargo-release"; homepage = "https://github.com/crate-ci/cargo-release"; - changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/crate-ci/cargo-release/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit ]; maintainers = with lib.maintainers; [ gerschtli + progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index dc68a76e794c..7a7e4205232f 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-shear"; - version = "1.7.1"; + version = "1.7.2"; src = fetchCrate { pname = "cargo-shear"; version = finalAttrs.version; - hash = "sha256-GvkIXk0Ry3bm5A+PwdH4zrDtxzfJt4pd8gF/PPGsyDs="; + hash = "sha256-hZrqEbBcSSmvMRBn1V1L5Ow/drN1lAO5owu2reXrruA="; }; - cargoHash = "sha256-3PIdxoLoe9cgjr53lu7X1cGNT9wHgIG0E4jld7TK3b4="; + cargoHash = "sha256-UD0J6fofx24gqHVF/1X3RDChOSGpqfQ+37KZprZ8cIM="; env = { # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 9de6d2810b68..c76d6b282209 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -5,16 +5,18 @@ pkg-config, openssl, zlib, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-shuttle"; version = "0.57.3"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qPevl75wmOYVhTgMiJOi+6j8LBWKzM7HPhd5mdf2B+8="; }; @@ -32,17 +34,23 @@ rustPlatform.buildRustPackage rec { "cargo-shuttle" ]; - cargoTestFlags = cargoBuildFlags ++ [ + cargoTestFlags = finalAttrs.cargoBuildFlags ++ [ # other tests are failing for different reasons "init::shuttle_init_tests::" ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Cargo command for the shuttle platform"; mainProgram = "cargo-shuttle"; homepage = "https://shuttle.rs"; - changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = [ ]; + changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index 79cc437ceb85..558deb26c74d 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-D6s25pOMdVZXBtBce/KEvqwn/9owrmxDOev3E59qrQ8="; + hash = "sha256-koHQaYfMDc8GxQ+K7C1YluMY5u4cUGV8/Ehjt/KWl/g="; }; - cargoHash = "sha256-pypBvfVW7m9dAvrc9ftrBOJ/wC+xLUuhGr7g7DVdZDI="; + cargoHash = "sha256-8aFISZ2nzCmxxKkX77jEOE/MWcKwyTw8IGTEbJ0mKWg="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix index 80c2986f4e77..272194901b8c 100644 --- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix +++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix @@ -6,16 +6,18 @@ openssl, stdenv, curl, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tarpaulin"; version = "0.34.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HJgcFQrHINm4BPfZ4c5ZHQYBTSBVYdSl/n0qBlSsNOI="; }; @@ -33,17 +35,24 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Code coverage tool for Rust projects"; mainProgram = "cargo-tarpaulin"; homepage = "https://github.com/xd009642/tarpaulin"; - changelog = "https://github.com/xd009642/tarpaulin/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ + changelog = "https://github.com/xd009642/tarpaulin/blob/${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ hugoreeves + progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index b8dee6492d45..919a2c7c886b 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-A4Y9oRSzUP0Xm4BMXRzG1670GQk4yxxHJRkgIj5ExRg="; + hash = "sha256-RWKgQYUua3bfir/hAjI4TWWMRG5KOksJSG1wD5SSva0="; }; - cargoHash = "sha256-dOiqNmDYOzVadeoDefZauw0zSwuxnl3VO0KeKUJbx0E="; + cargoHash = "sha256-A85t5tAuAphTHRJ2N010r911QeM3CKf+JIAN//y2TWw="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 624f19bfb122..bede52d76dd5 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gerschtli - Br1ght0ne johntitor matthiasbeyer ]; diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 151709cecd67..40fad8f71036 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; tag = version; - sha256 = "sha256-fAZngB4Z5dd6j+CfX+Tc3NNZHGRCz1C+T7QYmUn96SM="; + sha256 = "sha256-sVW3zNe0a9iQQ0vRWJofqG4gwUJ/w0U4ugVyMNtWX98="; }; - cargoHash = "sha256-hcUZm2h7rtBiYl2JXlt/AuKfhf/5YpqTYYAWxq0dQ8U="; + cargoHash = "sha256-sRJGnbQFCk+SJtG/hnde+8ggZuutrdk0279ziickmnA="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix index f5f7927f82ee..876d4cce48d1 100644 --- a/pkgs/by-name/ca/cargo-zigbuild/package.nix +++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix @@ -4,16 +4,18 @@ fetchFromGitHub, makeWrapper, zig, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-zigbuild"; version = "0.20.1"; src = fetchFromGitHub { owner = "messense"; repo = "cargo-zigbuild"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xJiYtVrvWEBsyTbcHKsbnTpbcTryX+ZP/OjD7GP6gQU="; }; @@ -26,12 +28,18 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${zig}/bin ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool to compile Cargo projects with zig as the linker"; mainProgram = "cargo-zigbuild"; homepage = "https://github.com/messense/cargo-zigbuild"; - changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}"; + changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix index 7c44f0db531c..85da32a210fe 100644 --- a/pkgs/by-name/ca/carl/package.nix +++ b/pkgs/by-name/ca/carl/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "carl"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "b1rger"; repo = "carl"; rev = "v${version}"; - hash = "sha256-bUSQArlCfgJr/XJuuyMVNFOZzJlmpInaEGHHxRZsDW4="; + hash = "sha256-4k08iwuZjnsd2EjqnslrJa3ugPOgUvUzbY3/9mxegkQ="; }; doCheck = false; - cargoHash = "sha256-KueQLeqiHZfjyEdpURKXp6MigAcXdov8Z/KwKsiqv9Y="; + cargoHash = "sha256-1tqg/VJfgf7Y/5yM+iKYd7Vn2YCnH7RwmVPb+aO9KxY="; meta = { description = "cal(1) with more features and written in rust"; diff --git a/pkgs/by-name/ca/catch2/package.nix b/pkgs/by-name/ca/catch2/package.nix index 087ad0923f26..0551ba9828ef 100644 --- a/pkgs/by-name/ca/catch2/package.nix +++ b/pkgs/by-name/ca/catch2/package.nix @@ -24,9 +24,7 @@ stdenv.mkDerivation rec { description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; - maintainers = with maintainers; [ - edwtjo - ]; + maintainers = [ ]; platforms = with platforms; unix ++ windows; }; } diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index bee94b36009f..91e5bcf21edb 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -91,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=unused-but-set-variable" # fix "passing no argument for the '...' parameter of a variadic macro is a C++20 extension" "-Wno-error=c++20-extensions" + # fix "first argument in call to 'memset' is a pointer to non-trivially copyable type" + "-Wno-error=nontrivial-memcall" ] ); diff --git a/pkgs/by-name/cb/cbmp/package-lock.json b/pkgs/by-name/cb/cbmp/package-lock.json index cc813b7a9715..e7ece1c5289a 100644 --- a/pkgs/by-name/cb/cbmp/package-lock.json +++ b/pkgs/by-name/cb/cbmp/package-lock.json @@ -115,6 +115,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -131,6 +132,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -422,9 +424,10 @@ } }, "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -456,7 +459,8 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/bare-events": { "version": "2.2.0", @@ -502,9 +506,10 @@ } }, "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -747,9 +752,10 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -799,7 +805,8 @@ "node_modules/devtools-protocol": { "version": "0.0.1232444", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz", - "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==" + "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==", + "peer": true }, "node_modules/eastasianwidth": { "version": "0.2.0", @@ -809,7 +816,8 @@ "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" }, "node_modules/end-of-stream": { "version": "1.4.4", @@ -996,22 +1004,21 @@ } }, "node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -1145,15 +1152,13 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, - "engines": { - "node": ">=14" - }, "funding": { "url": "https://github.com/sponsors/isaacs" }, @@ -1167,9 +1172,10 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -1219,12 +1225,10 @@ } }, "node_modules/lru-cache": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", - "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", - "engines": { - "node": "14 || >=16.14" - } + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/mimic-fn": { "version": "2.1.0", @@ -1235,9 +1239,10 @@ } }, "node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1249,9 +1254,10 @@ } }, "node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -1393,6 +1399,12 @@ "node": ">= 14" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -1430,15 +1442,16 @@ } }, "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", + "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -1748,6 +1761,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -1765,6 +1779,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1778,6 +1793,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -1785,12 +1801,14 @@ "node_modules/string-width-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/string-width-cjs/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1817,6 +1835,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1828,6 +1847,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -1883,6 +1903,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "devOptional": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -1979,6 +2000,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -1996,6 +2018,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -2012,6 +2035,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -2020,6 +2044,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -2034,6 +2059,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -2044,17 +2070,20 @@ "node_modules/wrap-ansi-cjs/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/wrap-ansi-cjs/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -2068,6 +2097,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, diff --git a/pkgs/by-name/cb/cbmp/package.nix b/pkgs/by-name/cb/cbmp/package.nix index 402c3233529d..151aaf892c7d 100644 --- a/pkgs/by-name/cb/cbmp/package.nix +++ b/pkgs/by-name/cb/cbmp/package.nix @@ -21,7 +21,7 @@ buildNpmPackage rec { hash = "sha256-vOEz2KGJLCiiX+Or9y0JE9UF7sYbwaSCVm5iBv4jIdI="; }; - npmDepsHash = "sha256-zfZAZqnkKwsGkwGgfPvb3me4tFgAofE5H3d23mdAtqY="; + npmDepsHash = "sha256-3qYPttKSGlO/T3K3730vVaZ1iYRz+GoBMN2igqGQ8AM="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/by-name/cd/cdi2iso/package.nix b/pkgs/by-name/cd/cdi2iso/package.nix index 3cf014ad311d..bdeb23b2ba57 100644 --- a/pkgs/by-name/cd/cdi2iso/package.nix +++ b/pkgs/by-name/cd/cdi2iso/package.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "Very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; mainProgram = "cdi2iso"; }; diff --git a/pkgs/by-name/cd/cdktf-cli/package.nix b/pkgs/by-name/cd/cdktf-cli/package.nix index 307a09748376..7d338e863da8 100644 --- a/pkgs/by-name/cd/cdktf-cli/package.nix +++ b/pkgs/by-name/cd/cdktf-cli/package.nix @@ -142,15 +142,15 @@ stdenv.mkDerivation (finalAttrs: { "$out/lib/node_modules/cdktf-cli/node_modules/@cdktf/hcl2json/main.wasm" ''; - nativeInstallCheckInputs = [ versionCheckHook ]; - doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - updateScript = nix-update-script { }; - }; + # Tries to write to /var/empty/.terraform.d on darwin + # even with writableTmpDirAsHomeHook and CHECKPOINT_DISABLE=1 + doInstallCheck = stdenv.hostPlatform.isLinux; + + passthru.updateScript = nix-update-script { }; meta = { description = "CDK for Terraform CLI"; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 52265159a2cd..eca6b89d809c 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-SFtUfYZqD3QULEAKVOuMLKiwALtE2K8RJFbPlBM4tyw="; + hash = "sha256-mYamAH+Nb1XHczY0FgxSCP7VRB3ueOzsDJF/HWBbmts="; }; - vendorHash = "sha256-Mmc2yFgtvpLsPAud3X/7R/2wKkmsucKbkRqHsSg9Qt4="; + vendorHash = "sha256-MBHEc1+TKbSJIl+sHbiJUxyqvICxaXcwTS8HrzFzfFo="; subPackages = [ "cmd/cdncheck/" ]; diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix index 119fe1d8c79e..769488e20325 100644 --- a/pkgs/by-name/cf/cfm/package.nix +++ b/pkgs/by-name/cf/cfm/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/willeccles/cfm"; description = "Simple and fast TUI file manager with no dependencies"; license = licenses.mpl20; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "cfm"; }; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index b3670b6b7961..8d81b7e4f8ad 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; tag = "v${finalAttrs.version}"; - hash = "sha256-uqWTYhC+ADwGpUSYXKKD4t0ZSEsVxVM6hNHKewuW0Ts="; + hash = "sha256-q69ti2bEJBO7Evz8X2EQGbMP3n27fesSO1z8HaEhKJM="; }; - cargoHash = "sha256-VuCYy8awQTmOxh9efJb0t6BXcxwlkz/uJNb8bCzXMdc="; + cargoHash = "sha256-AvcbA4V9Ht9yWNOPPVQvAGULiTh7cY92NaZJbOAOk1U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ch/cheating-daddy/package.nix b/pkgs/by-name/ch/cheating-daddy/package.nix new file mode 100644 index 000000000000..bc26c2558e70 --- /dev/null +++ b/pkgs/by-name/ch/cheating-daddy/package.nix @@ -0,0 +1,97 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + copyDesktopItems, + makeWrapper, + python3, + zip, + electron, + makeDesktopItem, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "cheating-daddy"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "sohzm"; + repo = "cheating-daddy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yoUHBxiuwFdHF5uvQEFrjONnqBdks5gJgTvX1ME5Vv8="; + }; + + npmDepsHash = "sha256-HNI0I02tWXJ0Th9oownQ/akXITBs3RlVFpnnmt6kINw="; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + (python3.withPackages (ps: with ps; [ setuptools ])) + zip + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + makeCacheWritable = true; + + preBuild = '' + cp --recursive --no-preserve=mode ${electron.dist} electron-dist + pushd electron-dist + zip -0Xqr ../electron.zip . + popd + rm --recursive electron-dist + substituteInPlace node_modules/@electron/packager/dist/packager.js \ + --replace-fail "await this.getElectronZipPath(downloadOpts)" "\"$(pwd)/electron.zip\"" + ''; + + buildPhase = '' + runHook preBuild + + npm run package + + runHook postBuild + ''; + + desktopItems = [ + (makeDesktopItem { + name = "cheating-daddy"; + desktopName = "Cheating Daddy"; + genericName = "AI Assistant"; + comment = "AI assistant for interviews and learning"; + exec = "cheating-daddy"; + terminal = false; + icon = "cheating-daddy"; + categories = [ + "Development" + "Education" + ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/cheating-daddy + cp --recursive out/*/{locales,resources{,.pak}} $out/share/cheating-daddy + makeWrapper ${lib.getExe electron} $out/bin/cheating-daddy \ + --add-flags $out/share/cheating-daddy/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ + --inherit-argv0 + install -D --mode=0644 src/assets/logo.png $out/share/icons/hicolor/512x512/apps/cheating-daddy.png + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/sohzm/cheating-daddy/releases/tag/${finalAttrs.src.tag}"; + description = "Real-time AI assistant that provides contextual help during video calls, interviews, presentations, and meetings using screen capture and audio analysis"; + homepage = "https://github.com/sohzm/cheating-daddy"; + license = lib.licenses.gpl3Only; + mainProgram = "cheating-daddy"; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix index 620b6beeaf81..970b3332da07 100644 --- a/pkgs/by-name/ch/checksec/package.nix +++ b/pkgs/by-name/ch/checksec/package.nix @@ -43,7 +43,6 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice - globin sdht0 ]; }; diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json index 5a930e546f9e..5229f278ff6f 100644 --- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json +++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json @@ -7,32 +7,32 @@ "@biomejs/cli-linux-x64@npm:2.2.4": "84fbf9d4b681ad4426c5de492b4ab9200a15d4f61a71c69d4b6bfbe8f03f46e69bb951a93a85d71e0073bcf3ee1874530dad2eac3dbdd72c6084dfb59c83a1fd", "@biomejs/cli-win32-arm64@npm:2.2.4": "39d4e2ac5a41b7c092bc9a3ef1889a557b47eb15f9057db823681c1483702ee6fe96a5b2e54a444ca6e867db5d41f2e9f6a1a6dd86d13fcb686dab5d19d02333", "@biomejs/cli-win32-x64@npm:2.2.4": "741c77e74d4fcfbf74f3f5db2e29cb6bca90cd7b1c5e6af3b0cc8b5c3210b0b1f82019733e9849d18fa9fc4fe96fb4633974a2146447cc914249caf0636741e7", - "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a", - "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74", - "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183", - "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013", - "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d", - "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad", - "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b", - "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8", - "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7", - "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a", - "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3", - "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec", - "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c", - "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a", - "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8", - "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4", - "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649", - "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9", - "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41", - "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942", - "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd", - "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688", - "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d", - "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a", - "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27", - "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622", + "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5", + "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1", + "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14", + "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f", + "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a", + "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82", + "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b", + "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6", + "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37", + "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d", + "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d", + "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad", + "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3", + "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e", + "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c", + "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806", + "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409", + "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e", + "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845", + "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d", + "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b", + "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17", + "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48", + "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd", + "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e", + "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671", "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206", "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743", "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb", @@ -42,14 +42,18 @@ "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4", "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d", "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd", + "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": "952819ca53ba8d9911e8803674fb71b5854d0f2bff8e947b04a45e84915ffce29f04241359d0ce3ddff874d5ab1a61b3efdac36a5c5245732ca43250e172ff60", "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1", + "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": "74c5f218ff390c67d9a95bab314b6d0bb8f2217dd55cbe2bcee2474a5fee4be9772d7924672c5e4d9dc6589f569a1d27e1562c4bb6ec1cee50f02b4799a64849", "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371", "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f", "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b", "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571", "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3", "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d", + "@img/sharp-linuxmusl-arm64@npm:0.33.5": "1f4ef8055027962e3dcc8307e7b4ea070ae2f41ae9ef3442afd0d7515223bf66201bcbdf9097d353f4e64fd572c2ac26eec9e832597fb42da8f27fad6ec4a34d", "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475", + "@img/sharp-linuxmusl-x64@npm:0.33.5": "c82dd5576f1836947c81a2b573e1953d7b4fcdccb532473e2073024c02a999f8eb17ddb9c2fc5b0fd77a9a7a38edb9720dcfc9358e43a60e8f8eb0ea3f763bae", "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322", "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e", "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b", @@ -71,14 +75,14 @@ "@oxlint-tsgolint/linux-x64@npm:0.2.0": "c73ebab4bc4c7891873043479ee89894a575ba93f91fc0793cfc2f38f68d58b8b09980c5c9ebd037c404687e38d2f15966e9bfeab9685b40522266ef909fb047", "@oxlint-tsgolint/win32-arm64@npm:0.2.0": "6735f85196fc4c2aa5885cb7bf8b956b460f6b003589959bb83d0cab049a7fe8257a228e7bba403dba08e57b944c2a78c97087ded3e104edb340d964f604fd77", "@oxlint-tsgolint/win32-x64@npm:0.2.0": "3621b288e32c42bc71ff33b083e5ae7c941a6b13654d10a1647ebe706fe3077ae581fc85cffc70ca6d956d610abeeb254fc19ecfc3d3ecb4dde2ce1ef3b5be03", - "@oxlint/darwin-arm64@npm:1.15.0": "f6350a1c41a9056730dcd2cf7c10475a179f9561b01587e02becbb690c40ad597ed2796c9798c709ef8fcd43f789fea99734e51cb307f5ae9a35484fa0b95122", - "@oxlint/darwin-x64@npm:1.15.0": "ee808953fb0091ae283bac113b393a7cbf7820b26d5f8447d9a6b4357202260f9ef0612fb4fdb4ce7e386945c3bf5eb2ecaa5950d32f1e3400b6f0a977c9bfed", - "@oxlint/linux-arm64-gnu@npm:1.15.0": "fce42e368fff682bfdd374cc414e1f942dc37a168c58d1ca3ab67f3ea11596aa7f0a7f7ed59bef7d1701708df283f6b076ea89f6684f3ce9efcdccf8db392dee", - "@oxlint/linux-arm64-musl@npm:1.15.0": "35029e792bbfe5eb70dfeecd59a20f7cfc7b55f88ed15c3d02fa5ce64f12e4136b640a245f432e195217dec028f1f389c6236c079d35de2309e68b1f6bf9e8b6", - "@oxlint/linux-x64-gnu@npm:1.15.0": "959f2887182015cd034a877fc0f8c5beaeb95a1800978a8ad3c1ba036ff3d3308fe0c4bbd99094cdc24b83bdd0314e638e376670a5b8ba6e1c926adb94110e4d", - "@oxlint/linux-x64-musl@npm:1.15.0": "47e0ced945de40ae987067d25c1c8968b5650efd2ea1baa3319677d197130376ab7077d71c2dc940d8ab4bb2fed41d9049dd10e9312f7f1039cf42e68ace06d6", - "@oxlint/win32-arm64@npm:1.15.0": "d5e2933f5cff87c4e2a676e14345a1874b8c806b65ac662384a8ce93f8855132d6ea6092bee370f531e8d80d9bdd62721659f38370b0841476c4fc488d4e850a", - "@oxlint/win32-x64@npm:1.15.0": "f54c36908a63656f2a8e803ab94be45d7b59bfcbe7519ec951d1ae2f42f9019d247c97a1e61a1d74acaa05bba19873999c15a2cd1dc0cefc4e2a7a5be92e88c6", + "@oxlint/darwin-arm64@npm:1.22.0": "6f3aa8e6ec1bf49a7bfd01bda40c46f73782e481058e0a66d17223d96cf4be92ac33be25342e5a670be45cf68642380a42d49f36658bda95672d9b359fe08863", + "@oxlint/darwin-x64@npm:1.22.0": "7ac2e9cc92773792e84e743cf5b42449d0f5daaa8161b7c838a739d3040b267fd8ff28f25c963a63ea024f2fd1d43b881b464b2da997cef2e775b696b2e5a990", + "@oxlint/linux-arm64-gnu@npm:1.22.0": "7615f0f4a81c43099da6c8bfcf4b4e8b411b8450ca63ee4cc8733534c256d20d643015278095ca638de2aeaa0854bdab3692607f5fdfaec563fc118ffa5f3520", + "@oxlint/linux-arm64-musl@npm:1.22.0": "2ee5eb08264dbbded1ee14e1c8d03c2a3ea6875559e3381b36d18e8152bc8859402fc957a2c5cefb4b5eeaf446a4e1e82b171f7a02dbd6d2b74a54370bdc8c97", + "@oxlint/linux-x64-gnu@npm:1.22.0": "6e266a457ce5f7e642309b20bcc0a883252f9cb69f40320a9ba6e0434e85da8c8af74b2fb23fd05a9b92820365b95154c2dd6e7e2405ab96afc577daf21adccf", + "@oxlint/linux-x64-musl@npm:1.22.0": "3cdd5e965f2d09eae04967aeb26cb11d10412a93b80fef4951cff2310154e592e21ce5605e0503eb7924adb59f6c65fb79ee4378e5518cfb258b4038efe0d34a", + "@oxlint/win32-arm64@npm:1.22.0": "0a08744d207894c30ec9a89e5225805e3270ed988b4b7fdba4a3ff1bb74a5121293bd2c8ea3d3e5a6e4899e0b8e166a8fceb6a2ad4a1ddbec7070d33303212a6", + "@oxlint/win32-x64@npm:1.22.0": "7bb9839d0272891372023a7e80a649e761a2246e6f6737859fe4897b36dcbcc22a95696ed024d80211da9aa39abf27fbd360f3cb2c883eaf092628abd95e9156", "@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50", "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62", "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d", diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index d9fcf2e7ff8e..546f30af7439 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.6.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-F5TlgWorsBJ4B6/j+3WbbVMirtqCrDq+TrWW257MMek="; + hash = "sha256-A+J00wHJyCrxZSG80FKHw/c9EUfJP53v0KLjE9Jgmp8="; }; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-noZ3R4kxYw26z2qavaIb+iv7iFj5ID7O0V5fSVcAd48="; + hash = "sha256-UZm0XJ/pjfADETd6sFoMCRB0axod3WybVW+RcPuX8ms="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 75a2e5316156..30a367f022ac 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-11-27"; + version = "0.4.0-unstable-2025-12-03"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "58637366ee4a6b1da7d411b9792ebe7d9e78d8f1"; - hash = "sha256-V2TtyOMIBCxIXqm0YPJ+uGd1hb8gipDdWBQMrE4VpuY="; + rev = "ac7574adb5e1c93a2f7c32aa218b7974dd15b4e5"; + hash = "sha256-GXzegpdm61QvuXaUVokMO5rC7mrOOw2dD+0FGZLF9HY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index ceb2e3a3b91d..2598bc2848b5 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.157.0"; + version = "0.157.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-s2LrEvKS74HJ7glOGjyWPW/pVG+K0NLWljowXqlxdT4="; + hash = "sha256-5RSyU6LLAZsk4/BjGu+sRyZWRmXxm9pS/nmVobUIAws="; }; - vendorHash = "sha256-WUnwKqCu8IvOWV9+5ZEvEZ8XR1L3CB0nPl6FfQuHs3I="; + vendorHash = "sha256-V85FQHD2vuIYQnUofbLhdrNaejVYbKfXGw229ORPvSs="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 421956d3ce65..194f6eb1f6c7 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "civo"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-QZZuRHcKNncQTRgizWAH723OskVMH92eQ72wHpEINEc="; + hash = "sha256-eR/L0AkeMgtbtaV+jIhbyGN1tUYrpnIWDeKD0p9BP1Y="; }; - vendorHash = "sha256-ZoJdu8sA0r5kiADF+VB4BnOduWLbBAVGbMQs45HKDIU="; + vendorHash = "sha256-F56+450hDqAiIFt9/Jl79ltLOKMRC2NaNQM4/T4Di3k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix index 52007fc85e13..f89762e453f7 100644 --- a/pkgs/by-name/cl/cl-wordle/package.nix +++ b/pkgs/by-name/cl/cl-wordle/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/conradludgate/wordle"; # repo has no license, but crates.io says it's MIT license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; mainProgram = "wordle"; }; } diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix index 92ff9ed70751..faf7535349d5 100644 --- a/pkgs/by-name/cl/clamav/package.nix +++ b/pkgs/by-name/cl/clamav/package.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ robberer qknight - globin ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index d7366c96a0a0..e3ae65334548 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-QyIuuiwFg5DP2Ao/LOKYiBXxKHQ0FbFhssIIUnEQz+c="; + hash = "sha256-FtsqfpUBn0YGEyhRrJnPGSqrawS1g3F/exVGAuvXkRQ="; }; postPatch = '' diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 5c8a6be57025..7d52ba3283fb 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.57", + "version": "2.0.64", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.57", + "version": "2.0.64", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index aa5d88076cd7..b58872fb6cc6 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -1,3 +1,7 @@ +# NOTE: Use the following command to update the package +# ```sh +# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])' +# ``` { lib, buildNpmPackage, @@ -7,18 +11,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - # NOTE: Use the following command to update the package - # ```sh - # nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package vscode-extensions.anthropic.claude-code && nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package claude-code - # ``` - version = "2.0.57"; + version = "2.0.64"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-mnSM1FFLrVQwmS3MgRoLg3lIDPJ7ERiWHLDsQoxRIxA="; + hash = "sha256-YkdJHr63b9ExU3rOFWt7GTiVRxeAJHmRRoozWEqlFEY="; }; - npmDepsHash = "sha256-wVhKqeyFSIvPSb9jx+qUKWAfp7ZX8nvzvyv0A/XxnR8="; + npmDepsHash = "sha256-x1YerDQP1+kNS+mdIqSAE1e81fsd855KdJM+VBxaUBQ="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh index a3fe5d871a99..870f73308600 100755 --- a/pkgs/by-name/cl/claude-code/update.sh +++ b/pkgs/by-name/cl/claude-code/update.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git cacert +#!/usr/bin/env nix +#!nix shell --ignore-environment .#cacert .#nodejs .#git .#nix-update .#nix .#gnused .#findutils .#bash --command bash set -euo pipefail @@ -7,4 +7,9 @@ version=$(npm view @anthropic-ai/claude-code version) # Update version and hashes AUTHORIZED=1 NIXPKGS_ALLOW_UNFREE=1 nix-update claude-code --version="$version" --generate-lockfile -nix-update vscode-extensions.anthropic.claude-code --use-update-script --version "$version" + +# nix-update can't update package-lock.json along with npmDepsHash +# TODO: Remove this workaround if nix-update can update package-lock.json along with npmDepsHash. +(nix-build --expr '((import ./.) { system = builtins.currentSystem; }).claude-code.npmDeps.overrideAttrs { outputHash = ""; outputHashAlgo = "sha256"; }' 2>&1 || true) \ +| sed -nE '$s/ *got: *(sha256-[A-Za-z0-9+/=-]+).*/\1/p' \ +| xargs -I{} sed -i 's|npmDepsHash = "sha256-[^"]*";|npmDepsHash = "{}";|' pkgs/by-name/cl/claude-code/package.nix diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index 26025531421f..35df49ae809c 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -351,7 +351,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ fpletz - globin oxzi ajs124 ]; diff --git a/pkgs/by-name/cl/cli-tips/package.nix b/pkgs/by-name/cl/cli-tips/package.nix index 5283dd416d6f..03951f22319a 100644 --- a/pkgs/by-name/cl/cli-tips/package.nix +++ b/pkgs/by-name/cl/cli-tips/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/cli-stuff/cli-tips"; license = lib.licenses.unlicense; platforms = with lib.platforms; linux ++ darwin ++ windows; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; mainProgram = "cli-tips"; }; } diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 56ef195e8f7a..64bf7098ffe3 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.39"; + version = "2.6.41"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-fx300EyGm9iy4kozcffh8KZz/EYF6yqkdNLSqW1dYQg="; + hash = "sha256-o7twdOyd53rP95Pi+l5MIo+U/lDqB0cynqONokfy8do="; }; - vendorHash = "sha256-MwyjjEePxcwcESfBhmFtYy8aOI50HL7x05cJyGk5gGg="; + vendorHash = "sha256-UxbQ/Q4HsTBkbIMBdeKns6t8tZnfdBRaHDMOA2RYDLI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 715663ae216d..35442e240b4a 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.11.1.558-stable"; - rev = "16f22f3d744fe760e05f288124b1f32f539a35aa"; - hash = "sha256-PJVw53iueh9kjWn7R7rgSVHokZq1Ot5GhRM1uSNY6o8="; + version = "25.11.2.24-stable"; + rev = "d4877847359927d773d68ffa781d127839671935"; + hash = "sha256-6cFziK+ZTehCv4Ez3MoMlnI0vFWXsAZEzKvWecrRclc="; lts = false; } diff --git a/pkgs/by-name/cl/cliscord/package.nix b/pkgs/by-name/cl/cliscord/package.nix index 41f2f38e74ee..1ab77949de02 100644 --- a/pkgs/by-name/cl/cliscord/package.nix +++ b/pkgs/by-name/cl/cliscord/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { description = "Simple command-line tool to send text and files to discord"; homepage = "https://github.com/somebody1234/cliscord"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lom ]; + maintainers = [ ]; mainProgram = "cliscord"; }; } diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index 239b60b916a0..f292ec880072 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -11,16 +11,16 @@ }: buildGoModule rec { pname = "clive"; - version = "0.12.15"; + version = "0.12.16"; src = fetchFromGitHub { owner = "koki-develop"; repo = "clive"; tag = "v${version}"; - hash = "sha256-WOcqcyhyv72tNmm7mETjboStesfFfVVAmN2ZdLFd1Uc="; + hash = "sha256-bZzK7RLAStRb9R3V/TK6tZV6yv1C7MGslAhhpWDzdWk="; }; - vendorHash = "sha256-QfHCrou7Lr1CrRQqvLEnWTtQk8aDigkm4SBArLjMkyo="; + vendorHash = "sha256-BDspmaATLIfwyqxwJNJ24vpEETUWGVbobHWD2NRaOi4="; subPackages = [ "." ]; buildInputs = [ ttyd ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 177ec1179405..b41f3d3be9ec 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-a44y0cVmpQf3AmN4DXR50pFhUrWlANN9X0v0zQttT7M="; + hash = "sha256-d+fVk3ZWccw/E6/mAyiGkP5t5/nl3riBAHwhzsaLiDs="; }; - cargoHash = "sha256-YSyHp3JwsLO7yrLko5NE2lb6ozy8Ah9i2Rz3854ujh0="; + cargoHash = "sha256-bu31l7slpWIHe2Ze/pP2udygt/KeWrdh0MYkCXCSWIc="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/cl/cloud-custodian/package.nix b/pkgs/by-name/cl/cloud-custodian/package.nix index bfd0f20b40ec..b10ce037d19f 100644 --- a/pkgs/by-name/cl/cloud-custodian/package.nix +++ b/pkgs/by-name/cl/cloud-custodian/package.nix @@ -50,7 +50,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://cloudcustodian.io"; changelog = "https://github.com/cloud-custodian/cloud-custodian/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ bhipple ]; mainProgram = "custodian"; }; } diff --git a/pkgs/by-name/cl/cloudsmith-cli/package.nix b/pkgs/by-name/cl/cloudsmith-cli/package.nix index cdfb1031debf..35f7b459cc01 100644 --- a/pkgs/by-name/cl/cloudsmith-cli/package.nix +++ b/pkgs/by-name/cl/cloudsmith-cli/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "1.8.3"; + version = "1.8.7"; pyproject = true; src = fetchFromGitHub { owner = "cloudsmith-io"; repo = "cloudsmith-cli"; tag = "v${version}"; - hash = "sha256-PYqOj6nHjJrG7Ndc5vm//E8mjk4xZFVQopFqiWtH5ZQ="; + hash = "sha256-xUaa1B6f6W0Q/9q8sztFoCxEaxqXajImROC1sJb0Zdk="; }; postPatch = '' @@ -60,6 +60,10 @@ python3Packages.buildPythonApplication rec { cd "$out" ''; + disabledTests = [ + "TestMainCommand" + ]; + meta = { homepage = "https://help.cloudsmith.io/docs/cli/"; description = "Cloudsmith Command Line Interface"; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/by-name/cm/cmake-format/package.nix similarity index 66% rename from pkgs/development/tools/cmake-format/default.nix rename to pkgs/by-name/cm/cmake-format/package.nix index 37d7b3219701..3070e55bc021 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/by-name/cm/cmake-format/package.nix @@ -1,16 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - autopep8, - flake8, - jinja2, - pylint, - pyyaml, - six, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cmake-format"; version = "0.6.13"; # The source distribution does not build because of missing files. @@ -18,12 +12,11 @@ buildPythonApplication rec { src = fetchPypi { inherit version format; - python = "py3"; pname = "cmakelang"; sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ autopep8 flake8 jinja2 @@ -34,12 +27,11 @@ buildPythonApplication rec { doCheck = false; - meta = with lib; { + meta = { description = "Source code formatter for cmake listfiles"; homepage = "https://github.com/cheshirekow/cmake_format"; - license = licenses.gpl3; - maintainers = [ maintainers.tobim ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tobim ]; mainProgram = "cmake-format"; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/by-name/cm/cmst/package.nix similarity index 56% rename from pkgs/tools/networking/cmst/default.nix rename to pkgs/by-name/cm/cmst/package.nix index 54189d208331..dbf87ce4163d 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/by-name/cm/cmst/package.nix @@ -1,30 +1,29 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, - qmake, - qtbase, - qttools, + libsForQt5, gitUpdater, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmst"; version = "2023.03.14"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; - rev = "${pname}-${version}"; - sha256 = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk="; + tag = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk="; }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do @@ -33,18 +32,18 @@ mkDerivation rec { ''; passthru.updateScript = gitUpdater { - rev-prefix = "${pname}-"; + rev-prefix = "${finalAttrs.pname}-"; }; - meta = with lib; { + meta = { description = "QT GUI for Connman with system tray icon"; mainProgram = "cmst"; homepage = "https://github.com/andrew-bibb/cmst"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ matejc romildo ]; - platforms = platforms.linux; - license = licenses.mit; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 5839dbfc8299..7ef02d15d1c7 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.11.0"; + version = "12.12.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-SJslEdoLGl2Amu0iChIajcO2m1YXewGh8P6MZ7/Up/I="; + hash = "sha256-Vmgl8VuNMbZl55R6KrPVjGjf3/0Z7J9uCf6pi4G7wdM="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-RFhF0OoznlHTvQesHA68gG7UhAbhUBdop8pX/szypUM="; + vendorHash = "sha256-lsLmODQvGf6yS7emcqLlML3xO++z05ftMLdgJz90ruM="; ldflags = [ "-w" diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 0776f9bc809d..bf12ad1cc0d5 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.12.0"; + version = "12.12.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-UOF6Blou1ehwNCVldkLf4LaW9F71fndjwvP21gZ+r1o="; + hash = "sha256-EhO8lLnIAgp2OKgM4yWhUsM0XtxzsadHaXUnnp5BO98="; }; proxyVendor = true; - vendorHash = "sha256-49R8/adcMsUBQcQf7JoevCRh3P37kzht6vn6cWo0iiE="; + vendorHash = "sha256-UGqwsRS4GUpqmcPXasIsU9hZ4Qd76wUtc1EXt1jLpbA="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index d33a566f4168..d91d8ba0aaf6 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "cobang"; - version = "1.9.1"; + version = "2.3.1"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; tag = "v${version}"; - hash = "sha256-jF6hWpOPbJKRyUWRyZdp4OziCdJupyFpNdrsiOdjByA="; + hash = "sha256-8qnF1w4zNYdH3QrzBnNjsPnOSMMD48H2tcTxPkemGEM="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec { pillow pygobject3 python-zbar + qrcode ]; # Wrapping this manually for SVG recognition diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix index f68a289a230f..a7cb8102efc3 100644 --- a/pkgs/by-name/co/coc-markdownlint/package.nix +++ b/pkgs/by-name/co/coc-markdownlint/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-markdownlint"; - version = "0-unstable-2025-11-15"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "5bdcde01bf7c8f468581dc8bab54d3a5de04fb86"; - hash = "sha256-ndvqkYnD1skKhV3DHgKQkC5fsrbmt+COo+jGyLJjpDA="; + rev = "5a3b292e791e7d33bacac8e9e952aef3aab9f867"; + hash = "sha256-EaJjeaR8cfqGy2I7nLxPlNyiq4ERpWqUF9i/LloOJaQ="; }; - npmDepsHash = "sha256-LomwzsDT2I+fhcmiabj6CzwaSzV4bgV7azG6/TcJuQw="; + npmDepsHash = "sha256-DCHrO+cuSepnBHl4miLivFElSmSbgH/NRQH68zSJAVA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index 39afe21cf970..15a6fcb5470b 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-2025-11-25"; + version = "0-unstable-2025-12-02"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "8bd84ab1c2b436a2e9fadf059b5785f43e877c1e"; - hash = "sha256-R9IQuoNGCqodbAkPnQLHi8sPzXvT3x+K9mt7apywips="; + rev = "8f9ac44c8154b26f993e0e0ad4c5c55918f3661e"; + hash = "sha256-pmvgF5mHh8djzKFLlcRVOZjZ5e5kN1ymqthYuPPYgmA="; }; - npmDepsHash = "sha256-94kuqDNsCcPuvTVeprEdjNOPw8pdpDp3IOvuoKdSEgU="; + npmDepsHash = "sha256-WOwCgsynYeINS39Lhahd++1qJwcFRUv0kENRO13mKio="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix index 4bc273b76ee9..265dd93fd057 100644 --- a/pkgs/by-name/co/cocoon/package.nix +++ b/pkgs/by-name/co/cocoon/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "cocoon"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "haileyok"; repo = "cocoon"; - tag = finalAttrs.version; - hash = "sha256-2zvbPhvYoKlQTZDjpo6LRr9DLKzSmcH0qnU1oJ+7k04="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pRtfYW3mojOycUaky4y+fcbGaeXAjj1jO1ewwFamGO8="; }; ldflags = [ @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { meta = { description = "ATProtocol Personal Data Server written in Go with a SQLite block and blob store"; - changelog = "https://github.com/haileyok/cocoon/releases/${finalAttrs.version}"; + changelog = "https://github.com/haileyok/cocoon/releases/v${finalAttrs.version}"; homepage = "https://github.com/haileyok/cocoon"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ isabelroses ]; diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 3f71ae423ea3..6efc8a852a07 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.512" + "codebuff": "^1.0.540" } }, "node_modules/chownr": { @@ -18,13 +18,14 @@ } }, "node_modules/codebuff": { - "version": "1.0.512", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.512.tgz", - "integrity": "sha512-LmVPBLYAYRVzyelfhqlF67bwSAVAHiSlJZe5Iv8M+VjeNpaUl5sNmShjx3PZWDdkUhlwWyqNZY83owseu7cX3w==", + "version": "1.0.540", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.540.tgz", + "integrity": "sha512-mlNld49vsoHZZPw55oqboT0PpLCMafop5VTlR9XqxZxO9c2qGs730pCNURqOygaFUwRAVjF61os8Idyn3SroOA==", "cpu": [ "x64", "arm64" ], + "hasInstallScript": true, "license": "MIT", "os": [ "darwin", @@ -32,7 +33,6 @@ "win32" ], "dependencies": { - "commander": "^12.0.0", "tar": "^6.2.0" }, "bin": { @@ -43,15 +43,6 @@ "node": ">=16" } }, - "node_modules/commander": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", - "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", - "license": "MIT", - "engines": { - "node": ">=18" - } - }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 2903f39602e5..6bdacd2a8d73 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.512"; + version = "1.0.540"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-RwvrASHienoqxrlNmY6gcGzMuMkhd9yZhp0DTLlmHHg="; + hash = "sha256-k5JbnNSGle1qWKSXTaR/xdNdovB4UY201SKS2BK637E="; }; - npmDepsHash = "sha256-wsRiRg9W5rw5xFCNNDw545yptupUmPse1Lu8jz3VMHA="; + npmDepsHash = "sha256-xvB+D8cOAA+YP4MdM8lByuP7QmSItTKi/uKPfiuy6pc="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix index 3fe49668b9e9..9359c5f8734c 100644 --- a/pkgs/by-name/co/codecov-cli/package.nix +++ b/pkgs/by-name/co/codecov-cli/package.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "httpx" "responses" + "test-results-parser" "tree-sitter" ]; diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index a864f1b36896..a8aa25beff31 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -15,21 +15,21 @@ let channels = { stable = { - version = "2.27.3"; + version = "2.28.5"; hash = { - x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA="; - x86_64-darwin = "sha256-j41nX7CQhLsjVCBp6vaxmOcbXKXXz/iFm/TY2HXLWHA="; - aarch64-linux = "sha256-dsjwZSoC2bQj4Zn/M7SlN83ZKMEpBjs78J4PrNGDHxE="; - aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI="; + x86_64-linux = "sha256-eVMCIdXTWr3jmJYbR9ycoddqyst0immXfSSbeegFNwo="; + x86_64-darwin = "sha256-hwLtrPY1NARgeiQzoC+LiF9ELt7pAYiNnk767M4j41s="; + aarch64-linux = "sha256-F4WpbZ/wz/Tt1dzEFYlciPo2yPbH7nv7sJA+frIbAlA="; + aarch64-darwin = "sha256-oIpVJ2eMo/iarM037UEaY/+C10BVOvb6P+vXlb3v6Fk="; }; }; mainline = { - version = "2.28.0"; + version = "2.29.0"; hash = { - x86_64-linux = "sha256-Z56Q5ETE3wpBJPIaZ9/qgAJ8Tj67L1ScDwuAk0Ijjkc="; - x86_64-darwin = "sha256-tydx9Q32TvPF36+meoQ+NBQ7MXUHRPHBI4L7UNBhXQ0="; - aarch64-linux = "sha256-x7WErWe3p6Cdr2moKG0X/DEY+dkeMhnaG2RUNWfyoQU="; - aarch64-darwin = "sha256-jVK599hDIhWy0HOhJmPevhnZnYLylxmZ59rhrOSRGIU="; + x86_64-linux = "sha256-gDgDJMm7I11eRyitzFyJpUG2EODCuvEsmmxdSkXeYlQ="; + x86_64-darwin = "sha256-qKgTVrmYQDfyrWQ8OD4QZ6KV8v32/aZIG9npCRUklD4="; + aarch64-linux = "sha256-mx8vTmLXtcxTESF2LrZOaRTXu08ofOKAD6WxP3Ekcfg="; + aarch64-darwin = "sha256-4kOoJ+Ru3RAJXD0j3GvDRcloimpHVHXv/nB/q9+y2GQ="; }; }; }; diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index ae9985d61041..8e4a062decf1 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "codex-acp"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${version}"; - hash = "sha256-fUY76RRvZ4Cri7diV1gL00KISlFeFuxqVQHbfXl2kQU="; + hash = "sha256-4up2F5p6vCnuaxo0NoUAXQt/yl2i4Roz6inTrFHoACI="; }; - cargoHash = "sha256-3SSwfJgpe4+7wFqX6iST4zya9x1Op4bsmKQQwbs9l5s="; + cargoHash = "sha256-dJehw2TPrBa9M87oKbvdz5KVPe+ARSkmiDaSqlUR8T8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index c9fd27473edc..5f5b0d2f649f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.64.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-1nUawra7VChAcLAwWgcasy22q37DQxq6q8qAx55gHMc="; + hash = "sha256-IO5bZOkMcpIB0751d9PV32C21CIFuZPa/p8tVmoNwuA="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-cIiHB8THztG/TqPMjFekkQl8wEvALIf5Bg/fqXJ/hKs="; + cargoHash = "sha256-ilzYG2W7xdpdCnrKN1LIrMvAjCAVJx6106sbApkH/60="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/colormake/package.nix b/pkgs/by-name/co/colormake/package.nix index df7d76447ad8..31dbe4b14863 100644 --- a/pkgs/by-name/co/colormake/package.nix +++ b/pkgs/by-name/co/colormake/package.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation { homepage = "https://bre.klaki.net/programs/colormake/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix index 56bb94293a0e..9aedffcd3368 100644 --- a/pkgs/by-name/co/colpack/package.nix +++ b/pkgs/by-name/co/colpack/package.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; license = licenses.lgpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix index 4d05613266cc..269fd1d2c195 100644 --- a/pkgs/by-name/co/commitlint/package.nix +++ b/pkgs/by-name/co/commitlint/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "commitlint"; - version = "20.1.0"; + version = "20.2.0"; src = fetchFromGitHub { owner = "conventional-changelog"; repo = "commitlint"; tag = "v${finalAttrs.version}"; - hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU="; + hash = "sha256-L9HfuwpFmKWoEyFdo7+UIEeEcD0jFhunj0x6UFHfhEY="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-Kg19sEgstrWj+JLzdZFnMeb0F5lFX3Z0VPNyiYPi6nY="; + hash = "sha256-rKVMSbsipd8J2E+E2RdeXYDsMwSzFZMJJ4zceOLBbCs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 5989b16545b5..af00224e4b3d 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "composer-require-checker"; - version = "4.18.0"; + version = "4.19.0"; # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/maglnet/ComposerRequireChecker"; tag = finalAttrs.version; - hash = "sha256-8y8ziaWCno389ti263N+xinADoPZZGXqhTHoc9ZkF4Y="; + hash = "sha256-cTXXPsHI2yiHSakiWuuxripGLvkwmzIAADqKtwHOI7c="; }; - vendorHash = "sha256-BDGxHoDLSEdukN+zv8QNZPtVXfRpp/o95ysGFs0wl9Q="; + vendorHash = "sha256-ZUAXo4X4B7Z6wfcmv7L1DFvD4Lx1sSoMmw1gR5nDEP0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index d77983b790c7..8adf32137ff6 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${version}"; - sha256 = "sha256-zJjP1EBfJ/f1HI1rMv8ADQqpjLcnPLgajZB4rTUayB4="; + sha256 = "sha256-o4fa5lO8fTf5Nb2kGUqCRK/v5rQOlmHbnzCx9l7S3So="; }; - cargoHash = "sha256-soNKxIOvxqFYEaycagF56Hp/UM7a79g8+ScO7zsPqvM="; + cargoHash = "sha256-ceDdBBolkQYI3F58DgKztWfULvc5jVp69FDdk6NxcLU="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix index 5cdf2d780249..ad0840384a40 100644 --- a/pkgs/by-name/co/conmon/package.nix +++ b/pkgs/by-name/co/conmon/package.nix @@ -6,26 +6,38 @@ glib, glibc, libseccomp, - systemd, + systemdMinimal, nixosTests, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "conmon"; version = "2.1.13"; src = fetchFromGitHub { owner = "containers"; repo = "conmon"; - rev = "v${version}"; - hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/Kt49c8a+R/+Z3KmFLpRTG+BdfPDAOEUtSis3alLAUQ="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; }; + preConfigure = '' + substituteInPlace Makefile \ + --replace-fail "(GIT_COMMIT)" "(shell cat COMMIT)" + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp - systemd + systemdMinimal ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc @@ -35,7 +47,6 @@ stdenv.mkDerivation rec { # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" - "VERSION=${version}" ]; installPhase = '' @@ -49,13 +60,17 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) cri-o podman; }; - meta = with lib; { - changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}"; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/containers/conmon/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/containers/conmon"; description = "OCI container runtime monitor"; - license = licenses.asl20; - teams = [ teams.podman ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + teams = [ lib.teams.podman ]; + platforms = lib.platforms.linux; mainProgram = "conmon"; }; -} +}) diff --git a/pkgs/by-name/co/contact/package.nix b/pkgs/by-name/co/contact/package.nix index c1c6a63a4e45..3a5258e69229 100644 --- a/pkgs/by-name/co/contact/package.nix +++ b/pkgs/by-name/co/contact/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "contact"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "pdxlocations"; repo = "contact"; tag = version; - hash = "sha256-PjWVjvuHAgHR1/G4LfwhG0g45XoLTUf6BumopwgOPe0="; + hash = "sha256-YLg4+AxtF0ZZe5nJMOcg1pPetdcKRnQlpADyYROP/EY="; }; dependencies = [ python3Packages.meshtastic ]; diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index e32f09c99410..11125e19f6fd 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "convco"; repo = "convco"; rev = "v${version}"; - hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY="; + hash = "sha256-giVaDOYYH3YE9Gy0byt92vGEfyM4rTjpHDsKm5lqlP4="; }; - cargoHash = "sha256-ClkpGHN2me+R3jX7S5hFR1FlsXGhHZ/y6iIGK08Mdfc="; + cargoHash = "sha256-DTeZDpS3OaGcem9AaAPFN+2AWuqWSGfk2KknbcgFzi0="; nativeBuildInputs = [ cmake @@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # disable test requiring networking "--skip=git::tests::test_find_last_unordered_prerelease" + "--skip=git::tests::test_find_matching_prerelease" + "--skip=git::tests::test_find_matching_prerelease_without_matching_release" ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/by-name/co/cool-retro-term/package.nix similarity index 84% rename from pkgs/applications/terminal-emulators/cool-retro-term/default.nix rename to pkgs/by-name/co/cool-retro-term/package.nix index 2e91884aa2d2..233b7674108a 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/by-name/co/cool-retro-term/package.nix @@ -2,16 +2,11 @@ lib, stdenv, fetchFromGitHub, - mkDerivation, - qtbase, - qmltermwidget, - qtquickcontrols2, - qtgraphicaleffects, - qmake, + libsForQt5, nixosTests, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "1.2.0"; pname = "cool-retro-term"; @@ -27,13 +22,16 @@ mkDerivation rec { ''; buildInputs = [ - qtbase - qmltermwidget - qtquickcontrols2 - qtgraphicaleffects + libsForQt5.qtbase + libsForQt5.qmltermwidget + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix index c9df09c6ebea..96fca7559688 100644 --- a/pkgs/by-name/co/cope/package.nix +++ b/pkgs/by-name/co/cope/package.nix @@ -3,21 +3,23 @@ fetchFromGitHub, perl, perlPackages, + makeWrapper, }: - perlPackages.buildPerlPackage { pname = "cope"; - version = "0-unstable-2024-03-27"; + version = "0-unstable-2025-06-20"; src = fetchFromGitHub { owner = "deftdawg"; repo = "cope"; - rev = "ad0c1ebec5684f5ec3e8becf348414292c489175"; - hash = "sha256-LMAir7tUkjHtKz+KME/Raa9QHGN1g0bzr56fNxfURQY="; + rev = "6d0322a8493361ad32e454b97998df715dbe7b97"; + hash = "sha256-VQveV7avM/4nbLroyujJaSoVAP3pXhwrzqzI3eMzxVo="; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ EnvPath + ExporterTiny FileShareDir IOTty IOStty @@ -26,11 +28,37 @@ perlPackages.buildPerlPackage { RegexpIPv6 ]; - postInstall = '' - mkdir -p $out/bin - mv $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto/share/dist/Cope/* $out/bin/ - rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto - ''; + postInstall = + let + perlDeps = with perlPackages; [ + EnvPath + ExporterTiny + FileShareDir + IOTty + IOStty + ListMoreUtils + RegexpCommon + RegexpIPv6 + ]; + perlPath = perlPackages.makePerlPath perlDeps; + in + '' + mkdir -p $out/bin # $out/libexec + mv $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto/share/dist/Cope $out/libexec + # Wrap all Perl scripts in the Cope directory before moving them + for script in $out/libexec/*; do + if [[ -f "$script" && -x "$script" ]]; then + wrapProgram "$script" \ + --set PERL5LIB "${perlPath}:$out/lib/perl5/site_perl" + sed -i "1s|^#!.*perl|#!${perl}/bin/perl|" "$out/libexec/.''${script##*/}-wrapped" + fi + done + rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto + + # replace cope with a new cope, new-cope is a bash script which doesn't need to be wrapped + cp $src/new-cope $out/bin/cope + cp -f $src/new-cope $out/libexec/cope + ''; meta = { description = "Colourful wrapper for terminal programs"; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 958fe7b81649..615b48602dee 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.399.0"; + version = "1.400.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-K+3G7ldtU3kBtqfPB9d3MqvguQSZB1BoQdlx2almwGE="; + hash = "sha256-gevYxwbDUNrVxa+sgKJcX3/p7l7V3NCyHXEo8q55B0E="; stripRoot = false; }; diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 3b90b72e7630..5ab615003f84 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -11,18 +11,18 @@ xorg, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "coppwr"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "dimtpap"; repo = "coppwr"; - tag = version; - hash = "sha256-9oFWX44jToJh0vJaDV/KZXVNQgLG0lr1iA+0hInAhLA="; + tag = finalAttrs.version; + hash = "sha256-L0MpMh3HuWX0zxG50OGZDa+wX5E55/dU6jt6Iei99Ho="; }; - cargoHash = "sha256-Fq8I1pt83yqrjiA4VXA+z7o2LFTac2SonAwTycQRP8M="; + cargoHash = "sha256-tcGyoPVoJFhbXZFe23d00Z7FUwIo5J02EfPTBzCGE64="; nativeBuildInputs = [ pkg-config @@ -49,10 +49,14 @@ rustPlatform.buildRustPackage rec { install -m 444 \ -D $src/assets/io.github.dimtpap.coppwr.metainfo.xml \ -t $out/share/metainfo - cp $src/assets/icon/scalable.svg $out/share/icons/hicolor/scalable/apps/io.github.dimtpap.coppwr.svg + install -m 444 \ + -D $src/assets/icon/scalable.svg \ + -t $out/share/icons/hicolor/scalable/apps/io.github.dimtpap.coppwr.svg for size in 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - cp $src/assets/icon/"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/io.github.dimtpap.coppwr.png + install -m 444 \ + -D $src/assets/icon/"$size".png \ + -t $out/share/icons/hicolor/"$size"x"$size"/apps/io.github.dimtpap.coppwr.png done ''; @@ -75,4 +79,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "coppwr"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 9cb223b7c53f..85cb85f0027c 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20251124"; + version = "20251201"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-4MWmzeLpuDlz/Y8N0WmzASADtFCuWNMPT8QnCTrPRrQ="; + hash = "sha256-dZXneydnQsjQUmcOpKQiWcQWid7doUrMWE4TRyX2C50="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/copyparty-full-buggy/package.nix b/pkgs/by-name/co/copyparty-full-buggy/package.nix index d717d141a832..b8033827c5ef 100644 --- a/pkgs/by-name/co/copyparty-full-buggy/package.nix +++ b/pkgs/by-name/co/copyparty-full-buggy/package.nix @@ -1,5 +1,5 @@ { copyparty }: -copyparty.override { +(copyparty.override { withHashedPasswords = true; withCertgen = true; withThumbnails = true; @@ -14,4 +14,16 @@ copyparty.override { withSMB = true; nameSuffix = "-full-buggy"; longDescription = "Full variant, all dependencies and features including those marked buggy"; -} +}).overrideAttrs + (old: { + # don't try to update this package, just update `copyparty` + # nixpkgs-update: no auto update + passthru = old.passthru // { + updateScript = null; + }; + + meta = old.meta // { + # this serves two purposes: it changes the description, but also makes meta.position point to this file so that the 'no auto update' works + description = old.meta.description + " - full variant"; + }; + }) diff --git a/pkgs/by-name/co/copyparty-min/package.nix b/pkgs/by-name/co/copyparty-min/package.nix index b2bd2b42ce53..bceaeaa63112 100644 --- a/pkgs/by-name/co/copyparty-min/package.nix +++ b/pkgs/by-name/co/copyparty-min/package.nix @@ -1,5 +1,5 @@ { copyparty }: -copyparty.override { +(copyparty.override { withHashedPasswords = false; withCertgen = false; withThumbnails = false; @@ -14,4 +14,16 @@ copyparty.override { withMagic = false; nameSuffix = "-min"; longDescription = "Minimal variant, minimal dependencies and fewest features"; -} +}).overrideAttrs + (old: { + # don't try to update this package, just update `copyparty` + # nixpkgs-update: no auto update + passthru = old.passthru // { + updateScript = null; + }; + + meta = old.meta // { + # this serves two purposes: it changes the description, but also makes meta.position point to this file so that the 'no auto update' works + description = old.meta.description + " - minimal variant"; + }; + }) diff --git a/pkgs/by-name/co/copyparty-most/package.nix b/pkgs/by-name/co/copyparty-most/package.nix index 6e8fa8e8b205..038cb89b8c69 100644 --- a/pkgs/by-name/co/copyparty-most/package.nix +++ b/pkgs/by-name/co/copyparty-most/package.nix @@ -1,5 +1,5 @@ { copyparty }: -copyparty.override { +(copyparty.override { withHashedPasswords = true; withCertgen = true; withThumbnails = true; @@ -14,4 +14,16 @@ copyparty.override { withMagic = true; nameSuffix = "-most"; longDescription = "Almost-full variant, all dependencies and features except those marked buggy"; -} +}).overrideAttrs + (old: { + # don't try to update this package, just update `copyparty` + # nixpkgs-update: no auto update + passthru = old.passthru // { + updateScript = null; + }; + + meta = old.meta // { + # this serves two purposes: it changes the description, but also makes meta.position point to this file so that the 'no auto update' works + description = old.meta.description + " - most variant"; + }; + }) diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix index 558b476480be..e33b778e5c1d 100644 --- a/pkgs/by-name/co/copyparty/package.nix +++ b/pkgs/by-name/co/copyparty/package.nix @@ -71,11 +71,11 @@ in python3Packages.buildPythonApplication rec { pname = "copyparty${nameSuffix}"; - version = "1.19.20"; + version = "1.19.21"; src = fetchurl { url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz"; - hash = "sha256-BQzMNFVOWSEKynpn2HoYbmmz9NvgE9XuLxGiLCWagqY="; + hash = "sha256-RHI6gj8hjlKq7GB1aVlzp1uGY8kgLID9c/SOUsYazUI="; }; pyproject = true; diff --git a/pkgs/by-name/co/cordova/package.nix b/pkgs/by-name/co/cordova/package.nix index 568566383c11..079a5ceea088 100644 --- a/pkgs/by-name/co/cordova/package.nix +++ b/pkgs/by-name/co/cordova/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "cordova"; - version = "12.0.0"; + version = "13.0.0"; src = fetchFromGitHub { owner = "apache"; repo = "cordova-cli"; tag = version; - hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo="; + hash = "sha256-GJTrFGrUzSQ/Hsphn0zkjFYQkFw5i7ntc8HqIYdOYL4="; }; - npmDepsHash = "sha256-ZMxZiwCgqzOBwDXeTfIEwqFVdM9ysWeE5AbX7rUdwIc="; + npmDepsHash = "sha256-y81NdwF+RU20jmCi+Fou3Vc9ivt1x8JOj7biAsuSYDg="; dontNpmBuild = true; diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix index 6961fed1c765..cf0ac99c6ec5 100644 --- a/pkgs/by-name/co/cosign/package.nix +++ b/pkgs/by-name/co/cosign/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "cosign"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sigstore"; repo = "cosign"; rev = "v${finalAttrs.version}"; - hash = "sha256-5jCO2LW7nzbzo+de0fpxBcVASDmINB6yFerkQZlo2o8="; + hash = "sha256-2cCeSG3ELkSWL1ZJ/bMGm4Nj7OZgewyUwu8lblRjCh4="; }; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-hedkslhyAsictu9Cbw7CgreoWa1StLpTt8oTPNLr5fc="; + vendorHash = "sha256-LTJoEEOGrmgQi+8T++wNMfs+jdWI+R+Xo1vBXuoLBMM="; subPackages = [ "cmd/cosign" diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index accc526c1a27..2a32eeee1ca2 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-4BH7qEoUf5UtpiQtk3WvgA3p/hAa58RnQ4jUjG8tpd0="; + hash = "sha256-HZi9pT9s7h/TJtWK28vlCvhiuQqmxZa0HmSsnBa8F80="; }; - cargoHash = "sha256-XOA5yREoQHGxPI9PVYd2UsaHRCIfbb3Tkr1eovqIIow="; + cargoHash = "sha256-8Zq8l4gRI9FuGFy6Gi5doFNvOT7nOy8qCE9pmbcCELQ="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index b393ff7dc5df..d2aab743b07e 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 98e5eebbe1c0..15cdf6a566ba 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 28508219b387..250b1b8c0826 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-MyE2C7oUMSIkNn03am/ytc1/oJITsAO7Ok3XV231EmA="; + hash = "sha256-ozymo6ucBEv4vEADIHyn/G+p5V8SMgsyW/TcEi3Dhxg="; }; cargoHash = "sha256-qlfCCHqjKX72hVj5Bgh1wKT7pMsy5vG1VEIqJk4prR8="; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 3a2b7178a02b..f6db5214c206 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Zk4qo/2ZdlAv2g1gIoMfzRXwndmqtyIqtX/2Z1nmhLM="; + hash = "sha256-lqM2MYuGXUh0gTosjbJbusP5daHhs7tsnDTmYzh1Vbo="; }; cargoHash = "sha256-6b6m6mZTa3Li74JCm6czR0VBc7H5IRTPr7yic3V1FL4="; diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix new file mode 100644 index 000000000000..c8aa0972d783 --- /dev/null +++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libcosmicAppHook, + just, + nix-update-script, +}: +rustPlatform.buildRustPackage { + pname = "cosmic-ext-applet-sysinfo"; + version = "0-unstable-2025-07-05"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "cosmic-ext-applet-sysinfo"; + rev = "8559ba6604bfa7bdaaa53f8ea9a01ce6e6174194"; + hash = "sha256-KF6j7OWz75BQtaa3z93Lq/msZpMt9ZYeKP4ThJKimDo="; + }; + + cargoHash = "sha256-oUw7oBOT1I/eBQuKuTQ4UWuksYWSyS6kd4fRGHC4ELY="; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; + + meta = { + description = "Simple system info applet for COSMIC"; + homepage = "https://github.com/cosmic-utils/cosmic-ext-applet-sysinfo"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-ext-applet-sysinfo"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix new file mode 100644 index 000000000000..28a22afe9552 --- /dev/null +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libcosmicAppHook, + just, + nix-update-script, +}: +rustPlatform.buildRustPackage { + pname = "cosmic-ext-applet-weather"; + version = "0-unstable-2025-08-23"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "cosmic-ext-applet-weather"; + rev = "f613c9dd156e84290765c34ca98ff8ede3b530fa"; + hash = "sha256-VHCgMw4nWTKAbanEnMS/xCUzEW3NeWGmVkBqU2bJP/c="; + }; + + cargoHash = "sha256-CS4P1DHzTmkZdANw6UQsB0kjKTeaf3cAQ/2EiPHSg7g="; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; + + meta = { + description = "Simple weather info applet for COSMIC"; + homepage = "https://github.com/cosmic-utils/cosmic-ext-applet-weather"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-ext-applet-weather"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index ffe09417c879..2fb2d683312c 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-jH88PzgHMbbtGc68v/7Azia+LrB1kfA7QdBJOVAsEs0="; + hash = "sha256-rjGhT8ZFLpVEGz5g9Hy3E8eYigxUXF1ZHLXUhHdIyHE="; }; cargoHash = "sha256-WPBK7/7l+Z69AFrqnDL6XszUcBHuZdKsNZ31HS+Ol4o="; diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index ba5c3f8ac8aa..18d775912867 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 61f3fa10ac3a..93712ff2c7da 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 5cf27060c9ad..fd6b7cccc256 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index ab7e31549ad1..a14c9b07d763 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,14 +14,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-iSxBd/0DsaId7PETZMZbN4uZHiUJmxzm/1KXRXDwpEo="; + hash = "sha256-eK+1nEpCgWOdhA0Kdg/RwgAON0dMjZujWxqd5CdSqNk="; }; cargoHash = "sha256-jOPJiKPE3UUD/QHmb+6s6l2RVhtUFls3QRGQ6DmEFSE="; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index c46444d5932b..e80af62bf5db 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 04c5f8e62e4a..ea1d12801a1b 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 7df34845f39f..e03f57505c8a 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-mbsTDxd8vvkY0EQCOI8sXxY80odJgSAuuP2gNzy6HXo="; + hash = "sha256-WK90ml7xIRK2Xd1FIjRJg0QmXfFL1slmZOI8hhGsVtg="; }; - cargoHash = "sha256-cpNp/by8TU2lbb2d3smxUr48mTSLnoPXseiRZScwSXI="; + cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 9fc2c803691c..b92a63491a2b 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-gvEHieM8osGyRrkeE8gEOPduTv3y3KgoZ2YhFgW5qp8="; + hash = "sha256-1Xwe1uONJbl4wq6QBbTI1suLiSlTzU4e/5WBccvghHE="; }; cargoHash = "sha256-ZkjXZrcA4qKHSjEOxj7+j10PxJw/du8B2Mee2fxPJxs="; diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 70bf397b220a..45572f49f561 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 1101e31c9c92..bf8e511b24ea 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix index 926ad3856095..6772080c04d4 100644 --- a/pkgs/by-name/co/cosmic-reader/package.nix +++ b/pkgs/by-name/co/cosmic-reader/package.nix @@ -19,13 +19,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-reader"; - version = "0-unstable-2025-11-25"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-reader"; - rev = "8459e02be5bd778d6e06e2f0c4f561f03dd14a85"; - hash = "sha256-R0t+JkSUkDJkvnj3mjDFN3pcpqI0VkuRpgteXqcEH6Y="; + rev = "7a1f667b6c543d6322a02c9f872ffc053cfd2e3d"; + hash = "sha256-S4F09tb1O0xdAY/6pDPS2yBTVaGdptzclHT3w/kyfE0="; }; cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc="; diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index dde40f17d679..e8ab78b96982 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index d7ac180b2d1e..eb1a96b23e34 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 057c1819607c..f16059041241 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 5f2282939c81..73cdba2478cf 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Z+MJMHcyqUnSKSUeYH5PyFFkzUQ33bkFoAd3m/TckrQ="; + hash = "sha256-MNse8aUfRuJ7svNWv/b+XF2LVNKw4O6oZN7bUmrPE78="; }; - cargoHash = "sha256-Su+yAQLr3Us8YNU8z83XO1UDjjOY3SCGnkmwGaIGFho="; + cargoHash = "sha256-zubJwm+4Jb6Fv2+tu93It4wkD9KJe3KaPUkxlWAvuZE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 8d2df5c76e0e..252f7f938691 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-rrM0ibnapXv+IYDPqw/dXQJ44cDWPNlz7rREVQw5J1o="; + hash = "sha256-6PysnBu6b4REfmIwk7MgYZpNXeFKX2kIrwoflqAAKNg="; }; - cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc="; + cargoHash = "sha256-n9QuACHrSctmH8qLpDL3Z6iGyKXhYKVoGOiw14jVIkc="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 75eed0912f66..ddec82d42938 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index e217cfd1ef95..57581c16dd11 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 7b7f2e5b331b..25fbcefe90ab 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-XsBOT4AUdw9cA1wjHzS0StbSIt4z3tEMnnJdegdsROI="; + hash = "sha256-/NLEI+rBuqq1NXh9KijkR+lOlyEOfgwc46dgUoPxF1E="; }; cargoHash = "sha256-7BdyHz66A+QhJY0haohaQiNkhpmX9rqIW9gD8E4Q7Qg="; diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix index 51ce6aa5c88f..056a92738475 100644 --- a/pkgs/by-name/co/coursier/package.nix +++ b/pkgs/by-name/co/coursier/package.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ adelbertc - nequissimus ]; platforms = platforms.all; }; diff --git a/pkgs/by-name/cp/cppad/package.nix b/pkgs/by-name/cp/cppad/package.nix index 49f97e0a0f4a..f95fe75ac763 100644 --- a/pkgs/by-name/cp/cppad/package.nix +++ b/pkgs/by-name/cp/cppad/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppad"; - version = "20250000.2"; + version = "20250000.3"; src = fetchFromGitHub { owner = "coin-or"; repo = "CppAD"; tag = finalAttrs.version; - hash = "sha256-rAKD/PAjepDchvrJp7iLYw5doNq8Af1oVh61gfMcNYI="; + hash = "sha256-nxndrOAgmEbMSVLz66E3X/r35NSgiOvNJnF9BY/IOd0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index 20fc80c99e5f..196fe69cc674 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { description = "Static code checker for C++"; changelog = "https://github.com/cpplint/cpplint/releases/tag/${version}"; mainProgram = "cpplint"; - maintainers = [ lib.maintainers.bhipple ]; license = [ lib.licenses.bsd3 ]; }; } diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix index 2e34363cd4f7..dcf7530b5706 100644 --- a/pkgs/by-name/cr/crawley/package.nix +++ b/pkgs/by-name/cr/crawley/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "crawley"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "s0rg"; repo = "crawley"; rev = "v${version}"; - hash = "sha256-fVS7/W2M97IeVpoayqYImkgiQC5A96qklt53GDsIxfc="; + hash = "sha256-/94ynxbH06JFzx3TZDRxvx9inbP+xiOVOqRxpopocjE="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-SaemEPcXc73G1wwxQ9/LbQV5fRd55pfd504F4PpAWVM="; + vendorHash = "sha256-d6m4HFhTUzMMCNpv3WxoPGTF8Erqi0980w+MA2PoZ9w="; ldflags = [ "-w" diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix index 602b2deca179..3c7a1e04bd18 100644 --- a/pkgs/by-name/cr/credhub-cli/package.nix +++ b/pkgs/by-name/cr/credhub-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.51"; + version = "2.9.52"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-BFlPKkk8t6WWbDB4Z0Bsizumd0flO1GqedVSWHKlwgE="; + sha256 = "sha256-qTRRk7n8f5tC/uiBJgbZpd+tsoOPK5qTgZnqfwi5YlA="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix index 3a35a2c682d1..dbc6adfd11b1 100644 --- a/pkgs/by-name/cr/cri-tools/package.nix +++ b/pkgs/by-name/cr/cri-tools/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cri-tools"; rev = "v${version}"; - hash = "sha256-nWbxPw8lz1FYLHXJ2G4kzOl5nBPXSl4nEJ9KgzS/wmA="; + hash = "sha256-66UDoObxlNBTYJPpo4GoQlV66hXZRf5eLB3ji0KU/Zs="; }; vendorHash = null; diff --git a/pkgs/by-name/cr/crow/cpm.patch b/pkgs/by-name/cr/crow/cpm.patch index 20122fb3cc34..d5a6b5b8ce6f 100644 --- a/pkgs/by-name/cr/crow/cpm.patch +++ b/pkgs/by-name/cr/crow/cpm.patch @@ -1,6 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7dbc2c3..cfdd98d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,6 @@ project(Crow + + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake) + + # Make sure Findasio.cmake module is found + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 67c458c..2873530 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt -@@ -5,18 +5,9 @@ +@@ -5,18 +5,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 new) set(CMAKE_POLICY_WARNING_CMP0126 new) include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake) @@ -9,7 +23,7 @@ +find_package(Catch2 REQUIRED) -CPMAddPackage(Catch2 -- VERSION 3.7.0 +- VERSION 3.10.0 - GITHUB_REPOSITORY catchorg/Catch2 - OPTIONS - "CATCH_INSTALL_DOCS Off" @@ -19,4 +33,4 @@ - enable_testing() - set(TEST_SRCS + # list the test sources diff --git a/pkgs/by-name/cr/crow/package.nix b/pkgs/by-name/cr/crow/package.nix index ec2898d65c10..65ed605821db 100644 --- a/pkgs/by-name/cr/crow/package.nix +++ b/pkgs/by-name/cr/crow/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crow"; - version = "1.2.1.2"; + version = "1.3.0.0"; src = fetchFromGitHub { owner = "CrowCpp"; repo = "Crow"; tag = "v${finalAttrs.version}"; - hash = "sha256-iQ2owNry4LOmMxyO5L7O7XZB5vwUf+ZuZL76hZ6FThk="; + hash = "sha256-QLYQ0RouqDDvhnBF79O/9M7IwlF0eQ3HTqR6bXWm574="; }; patches = [ @@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "CROW_BUILD_EXAMPLES" false) + # Requires more non-trivial patches to get around CPM + (lib.cmakeBool "CROW_GENERATE_SBOM" false) ]; doCheck = true; diff --git a/pkgs/by-name/cr/cruft/package.nix b/pkgs/by-name/cr/cruft/package.nix index fb64c38e861b..e9e9395d1dca 100644 --- a/pkgs/by-name/cr/cruft/package.nix +++ b/pkgs/by-name/cr/cruft/package.nix @@ -65,6 +65,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/cruft/cruft"; license = lib.licenses.mit; mainProgram = "cruft"; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix index d180b228c02e..6c2fa30a251b 100644 --- a/pkgs/by-name/cr/crun/package.nix +++ b/pkgs/by-name/cr/crun/package.nix @@ -8,10 +8,11 @@ libcap, libseccomp, python3, - systemd, + systemdMinimal, yajl, nixosTests, criu, + versionCheckHook, }: let @@ -38,16 +39,22 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crun"; version = "1.25.1"; src = fetchFromGitHub { owner = "containers"; repo = "crun"; - rev = version; + tag = finalAttrs.version; hash = "sha256-WBAwyDODMrUDlgonRbxaNQ+aN8K6YicY2JVArXDJem8="; fetchSubmodules = true; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; }; nativeBuildInputs = [ @@ -61,23 +68,25 @@ stdenv.mkDerivation rec { criu libcap libseccomp - systemd + systemdMinimal yajl ]; enableParallelBuilding = true; strictDeps = true; - NIX_LDFLAGS = "-lcriu"; + env = { + NIX_LDFLAGS = "-lcriu"; + }; # we need this before autoreconfHook does its thing in order to initialize # config.h with the correct values postPatch = '' - echo ${version} > .tarball-version - echo '#define GIT_VERSION "${src.rev}"' > git-version.h + echo ${finalAttrs.version} > .tarball-version + echo "#define GIT_VERSION \"$(cat COMMIT)\"" > git-version.h ${lib.concatMapStringsSep "\n" ( - e: "substituteInPlace Makefile.am --replace 'tests/${e}' ''" + e: "substituteInPlace Makefile.am --replace-fail 'tests/${e}' ''" ) disabledTests} ''; @@ -85,8 +94,12 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) podman; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { - changelog = "https://github.com/containers/crun/releases/tag/${version}"; + changelog = "https://github.com/containers/crun/releases/tag/${finalAttrs.version}"; description = "Fast and lightweight fully featured OCI runtime and C library for running containers"; homepage = "https://github.com/containers/crun"; license = lib.licenses.gpl2Plus; @@ -94,4 +107,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.podman ]; mainProgram = "crun"; }; -} +}) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 22c25541fe55..44c55d6defff 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.18.6"; + version = "0.22.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-J6C/aV+VOAZXDC5dTZl7CkLvxk8IOjbWfJkHEJj29Dg="; + hash = "sha256-WwakKR+JdlidfxXnKmAPVMxRs/TfNPOg43vQ9HrEqFY="; }; - vendorHash = "sha256-LhmkdwBRO0pW2mk7fB/rZMxZe6M0TEfReHJ+NxAPHR0="; + vendorHash = "sha256-9WROtIp4Tt+9w+L+frLawwoyMCjuk41VIGYEi5oSHDk="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/cryptop/package.nix b/pkgs/by-name/cr/cryptop/package.nix index 07430c794792..b573d021f386 100644 --- a/pkgs/by-name/cr/cryptop/package.nix +++ b/pkgs/by-name/cr/cryptop/package.nix @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bhipple ]; mainProgram = "cryptop"; }; } diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix index 24c2b0d077b2..676d358e53cc 100644 --- a/pkgs/by-name/ct/ctags-lsp/package.nix +++ b/pkgs/by-name/ct/ctags-lsp/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "ctags-lsp"; - version = "0.9.0"; + version = "0.9.1"; vendorHash = null; src = fetchFromGitHub { owner = "netmute"; repo = "ctags-lsp"; tag = "v${version}"; - hash = "sha256-CcaYwfmWtBoyAkgF1xwBjNG3MtSa94x2/prW6VQpbQ0="; + hash = "sha256-QF1TBHo2/2Hsnbv4kDw/RYUw9pN8fAVX11lE3J1/k8I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index e98c1b789195..b191782cb3e5 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.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-nnbBK1dIHwhq8n1mJe2wOLcDkIuScFbQwZvJ8x+knCk="; + hash = "sha256-AUi/MODxCSVuJhFjlhbMUyrGnK0X28B2+uTIHIg7oMg="; }; # Fix CMake 4 compatibility diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index b778ebe4b8a9..f85fe4b54132 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2025-09-17"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "e495bee4cd630c9f99907a764e16edba37a4b564"; - hash = "sha256-iBxYZppjJhFAwGi9v4/lTsyqC9Gy04Dc7bJNzgv18rE="; + rev = "bed368eb0d901ec4b7921a8d704ca469b7fb4e19"; + hash = "sha256-Y9qSqU8BsAcD+uBmAvKYzlZFJ7LZAdbtSt1Lc59iOG0="; }; outputs = [ diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index d70d708e2fc6..23d753af5074 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -60,7 +60,10 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - pythonRelaxDeps = [ "prov" ]; + pythonRelaxDeps = [ + "prov" + "rdflib" + ]; disabledTests = [ "test_content_types" diff --git a/pkgs/by-name/da/daemon/package.nix b/pkgs/by-name/da/daemon/package.nix index 3a323e12f277..2840541254dd 100644 --- a/pkgs/by-name/da/daemon/package.nix +++ b/pkgs/by-name/da/daemon/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { Java). ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.sander ]; platforms = platforms.unix; mainProgram = "daemon"; }; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 3997f438b6ed..e81363530dca 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.94.2"; + version = "1.95.0"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-/ygA4Ymo7n3JWCv/qxkQs6JWoIhMIwHjKCqk4KyKOMw="; + hash = "sha256-riN4Tlf8XknoDA3/8rb4kDU2ybqsytDHeWgR2fPeYac="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 0831edb476a4..71558bba3f12 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -24,11 +24,11 @@ "dependency": "direct dev", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "direct main", @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "cli_pkg", - "sha256": "bbffba7114f20c1deceeec8935f9f2de8abcd1befb479663e9a538ef79a17190", + "sha256": "8343ec3b11f163ab105687d6bad5432ef49b95d15137ec44a28c8cef918b5150", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.0" + "version": "2.15.1" }, "cli_repl": { "dependency": "direct main", @@ -364,11 +364,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.18" }, "meta": { "dependency": "direct main", @@ -394,11 +394,11 @@ "dependency": "transitive", "description": { "name": "native_stack_traces", - "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", + "sha256": "d34cf916db87b14d39465b3e3b4b4a8ee1f304bde6ed7605571e34802e3d6a11", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.7" + "version": "0.6.1" }, "native_synchronization": { "dependency": "direct main", @@ -480,6 +480,16 @@ "source": "hosted", "version": "1.5.2" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, "protobuf": { "dependency": "direct main", "description": { @@ -664,11 +674,11 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "8f0eb7fa76b7d05a4f3707e0dbd581babef5b0915ca508b757cf15d0cabb56cb", + "sha256": "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.27.0" + "version": "1.28.0" }, "test_api": { "dependency": "transitive", @@ -684,11 +694,11 @@ "dependency": "transitive", "description": { "name": "test_core", - "sha256": "bad9916601a4f2ef6e4dbc466fb712e4b42cf4917c3fd428b018f51984fce13b", + "sha256": "f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.13" + "version": "0.6.14" }, "test_descriptor": { "dependency": "direct dev", diff --git a/pkgs/by-name/da/datamodel-code-generator/package.nix b/pkgs/by-name/da/datamodel-code-generator/package.nix new file mode 100644 index 000000000000..4e62cc8b2724 --- /dev/null +++ b/pkgs/by-name/da/datamodel-code-generator/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication datamodel-code-generator diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 2adaac5b209d..9eef189e80f4 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2025-11"; + version = "2025-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-1Je/L9NFN83Suzl+qvbJE5gzUitx6Iin5O0VqqjgecI="; + hash = "sha256-Xqo0j9nzQAel1NoTSxOGb8wqSnhATyCKGD6CPGomG5Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index 5185ee6f7c34..a01a6f33afef 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2025-11"; + version = "2025-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-CG29ARDYz1PU5JoIvybLUWuckufMk16/vzPj5H0h7V0="; + hash = "sha256-95f843vCjZgfuQEv6LDOmrUej/qV5Yr+qGHXddBPhHU="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index 1c484c2f8224..91a9b3c3e094 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2025-11"; + version = "2025-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-oOLvy3Le+ybHa3z2AGcmXdjUrfOxhguq8bRkyQh7MnI="; + hash = "sha256-MQ9kJubtM2Iq+gywSz6r7kkdv++BT9qEVPukFV8BQ5Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index a3323397ad35..7ca68e35d4d7 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -2,10 +2,9 @@ stdenv, lib, fetchFromGitLab, - fetchpatch2, gitUpdater, testers, - boost186, + boost, cmake, ctestCheckHook, dbus, @@ -21,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; tag = finalAttrs.version; - hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU="; + hash = "sha256-ehP+QW/tTR6tLHEiWGDbiYT9oAqlS346UaVTkJC5bSE="; }; outputs = [ @@ -37,16 +36,6 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks - # Remove when version > 5.0.5 - (fetchpatch2 { - name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff"; - hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4="; - }) - ]; - postPatch = '' substituteInPlace doc/CMakeLists.txt \ --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' @@ -74,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost186 # uses boost/asio/io_service.hpp + boost lomiri.cmake-extras dbus libxml2 @@ -101,6 +90,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; disabledTests = [ + # Flaky flaky flaky. Spams D-Bus with hundreds of requests, and if any is dropped, the test fails. + "async_execution_load_test" + # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10 "executor_test" @@ -113,9 +105,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; - # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9 - # Try again on next bump. - versionCheck = finalAttrs.version != "5.0.5"; + versionCheck = true; }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/db/dbus_java/package.nix b/pkgs/by-name/db/dbus_java/package.nix index ab2e92aa21be..6f0ebbb4cae4 100644 --- a/pkgs/by-name/db/dbus_java/package.nix +++ b/pkgs/by-name/db/dbus_java/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = [ maintainers.sander ]; license = licenses.afl21; }; } diff --git a/pkgs/by-name/dc/dcadec/package.nix b/pkgs/by-name/dc/dcadec/package.nix index 7468427b3745..4d7dfe578f20 100644 --- a/pkgs/by-name/dc/dcadec/package.nix +++ b/pkgs/by-name/dc/dcadec/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; mainProgram = "dcadec"; - maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/foo86/dcadec"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index e9b5028b3f8c..a718b1c19582 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation rec { cc-by-sa-30 ]; maintainers = with lib.maintainers; [ - lom ncfavier Scrumplex sirseruju diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 802251285f57..3f0f8d27f93d 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.13.3"; + version = "6.14.0"; src = fetchFromGitHub { owner = "jeessy2"; repo = "ddns-go"; rev = "v${version}"; - hash = "sha256-kB13TjZpeLnrbLc4dhA7lJY4I24wjTGfeqFtt97pyQE="; + hash = "sha256-jx9Mvb40lDWxZp47fbHs0M+f8VQCBnzHb0bQiLRby1M="; }; vendorHash = "sha256-CtbbyI7sL1Ej4WDWkEZoRFngiwWpzSwvAKAWQwiMD1E="; diff --git a/pkgs/by-name/de/deadlock-mod-manager/disable-update-notice.patch b/pkgs/by-name/de/deadlock-mod-manager/disable-update-notice.patch deleted file mode 100644 index c1eeed4555eb..000000000000 --- a/pkgs/by-name/de/deadlock-mod-manager/disable-update-notice.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/apps/desktop/src/app.tsx b/apps/desktop/src/app.tsx -index 70dcbe5ff5..91ac4deb73 100644 ---- a/apps/desktop/src/app.tsx -+++ b/apps/desktop/src/app.tsx -@@ -68,14 +68,6 @@ - - - -- - = 14. Shouldn't be needed for ecwolf versions > 1.4.1. - (fetchpatch { - name = "tmemory.h-const-correctness.patch"; - url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw"; - hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -57,15 +48,11 @@ stdenv.mkDerivation (finalAttrs: { # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ # directories to the PATH. - postInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - mv "$out/games" "$out/bin" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications,bin} - cp -R ecwolf.app $out/Applications - makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf - ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R ecwolf.app $out/Applications + makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf + ''; passthru.updateScript = let @@ -112,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ jayman2000 - sander ]; platforms = platforms.all; }; diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index 46132950465b..7de4c8adc1bf 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -214,16 +214,16 @@ "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=", "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o=" }, - "ch/qos/logback#logback-classic/1.5.20": { - "jar": "sha256-EijbmeGvYC4ZGisUIlLYqvaBKeZDwZ5/khN85fcgmtM=", - "pom": "sha256-s+hotrfIsqgGswDIrsddcCeI/l5lM9P2ljYHmu1bU3c=" + "ch/qos/logback#logback-classic/1.5.21": { + "jar": "sha256-slI/ew2r9DhsgTEvA3HSZ+Op+85AkEbxawQr9oVxuko=", + "pom": "sha256-2L+25QxBRYd4sAl7bgatXgc5HpbkMjuJSjBaZoHVZbE=" }, - "ch/qos/logback#logback-core/1.5.20": { - "jar": "sha256-Kf4JW7e3+FCQeuw/3etAyNOZ2F5WgOjTUz49pdmq6Rc=", - "pom": "sha256-XFJJldocTKrot6y/aQFin468ltUkfZGw2afuCKsQ7Eo=" + "ch/qos/logback#logback-core/1.5.21": { + "jar": "sha256-CCWsH8UpY2kSHlQj45fFLRJbDj+udDz8DY5BYVnxT0Q=", + "pom": "sha256-kuYdhik+WPSObO9Xu55qx3sqd57ayaQ/GC8YYUJ0IUM=" }, - "ch/qos/logback#logback-parent/1.5.20": { - "pom": "sha256-Fwus2jsPfYA9jteOcPEg7Ncmu5qKk8F6MmfzP8HryiA=" + "ch/qos/logback#logback-parent/1.5.21": { + "pom": "sha256-3PccPlQ27GTfEIU6bOjEMNARdxCmyPyb6eK7tvLx5KM=" }, "com/fasterxml#oss-parent/30": { "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA=" @@ -505,10 +505,10 @@ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, - "io/sentry#sentry/8.25.0": { - "jar": "sha256-UDhcOKUbPLNflsG7TgE5AHE9bhMcAYGUSVAXotmqYj8=", - "module": "sha256-+blsoZ7yK3Y+DZVazG9dURUrLGpiINAk43loTfgMM8A=", - "pom": "sha256-KdIuXH5APQk8ALJ2PbyNnTrXVxCvbWAmPSrJv7pDg0g=" + "io/sentry#sentry/8.27.0": { + "jar": "sha256-bVcoMB+ycG8Byn+R5VuwpdMXDrdolV8M+yRDiuEo8ko=", + "module": "sha256-yXd56L8PPZ7vB/vRyrJNyzWpKr82yA86ByykasPmrzc=", + "pom": "sha256-KoUd5Q2Ab1+ER64/NhFXkazWsvN6reaXGy2VxfkmFbM=" }, "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", @@ -603,9 +603,6 @@ "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, @@ -621,9 +618,9 @@ "org/apache#apache/9": { "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" }, - "org/apache/commons#commons-collections4/4.4": { - "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", - "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + "org/apache/commons#commons-collections4/4.5.0": { + "jar": "sha256-APkyY8JnviAbiuUhtEpxNycbFmiENTQL9inbG6wKWEU=", + "pom": "sha256-xwD5mOHXpqXArvHUzutrrH0XAt1tbtpzoX1n9dbyRn0=" }, "org/apache/commons#commons-compress/1.28.0": { "jar": "sha256-4VIpRSGEVvNkmjm8Sv1wzkvUZiIVGdun03jyFBpGQso=", @@ -660,9 +657,6 @@ "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, - "org/apache/commons#commons-parent/48": { - "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" - }, "org/apache/commons#commons-parent/69": { "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, @@ -672,6 +666,9 @@ "org/apache/commons#commons-parent/74": { "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" }, + "org/apache/commons#commons-parent/81": { + "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" + }, "org/apache/commons#commons-parent/85": { "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" }, @@ -735,17 +732,17 @@ "jar": "sha256-tG67QUA4S0WjnpHiO1lc6dzYujqe6RTxX0CkKp+AU3M=", "pom": "sha256-KNkHvwQvNchyx5J0uBE1zIs9EE0p38twug3vly8oVyg=" }, - "org/apache/poi#poi-ooxml-lite/5.4.1": { - "jar": "sha256-3FkEYe/fzU8n4qiSc3l5q14wtBMqet/HyeVkR7caRbA=", - "pom": "sha256-dhDGeGbqRFzj2pQLJM1feGRebEJu5r5W7TY8yaEUGTc=" + "org/apache/poi#poi-ooxml-lite/5.5.0": { + "jar": "sha256-cW/1fJns/UH+PcRawq1kHttMi/ITelkVzf3lqZZxpzU=", + "pom": "sha256-58mJ6rvQwamG/GVIj6SafzqdObsu9uT9TSjNHeu/yiQ=" }, - "org/apache/poi#poi-ooxml/5.4.1": { - "jar": "sha256-/SAMnm901wQWCpfp1SBBmV7YdDlFRTAAHt2SBojxn1M=", - "pom": "sha256-rnbyDM2VTeAUqta1RUvNSbFgPhr+BsfuTh3BcdEbczM=" + "org/apache/poi#poi-ooxml/5.5.0": { + "jar": "sha256-OGnsA0rpm5Om4IkQNXIBH6IrHDQqK21+ekSMTWXq6ic=", + "pom": "sha256-SdxN0/6PicuPyWNFQVErkLSJjD2Xvl8jOh6PVxm/1i0=" }, - "org/apache/poi#poi/5.4.1": { - "jar": "sha256-2lq/QtpGBMWnvKOJVq9unW8ZbZttTLfqvuT0gLWA1QU=", - "pom": "sha256-qoJN6gLaJ4G7a4PhqIChchDewAtdHCWSBuKIFKEJnog=" + "org/apache/poi#poi/5.5.0": { + "jar": "sha256-D9yvwrfWoQeXNYh7jKRtfP+b5Zx6+Q1BLemScDFNTh8=", + "pom": "sha256-oOVRgRC0+5fNcmRXl6J9/5W0iK7mZ7sGO9tebVRJoLE=" }, "org/apache/xmlbeans#xmlbeans/5.3.0": { "jar": "sha256-bMado7TTW4PF5HfNTauiBORBCYM+NK8rmoosh4gomRc=", @@ -835,6 +832,10 @@ "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, "org/junit#junit-bom/5.13.1": { "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index f1c23f104cc4..8bdec38c494e 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-m4Wv1M6UliyERjZHZvAqJVttFwZfsr0oxrK4/AZmy1Q="; + hash = "sha256-P9Mb++2400081OdjMI6y3C2zRW+8IpIjBjLPoNnDbUY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index bb1e5400dc1b..4c846ebe7329 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { homepage = "https://editorconfig-checker.github.io/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - uri-canva zowoq ]; }; diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index c680e3517911..acbf59605006 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "edmarketconnector"; - version = "5.13.2"; + version = "5.13.3"; src = fetchFromGitHub { owner = "EDCD"; repo = "EDMarketConnector"; tag = "Release/${finalAttrs.version}"; - hash = "sha256-BqzrW5pV9ty1MBaILQir+iOda2xQoJeTq8eZG0x6+90="; + hash = "sha256-bcfLPrAIGBB8S7GtEpWpawiP2KFEG0xHeKXZAzqOjuU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ed/edname/package.nix b/pkgs/by-name/ed/edname/package.nix new file mode 100644 index 000000000000..f1f3c46f6137 --- /dev/null +++ b/pkgs/by-name/ed/edname/package.nix @@ -0,0 +1,41 @@ +{ + stdenv, + coreutils, + lib, + fetchFromGitea, + makeWrapper, +}: +stdenv.mkDerivation { + + pname = "edname"; + version = "1.0.1"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitea { + domain = "git.tudbut.de"; + owner = "TudbuT"; + repo = "edname"; + rev = "v1.0.1"; + hash = "sha256-Bj7c18O+Z64KlpTNG3FvR17YM2GsTOUyFuapUyhgZ6M="; + }; + + installPhase = '' + mkdir -p $out/bin + cp edname.sh "$out/bin/edname" + wrapProgram "$out/bin/edname" \ + --prefix PATH : "${ + lib.makeBinPath [ + coreutils + ] + }" + ''; + + meta = with lib; { + description = "Mass renamer using $EDITOR"; + license = licenses.mit; + maintainers = [ maintainers.tudbut ]; + homepage = "https://git.tudbut.de/TudbuT/edname"; + mainProgram = "edname"; + }; +} diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index ad77a3b26da2..bcd8c9340546 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -184,7 +184,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ qubitnano - sander ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix index 0165b5c194fe..625833b71b2f 100644 --- a/pkgs/by-name/eg/egctl/package.nix +++ b/pkgs/by-name/eg/egctl/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "egctl"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "envoyproxy"; repo = "gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-VNS4+qmE728C44Bk34c41Sotw1FhjBJlnoOxbwUxlX8="; + hash = "sha256-ZLUC90on8HCKdO3+dbt1GVA8INfwExVW4/18EP21sMk="; }; - vendorHash = "sha256-v6tpwoS6UfF1AxqKgHftyfh624mv17uAgUOnryWg+I4="; + vendorHash = "sha256-oFuxY7bQ4O/hc8r1Z6K7PRYG4dOqpt0zLgT2N4cvARE="; # Fix case-insensitive conflicts producing platform-dependent checksums # https://github.com/microsoft/go-mssqldb/issues/234 proxyVendor = true; diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix index 430b27f5be96..c127636f24c3 100644 --- a/pkgs/by-name/ei/eigen/package.nix +++ b/pkgs/by-name/ei/eigen/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ - sander raskin ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ei/eigen2/package.nix b/pkgs/by-name/ei/eigen2/package.nix index 961879811827..3a00c45c4331 100644 --- a/pkgs/by-name/ei/eigen2/package.nix +++ b/pkgs/by-name/ei/eigen2/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ - sander raskin ]; platforms = platforms.unix; diff --git a/pkgs/by-name/ei/eigen_3_4_0/package.nix b/pkgs/by-name/ei/eigen_3_4_0/package.nix index 735a83b93cf7..fd3812c126d8 100644 --- a/pkgs/by-name/ei/eigen_3_4_0/package.nix +++ b/pkgs/by-name/ei/eigen_3_4_0/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ - sander raskin pbsds ]; diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 0b262a893a46..ed08ad2e6dc4 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.3.8"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-Q6KCmLwgk6Z/MhsKWevl9IZmG//Z9zEvawwhj241SrY="; + hash = "sha256-+0eZWEqVkJW54ADTC2Ay6cGHqcqRBpxOYJkN5Unil0A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index bd2108bac3cb..7114fe139570 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -221,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.ejabberd.im"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - sander chuangzhu toastal ]; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 8463d098e269..e9e0b527ca87 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.219.0"; + version = "0.220.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - hash = "sha256-D8N1nR5hkY2JhngbxD86/m5+jMZwYiiBqlPs6dPBEgU="; + hash = "sha256-yMzzbngCrYP4CXbpM12kiHr9Myb0NQyjiFnChJGv4Q0="; }; - vendorHash = "sha256-NsNBn6kQbQN5FElPxhv806Z6dk5fzqH0wA77i1nBm3c="; + vendorHash = "sha256-Bz4C+JyPZI+7LhmtUNyo/PJ+AkeGVQ+VrpHWnRqrIoE="; doCheck = false; diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/by-name/el/elegant-sddm/package.nix similarity index 84% rename from pkgs/data/themes/elegant-sddm/default.nix rename to pkgs/by-name/el/elegant-sddm/package.nix index 56545c77c843..dc5ac6d4638e 100644 --- a/pkgs/data/themes/elegant-sddm/default.nix +++ b/pkgs/by-name/el/elegant-sddm/package.nix @@ -3,7 +3,7 @@ formats, stdenvNoCC, fetchFromGitHub, - qtgraphicaleffects, + libsForQt5, /* An example of how you can override the background with a NixOS wallpaper * @@ -33,11 +33,10 @@ stdenvNoCC.mkDerivation { hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ="; }; - propagatedBuildInputs = [ - qtgraphicaleffects - ]; - dontWrapQtApps = true; + propagatedBuildInputs = [ + libsForQt5.qtgraphicaleffects + ]; installPhase = '' runHook preInstall @@ -55,13 +54,13 @@ stdenvNoCC.mkDerivation { postFixup = '' mkdir -p $out/nix-support - echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages + echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages ''; - meta = with lib; { + meta = { description = "Sleek and stylish SDDM theme crafted in QML"; homepage = "https://github.com/surajmandalcell/Elegant-sddm"; - license = licenses.gpl3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index a5034a0f1ae1..ae3089d89bb3 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.3"; + "version" = "1.12.6"; "hashes" = { - "desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8="; - "desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM="; + "desktopSrcHash" = "sha256-3CuEFbota6MPVLPeHkXgtb0OmDW91w08+XVnT3mDHaI="; + "desktopYarnHash" = "sha256-SPXbp+6zmwXD0uN4ByV6kIni+DGQT8evYMioH1NZJVU="; }; } diff --git a/pkgs/by-name/el/element-desktop/update.sh b/pkgs/by-name/el/element-desktop/update.sh index ca573c6e994c..63ef2e2d39f1 100755 --- a/pkgs/by-name/el/element-desktop/update.sh +++ b/pkgs/by-name/el/element-desktop/update.sh @@ -54,6 +54,11 @@ getHashes() { }; } EOF + + if [ "$variant" = "web" ]; then + local shared_components_yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/packages/shared-components/yarn.lock")")" + sed -i "/^ \"webYarnHash/a \ \"webSharedComponentsYarnHash\" = \"$shared_components_yarn_hash\";" "$output" + fi } getHashes web ../element-web-unwrapped/element-web-pin.nix diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix index 159a1db2aaea..df839ddbc981 100644 --- a/pkgs/by-name/el/element-desktop/yarn.nix +++ b/pkgs/by-name/el/element-desktop/yarn.nix @@ -41,4 +41,5 @@ stdenvNoCC.mkDerivation { outputHash = hash; outputHashMode = "recursive"; + outputHashAlgo = "sha256"; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index f3f416350178..adaebeb66580 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,8 @@ { - "version" = "1.12.3"; + "version" = "1.12.6"; "hashes" = { - "webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A="; - "webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k="; + "webSrcHash" = "sha256-MZohRkaPNoevaLmOb60OcebYJDd0sI3UaPEFMXh7y38="; + "webYarnHash" = "sha256-3iV2XXphubxDG+FzbNC9cHY+gjSTssv6iQK9U7BLMp0="; + "webSharedComponentsYarnHash" = "sha256-fwRasJ3iI+4DjqfNNpZ5CceEydJITUTeB7brhcmqOKk="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index b747fafd8d91..850a5217a91e 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -11,7 +11,7 @@ let pinData = import ./element-web-pin.nix; - inherit (pinData.hashes) webSrcHash webYarnHash; + inherit (pinData.hashes) webSrcHash webYarnHash webSharedComponentsYarnHash; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; @@ -35,6 +35,13 @@ stdenv.mkDerivation ( hash = webSrcHash; }; + # https://github.com/element-hq/element-web/commit/e883b05206129857aa00ca726252e10a0eb05cf9 + # introduced a link: dependency that we need to fetch as well + offlineCacheSharedComponents = fetchYarnDeps { + yarnLock = finalAttrs.src + "/packages/shared-components/yarn.lock"; + sha256 = webSharedComponentsYarnHash; + }; + offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; sha256 = webYarnHash; @@ -50,6 +57,12 @@ stdenv.mkDerivation ( runHook preBuild export VERSION=${finalAttrs.version} + + pushd packages/shared-components + yarnOfflineCache=${finalAttrs.offlineCacheSharedComponents} yarnConfigHook + popd + yarn --offline --cwd packages/shared-components prepare + yarn --offline build:res yarn --offline build:module_system yarn --offline build:bundle diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix index eab0d8f74b49..252f4b184fdd 100644 --- a/pkgs/by-name/el/eliza/package.nix +++ b/pkgs/by-name/el/eliza/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "eliza"; - version = "0-unstable-2025-11-26"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "anthay"; repo = "ELIZA"; - rev = "602c0da7a40a6c7d194268d781aaee3bdb8e8607"; - hash = "sha256-GFTsm1LJf+c2sxrg4ZIlzO06UtZITP/AlPDckAxiwYc="; + rev = "73066e8d1ccf77990ab501988aec65a8a5c23408"; + hash = "sha256-wcJusigyvZcAkYRd7+tf09ZGHynUQsnK+Eg7mwlZbfc="; }; doCheck = true; diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index b0c4642ead5e..bc8fe81093a0 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg="; + hash = "sha256-JXe+I0CViJAXOnWzilYpjWquYFzZGIP5y6HS6KosYPU="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8="; + cargoHash = "sha256-UVuXeGmSvAwHs/U0s/mByiZCwa2refz1l8eJvcCoagk="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 3fbeb620266c..9a46edef78b0 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg="; + hash = "sha256-JXe+I0CViJAXOnWzilYpjWquYFzZGIP5y6HS6KosYPU="; }; buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8="; + cargoHash = "sha256-UVuXeGmSvAwHs/U0s/mByiZCwa2refz1l8eJvcCoagk="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix index 379743967b74..beb6be6f5e97 100644 --- a/pkgs/by-name/em/emplace/package.nix +++ b/pkgs/by-name/em/emplace/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "emplace"; }; } diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 4255015dcef0..da702d2a11eb 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -18,14 +18,14 @@ let in flutter332.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.4.10"; + version = "4.4.12"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "mobile" ]; tag = "auth-v${version}"; - hash = "sha256-JzDFzopXNurkOtdheiQZJ5aBQWu7YZumiHs2RghGeVc="; + hash = "sha256-1GJWGTzErV+wSkeAg3z0u7tBPFrq6hPc0fWniKT8w9M="; }; sourceRoot = "${src.name}/mobile/apps/auth"; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index ea7d289622e7..3238c7d01ca7 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -450,6 +450,25 @@ "source": "hosted", "version": "2.1.1" }, + "dir_utils": { + "dependency": "direct main", + "description": { + "path": "../../packages/dir_utils", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, + "dots_indicator": { + "dependency": "direct main", + "description": { + "name": "dots_indicator", + "sha256": "2a53e0321a3f0d87e38ef30f6e9ff1deb5d6c0e2c5708e057d26cdaa94a95f10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, "dotted_border": { "dependency": "direct main", "description": { @@ -1180,11 +1199,11 @@ "dependency": "direct main", "description": { "name": "hugeicons", - "sha256": "b4a695c2100217a0b4d2378f0102d948925c97e37417baa6e2d9cb62ba8fb2f7", + "sha256": "036d917bd12e2dee331de7910a11417ebf6c80be1962c0d63ee945e3184f0937", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "image": { "dependency": "direct main", @@ -1738,6 +1757,26 @@ "source": "hosted", "version": "4.1.0" }, + "saf_stream": { + "dependency": "direct main", + "description": { + "name": "saf_stream", + "sha256": "c05449997698c481a03e428162a999f93b1ee1bcc0349d651899a59f7b10230a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.3" + }, + "saf_util": { + "dependency": "direct main", + "description": { + "name": "saf_util", + "sha256": "219f983e5f17b28998335158cdc97add9d52af9884e38b5a43f10dcc070510ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.0" + }, "screen_retriever": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 5b233d557d09..4f391c42b084 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web-${enteApp}"; - version = "1.2.20"; + version = "1.2.22"; src = fetchFromGitHub { owner = "ente-io"; diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 8c8ae5197fbc..546cdcf30f10 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -22,16 +22,6 @@ buildFHSEnv { stdenv.cc.libc gcc ]) - ++ - # OpenHMD dependencies - ( - pkgs.openhmd.buildInputs - ++ pkgs.openhmd.nativeBuildInputs - ++ (with pkgs; [ - meson - ]) - ) - ++ ( # OpenComposite dependencies pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs @@ -138,7 +128,6 @@ buildFHSEnv { kebabToCamel = x: pascalToCamel (kebabToPascal x); profiles = [ "lighthouse-default" - "openhmd-default" "simulated-default" "survive-default" "wmr-default" diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index f927672f4213..e7006804bb84 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.36.2"; + version = "1.36.3"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-r3NrtmU8zpxSsvOwkqNgKsIaYKxnVpjQYNxNgoN8Bco="; - x86_64-linux = "sha256-r9Z7z+pUhSXudqk1CgpM/rKsJMe1MnlM4zLYQK2M2uc="; + aarch64-linux = "sha256-/YhTx+mSn2pEWZKBdcGKp5QbVrQ/4H4K3jvq9ZuKeiE="; + x86_64-linux = "sha256-bcrOxz8P8Y0vaPYF+fBBzQ4cTTDTw4l3BYzZI9qi3qY="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/ep/ephemeralpg/package.nix b/pkgs/by-name/ep/ephemeralpg/package.nix index 0bd24ea7e473..8b46e96cc273 100644 --- a/pkgs/by-name/ep/ephemeralpg/package.nix +++ b/pkgs/by-name/ep/ephemeralpg/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://eradman.com/ephemeralpg/"; platforms = platforms.all; maintainers = with maintainers; [ - hrdinka medv ]; }; diff --git a/pkgs/by-name/ep/epr/package.nix b/pkgs/by-name/ep/epr/package.nix index 520237e7e018..1a457a0b3710 100644 --- a/pkgs/by-name/ep/epr/package.nix +++ b/pkgs/by-name/ep/epr/package.nix @@ -25,7 +25,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "epr"; homepage = "https://github.com/wustho/epr"; license = licenses.mit; - maintainers = [ maintainers.Br1ght0ne ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index bbfe2d0e2508..8523d3aff4d1 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -8,14 +8,15 @@ stdenv.mkDerivation { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.35"; + version = "1.2.36"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files) - url = "https://download3.ebz.epson.net/dsc/f/03/00/17/28/09/4e8dc40219d4b52e414b608de92552af4fd46eca/epson-inkjet-printer-escpr2-1.2.35-1.tar.gz"; - hash = "sha256-aYEuEION/C32/SnngreX/nqK/6Yzkuxf0k0HpferTYM="; + + url = "https://download-center.epson.com/f/module/bb48b7e6-662f-4152-a86f-c1a78fc74b1f/epson-inkjet-printer-escpr2-1.2.36-1.tar.gz"; + hash = "sha256-0R4dFhT1XhjXMOeRxCbTIT1K83bkwiAhpu/W10DSlxM="; }; buildInputs = [ cups ]; @@ -37,6 +38,8 @@ stdenv.mkDerivation { "--with-cupsppddir=${placeholder "out"}/share/cups/model" ]; + passthru.updateScript = ./update.sh; + meta = { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R 2 Driver (generic driver)"; diff --git a/pkgs/by-name/ep/epson-escpr2/update.sh b/pkgs/by-name/ep/epson-escpr2/update.sh new file mode 100755 index 000000000000..b2082decd74a --- /dev/null +++ b/pkgs/by-name/ep/epson-escpr2/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl jq common-updater-scripts +set -eou pipefail + +result=$(curl -sSL 'https://download-center.epson.com/api/v1/modules/?device_id=XP-970%20Series&os=DEBARM32®ion=US&language=en' | jq -r '.items[] | select(.module_name == "Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux" and .cti_category == "Sources")') + +latestVersion=$(jq '.version' <<< "$result" | tr -d '"') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; (lib.getVersion epson-escpr2)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +url=$(jq '.url' <<< "$result" | tr -d '"') + +hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url $url)) +update-source-version epson-escpr2 $latestVersion $hash $url --ignore-same-version diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json index 4f899019cf40..9207cc69b455 100644 --- a/pkgs/by-name/er/ersatztv/nuget-deps.json +++ b/pkgs/by-name/er/ersatztv/nuget-deps.json @@ -46,8 +46,8 @@ }, { "pname": "BlazorSortable", - "version": "5.1.3", - "hash": "sha256-gQVWDsjj09hp1KlLW7Du9GQo8RMN3XU1x3wwbhNgp/4=" + "version": "5.1.6", + "hash": "sha256-aRw6nbwi8LnS2I7jlt75cH0ECnmhQkU7o8JoUKNpOns=" }, { "pname": "Blurhash.Core", @@ -69,10 +69,25 @@ "version": "4.1.0", "hash": "sha256-L/aMCcmE7xLEtap5/H56VwCsDI4N/m8jgoj6SkxM7x8=" }, + { + "pname": "Castle.Core", + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" + }, + { + "pname": "Chronic.Core", + "version": "0.4.0", + "hash": "sha256-5XUJ1kmVfeFjV4o9zBaHtHPQ03GoUBDPnQANQU+DZ6w=" + }, { "pname": "CliWrap", - "version": "3.9.0", - "hash": "sha256-WC1bX8uy+8VZkrV6eK8nJ24Uy81Bj4Aao27OsP1sGyE=" + "version": "3.10.0", + "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" }, { "pname": "Dapper", @@ -84,6 +99,16 @@ "version": "5.1.0", "hash": "sha256-WG4tbTGOz8INa1TAovAv+wvNIhzwGdLimyjhkT3NZ2o=" }, + { + "pname": "DiffEngine", + "version": "11.3.0", + "hash": "sha256-aZbLawtOytbKPrF2DQ3dZOwgxjuaGsXKC0LwmlAw6V0=" + }, + { + "pname": "DotNet.Glob", + "version": "3.1.3", + "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84=" + }, { "pname": "EFCore.BulkExtensions", "version": "9.0.2", @@ -121,23 +146,28 @@ }, { "pname": "Elastic.Clients.Elasticsearch", - "version": "9.2.0", - "hash": "sha256-m79ubD/K1EU9XFeLmYsRxfjymVm6r5r39rjDCXoIt0w=" + "version": "9.2.2", + "hash": "sha256-5wzN9SoLH/zU3WScLryzfVmk078TpO/5EY2iUflB5IY=" }, { "pname": "Elastic.Transport", "version": "0.10.1", "hash": "sha256-eX9H+arnuPnIzOFQvle4pdDTTpZ0Rw+t7rJ1ohlxbh0=" }, + { + "pname": "EmptyFiles", + "version": "4.4.0", + "hash": "sha256-2ej6ZYSr/KSz/Mmh0RavjIMMyHzzTVtyjd9nbW17IwY=" + }, { "pname": "ExtendedNumerics.BigDecimal", - "version": "3001.0.1.201", - "hash": "sha256-c/ujs7UUGwmVwWHYyG0XbvVmgjThbKwMM/MsCQtUMrk=" + "version": "3001.1.0.233", + "hash": "sha256-XP9qmY+lYNWQ4NVvhZ4wPrIXS0Dj6DTaS9wkTfQdryc=" }, { "pname": "FluentValidation", - "version": "12.0.0", - "hash": "sha256-BaOvGqRZ9BYCpsU+A/kqu25JfN2zr01aWtulSwZfGQ4=" + "version": "12.1.0", + "hash": "sha256-9I30avP9CoS1usoqOuGrpJW/OuSa6b2M5/z935182kQ=" }, { "pname": "FluentValidation.AspNetCore", @@ -156,8 +186,8 @@ }, { "pname": "Hardware.Info", - "version": "101.1.0", - "hash": "sha256-kVOIbxKjjt5BGGAC5x697DTDp3bhhtrnUTDZOqsWTCc=" + "version": "101.1.0.1", + "hash": "sha256-R2kxac5rNQ9mEsD3OR5LmXiBP4uakmcRBrHazzs+EMU=" }, { "pname": "HarfBuzzSharp", @@ -181,33 +211,48 @@ }, { "pname": "Heron.MudCalendar", - "version": "3.2.0", - "hash": "sha256-XjLkX52jvZpuqFnnsFZELfEvTvJXoH1VWOE5Geg6clo=" + "version": "3.3.0", + "hash": "sha256-1QVTu7VuJeBNqf0wBc9wPJBQ352Ko7neC+4iL5Tiolw=" }, { "pname": "HtmlSanitizer", - "version": "9.0.886", - "hash": "sha256-OgCbsMn3ci6he1ZlnJnAtJ+/Rr3sFIuBCL2ZVfHRhUk=" + "version": "9.0.889", + "hash": "sha256-0U6K39KkovhpFujGNhjUCv5/JCbESCiiAJbvHCYi9f0=" }, { "pname": "Humanizer.Core", "version": "2.14.1", "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" }, + { + "pname": "Humanizer.Core", + "version": "3.0.1", + "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww=" + }, { "pname": "J2N", "version": "2.1.0", "hash": "sha256-PKRqOMIgQEJfCm9qa59NdyHeNul0iZkWQnu7TlA5SCg=" }, { - "pname": "JetBrains.ReSharper.GlobalTools", - "version": "2025.2.3", - "hash": "sha256-O0391kuA/ds8C7WmtbeMYi4eNiO3DKFPDYsUDHfVFUA=" + "pname": "Jint", + "version": "4.4.2", + "hash": "sha256-T8r7EJrTfzfevHwfcOBGSacRpRnIyRm/KTyMVsJQ8go=" }, { - "pname": "Jint", - "version": "4.4.1", - "hash": "sha256-4ojG4dhMwlk9Sx52/YByKIu39cQ4lnYl+8S5VsE1Ut0=" + "pname": "Json.More.Net", + "version": "2.1.1", + "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU=" + }, + { + "pname": "JsonPointer.Net", + "version": "5.3.1", + "hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE=" + }, + { + "pname": "JsonSchema.Net", + "version": "7.4.0", + "hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0=" }, { "pname": "LanguageExt.Core", @@ -256,8 +301,8 @@ }, { "pname": "Markdig", - "version": "0.43.0", - "hash": "sha256-lUdjtLzSxAI0BEMdIgEc3fZ/VR8NO0gKSs1k6mgy6zU=" + "version": "0.44.0", + "hash": "sha256-EVuUTv5l68t7bP2vJ2njypxuRzH52AztXyBF9LUJrrI=" }, { "pname": "MedallionTopologicalSort", @@ -289,85 +334,75 @@ "version": "5.0.0", "hash": "sha256-THQ8Z7DAoMDEqAS7feAmAt82NvU7H90Y+jYwC7NwL+0=" }, + { + "pname": "Microsoft.ApplicationInsights", + "version": "2.23.0", + "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Internal.Assets", + "version": "10.0.0", + "hash": "sha256-IyY5Ymdkmf9S9qRwYXX9rWpzcU3fuDR+ITeaaeJQ/Dk=" + }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", - "version": "9.0.10", - "hash": "sha256-6l1ldFyaaj3s068Va9/dB1r/bwz28yvXFrRqqeApO1o=" + "version": "10.0.0", + "hash": "sha256-VJREi/phDmn2toJiTvyFbUO0qXG/Ef4QtbeVHLNJNw0=" + }, + { + "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", + "version": "9.0.11", + "hash": "sha256-uz9t6volHVoUM0j1GFXXfWU157ba05TvZBnres47roA=" }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "9.0.10", - "hash": "sha256-60LP/JjEanENkOHuC+A2uRnH8LX836p1SWeCGz7WI4I=" + "version": "10.0.0", + "hash": "sha256-2AYzgmFvXc1YU/sdQ/c9fLpM2Gs5AMsZbxIquVNZJbw=" }, { - "pname": "Microsoft.AspNetCore.Authorization", - "version": "9.0.1", - "hash": "sha256-r4kREQ8EBu0ca0mLWURXK+eRXxPDtw3ygkV6gKZHHcU=" - }, - { - "pname": "Microsoft.AspNetCore.Components", - "version": "8.0.6", - "hash": "sha256-UnN6Mp/ZCpyem4IEGLPeit/CM6R9sIZ4t8byhuaBAD8=" - }, - { - "pname": "Microsoft.AspNetCore.Components", - "version": "9.0.1", - "hash": "sha256-dkUlF8cmEplWR5IwkUC9TIDoseFKMkO+KzxGS5VAwVs=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Analyzers", - "version": "9.0.1", - "hash": "sha256-M5EP1+9d2ndDLursIcTGG9eiTst/npb9WlsdNigs8MQ=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Forms", - "version": "8.0.6", - "hash": "sha256-0pj0SSYltkS6LYizVbIixNxJm7mnOen/ZS2pc1qoDZ4=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Forms", - "version": "9.0.1", - "hash": "sha256-R1ZbsMvlu0QL4XUvdg56GJ0ipCwg8NJCpgChR3eVG0o=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "8.0.0", - "hash": "sha256-dsCb4B6r5iHPbEp8+uFzAfD1txGI5dEIWgwtT9+GgU8=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "8.0.6", - "hash": "sha256-p4HCxjja7i5ZBM65+p7QJ50/7xYnH+glDn92dWEzaPc=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "9.0.1", - "hash": "sha256-6x+220UK4IeHH52cIDjtcsVq99++4b/rJdpdYi5aqbU=" + "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", + "version": "9.0.11", + "hash": "sha256-RhcnttgtQtLpNkX+yqrKu8wqlrS9muxSA0GLGAfRMJI=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "9.0.10", - "hash": "sha256-LYa47siOO6avqUiPU7oix1N1n0rg9uBCoOGxjQ+pcCo=" + "version": "10.0.0", + "hash": "sha256-CRq0x0z6ox2i4+RX2uthtjBzmBgxjMWk68cAO670v1k=" }, { - "pname": "Microsoft.AspNetCore.Metadata", - "version": "9.0.1", - "hash": "sha256-QZbltYEjfOxrY991+bu+5fh/37N39eQnIMz30hhvHzc=" + "pname": "Microsoft.AspNetCore.JsonPatch", + "version": "9.0.11", + "hash": "sha256-MeQFvZt5GIEs9IQILjDwC72GlgyIMUH52nxsJbKCNdo=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "9.0.10", - "hash": "sha256-Oyz6w/aj7/l9bw1W3WGX9nzm0hF9jcQE9cFxcrNC/d0=" + "version": "10.0.0", + "hash": "sha256-9ZUxFNG00RU0O9e9LTJjIBSZgnWBTZI1sbDy6uXLwBw=" + }, + { + "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", + "version": "9.0.11", + "hash": "sha256-+WtuaFv9zL11yQpFDYv87BeXulu63UkqvH+cNJa3EY4=" }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.10", - "hash": "sha256-Wq3M/6lQmLozVE40miheZMbc/3Bx8gotSL8wyiUkbYM=" + "version": "10.0.0", + "hash": "sha256-mf3kOdkliLF4OD+CrmEhMNNDGOPKWGBOBWtX2EV5YEU=" + }, + { + "pname": "Microsoft.AspNetCore.OpenApi", + "version": "9.0.11", + "hash": "sha256-FvIqXjGE0RqejaBu43zcdCA3toYLTELPCRpnJp4kYuk=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", - "version": "9.0.10", - "hash": "sha256-2eY4Z9hzQiqQGCdl6BpQGRLjHnbCtxNG21oSNjwLrhQ=" + "version": "10.0.0", + "hash": "sha256-Sl0m0+8UGRmmSQcbP5OWznCvXnrrhIvotLL3DbbIgEE=" + }, + { + "pname": "Microsoft.AspNetCore.SpaServices.Extensions", + "version": "9.0.11", + "hash": "sha256-xD0gi4AGjRnIALAUC+YbugVHEmt9sa4m9JOlf2/NuUs=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -430,9 +465,9 @@ "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" }, { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + "pname": "Microsoft.CodeCoverage", + "version": "18.0.1", + "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY=" }, { "pname": "Microsoft.Data.SqlClient", @@ -451,8 +486,8 @@ }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "9.0.10", - "hash": "sha256-prsCR2WzQAhbhdZ30xk+/wvLt6rDj0M3k1tvyoD6uYM=" + "version": "9.0.11", + "hash": "sha256-cz4FkzDDKEINNzVWLt3j8nbi5kKzs2dbbbqF1uGnTzA=" }, { "pname": "Microsoft.Data.Sqlite.Core", @@ -466,23 +501,23 @@ }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "9.0.10", - "hash": "sha256-Zm4oMVeloK2WmPskzg4l3SXjJuC+sRg3O5aiTK5rHvw=" + "version": "9.0.11", + "hash": "sha256-c5RiSd/QPerOYUueN8G4wcmJG8/TmOiJniYI9gf2j8Q=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "9.0.10", - "hash": "sha256-FB+8WtFYKn1PH9R3pgKw7dNJiJDCcS78UkeRkxdOuCk=" + "version": "9.0.11", + "hash": "sha256-60/92aSe/qZcKqDOTf8uNBXea6/lqrjW2WnFSdvCTdk=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "9.0.10", - "hash": "sha256-q6w0uQ4qMAe2EuA65a3rk18rhGXuGVYMrdrIzD5Z+tw=" + "version": "9.0.11", + "hash": "sha256-hAiDz5WksFapSdV3N4Db7zAH7M+sBvEiO4I1BmQu+MY=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "9.0.10", - "hash": "sha256-Zb5u2PySq+VuISn4bSTTDp6sN05ml94eK5O3dZAGO9g=" + "version": "9.0.11", + "hash": "sha256-unGkfYBpPbLlieZULtFBaVzGWvX29MYnj32QrVFSmVo=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -496,8 +531,8 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "9.0.10", - "hash": "sha256-2XHQOKvs4mAXwl8vEZpdi6ZtDFhK2hPusRMFemu3Shw=" + "version": "9.0.11", + "hash": "sha256-mqsnHzVpFTlVyd/vLqAuM8Js0Q7CBJN2K8iYKmq/VXY=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -506,13 +541,13 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "9.0.10", - "hash": "sha256-LunzXQSLdZZL1aTlg8E8Jj58oKXniJwYx9zQasPbM2I=" + "version": "9.0.11", + "hash": "sha256-IMbQVABUUIox18jABD75ywKXqb4K1BE69TEhkYYCqGc=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "9.0.10", - "hash": "sha256-3uBgFul0W3+7MaxwRjZoowQ9iSw58jYPUChyWG/3UF4=" + "version": "9.0.11", + "hash": "sha256-o6yLDDyptXAvwTwMjhe6KLRfYqvh64OWhwABNa47UDU=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", @@ -536,18 +571,33 @@ }, { "pname": "Microsoft.Extensions.ApiDescription.Server", - "version": "9.0.10", - "hash": "sha256-PRhLCquUa3IE7i31aHMGBap7vlLFC7HPAJRnCyhBQDI=" + "version": "10.0.0", + "hash": "sha256-fgJ4g1gRX2W+TmNWxboxATYnZQxAGIpvl0EZD3BMVM0=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Server", + "version": "9.0.11", + "hash": "sha256-6+v6bVecvv1q47FscMLdEuMYJmpwonIWmMXGo5td5Sg=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "9.0.10", - "hash": "sha256-W/9WhAG5t/hWPZxIL5+ILMsPKO/DjprHRymZUmU5YOA=" + "version": "10.0.0", + "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI=" + }, + { + "pname": "Microsoft.Extensions.Caching.Abstractions", + "version": "9.0.11", + "hash": "sha256-+1PEeH8he6Yk0r/6UpQ69ej38vYtuVyS4JJdKEkrheQ=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.10", - "hash": "sha256-HIXNiUnBJaYN+QGzpTlHzkvkBwYmcU0QUlIgQDhVG5g=" + "version": "10.0.0", + "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4=" + }, + { + "pname": "Microsoft.Extensions.Caching.Memory", + "version": "9.0.11", + "hash": "sha256-/ZHjoBvGkq5a6kNvqBTkz5JfBOu1zLFbuTMBsPXUYwY=" }, { "pname": "Microsoft.Extensions.Caching.Memory", @@ -559,15 +609,20 @@ "version": "9.0.9", "hash": "sha256-Vd64P8RygTRObuy+R0htLqLZK6d4gogKfoC7eR9c1JQ=" }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "10.0.0", + "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg=" + }, { "pname": "Microsoft.Extensions.Configuration", "version": "9.0.10", "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw=" }, { - "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.7", - "hash": "sha256-Su+YntNqtLuY0XEYo1vfQZ4sA0wrHu0ZrcM33blvHWI=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "10.0.0", + "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -586,14 +641,19 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "9.0.7", - "hash": "sha256-45ZR8liM/A6II+WPX9X6v9+g2auAKInPbVvY6a79VLk=" + "version": "9.0.11", + "hash": "sha256-bBvR5XeJpoim/4JUsDtp+z7GU2vx37NwjAjeXLc+Ycg=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.9", "hash": "sha256-Qmi+ftu17qqVVHJ+SgKvLrXCHJDrP5h4ZgTflgDWgzc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "10.0.0", + "hash": "sha256-YSiWoA3VQR22k6+bSEAUqeG7UDzZlJfHWDTubUO5V8U=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", @@ -604,15 +664,10 @@ "version": "9.0.10", "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4=" }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "9.0.7", - "hash": "sha256-9iT3CPY6Vpwi1RCVwveHVteTgpAXloBAo8KCwIPsePg=" - }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "10.0.0", + "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -621,23 +676,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.1", - "hash": "sha256-Kt9fczXVeOIlvwuxXdQDKRfIZKClay0ESGUIAJpYiOw=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.10", - "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk=" + "version": "9.0.11", + "hash": "sha256-A77to45DYqDT5vCHAa2RBqTVOKND1KdYTX3PCTd2shA=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "6.0.0", - "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + "version": "10.0.0", + "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -654,11 +699,6 @@ "version": "9.0.0", "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.1", - "hash": "sha256-2tWVTPHsw1NG2zO0zsxvi1GybryqeE1V00ZRE66YZB4=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.10", @@ -666,8 +706,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.7", - "hash": "sha256-Ltlh01iGj6641DaZSFif/2/2y3y9iFk7GEd+HuRnxPs=" + "version": "9.0.11", + "hash": "sha256-7ybl+oJ7NkkOX3Ns7KAgaHy3CP2LvI1VBTJ9WbMIYC0=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "10.0.0", + "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI=" }, { "pname": "Microsoft.Extensions.DependencyModel", @@ -676,8 +721,8 @@ }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "9.0.10", - "hash": "sha256-isJHVIKcWkwi+CqwNBVlz2ISKzZj+TilVpmVNOonNWo=" + "version": "9.0.11", + "hash": "sha256-nKxWogDgMM/JqgqEP0vfNOfjrPB/KWcyr5V1UnCZaac=" }, { "pname": "Microsoft.Extensions.DependencyModel", @@ -691,13 +736,13 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.1", - "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + "version": "10.0.0", + "hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ=" }, { - "pname": "Microsoft.Extensions.Diagnostics", - "version": "9.0.10", - "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog=" + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "10.0.0", + "hash": "sha256-cix7QxQ/g3sj6reXu3jn0cRv2RijzceaLLkchEGTt5E=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", @@ -705,9 +750,9 @@ "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" }, { - "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "9.0.10", - "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0=" + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "10.0.0", + "hash": "sha256-CHDs2HCN8QcfuYQpgNVszZ5dfXFe4yS9K2GoQXecc20=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", @@ -715,59 +760,24 @@ "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" }, { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.10", - "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.10", - "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0=" - }, - { - "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.10", - "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ=" + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "10.0.0", + "hash": "sha256-Sub3Thay/+eR84cEODk/nPh1oYIYtawvDX6r0duReqo=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "9.0.0", "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "9.0.10", - "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ=" - }, { "pname": "Microsoft.Extensions.Http", - "version": "8.0.1", - "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" - }, - { - "pname": "Microsoft.Extensions.Http", - "version": "9.0.10", - "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA=" - }, - { - "pname": "Microsoft.Extensions.Localization", - "version": "9.0.1", - "hash": "sha256-xUjj12JrGno5SMFvElI83InMMAsg2IEmOvnSG0StPGM=" - }, - { - "pname": "Microsoft.Extensions.Localization.Abstractions", - "version": "9.0.1", - "hash": "sha256-TfMJ/RDIzihOh5zt30adc2clcUQMyDoWB173CW87KXg=" + "version": "10.0.0", + "hash": "sha256-gnsO9erEi7xLS3QwYukcrzPDpcUgRkNFnGzPARHVjrs=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "6.0.0", - "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.1", - "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + "version": "10.0.0", + "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs=" }, { "pname": "Microsoft.Extensions.Logging", @@ -781,14 +791,19 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "9.0.7", - "hash": "sha256-7n8guHFss8HPnJuAByfzn9ipguDz7dack/udL1uH3h0=" + "version": "9.0.11", + "hash": "sha256-AGNOGjQ1xEM3ct5iM21TeaJ/zdLtt+UduTUUs5WQi1E=" }, { "pname": "Microsoft.Extensions.Logging", "version": "9.0.9", "hash": "sha256-NdiJIyXqS4+uE/UPDxLfPt3qCvmapTBVuP3jUcsBb74=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "10.0.0", + "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.2", @@ -804,11 +819,6 @@ "version": "9.0.0", "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.1", - "hash": "sha256-aFZeUno9yLLbvtrj53gA7oD41vxZZYkrJhlOghpMEjo=" - }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "9.0.10", @@ -816,39 +826,39 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.7", - "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ=" + "version": "9.0.11", + "hash": "sha256-hk1zL4wTkoix+681q7MC/B9VLThibu4L01Pj6ZtNy14=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "9.0.7", - "hash": "sha256-ZgS/4d6hmFtCLWdBL4DtlEFXV84295jWJrgzUPQ1IVI=" + "version": "9.0.10", + "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "9.0.7", - "hash": "sha256-KUsy31YvvO8CTwHoNw4DbBOp+/o2sYscvQL7fvCPUvQ=" + "version": "9.0.10", + "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E=" + }, + { + "pname": "Microsoft.Extensions.Logging.Debug", + "version": "10.0.0", + "hash": "sha256-n/+KRVlsgKm17cJImaoAPHAObHpApW/hf6mMsQFGrvY=" }, { "pname": "Microsoft.Extensions.Logging.TraceSource", - "version": "9.0.7", - "hash": "sha256-CTh9gA1if0ejMNZs/sz8KHCABqtJHCK0/KNqzmFE0YY=" + "version": "9.0.10", + "hash": "sha256-VrOfGKu31ySmSAPq0A+bE+ZfQytKGEe2A8dfKq1idK0=" }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.2", - "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + "version": "10.0.0", + "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA=" }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.0", "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "9.0.1", - "hash": "sha256-wOKd/0+kRK3WrGA2HmS/KNYUTUwXHmTAD5IsClTFA10=" - }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.10", @@ -856,8 +866,13 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.7", - "hash": "sha256-nfUnZxx1tKERUddNNyxhGTK7VDTNZIJGYkiOWSHCt/M=" + "version": "9.0.11", + "hash": "sha256-e7yi+sje07SUUxbZ6+ZjvcFMgUtpLZ8vz1KdPinF310=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "10.0.0", + "hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", @@ -865,9 +880,9 @@ "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ=" }, { - "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "9.0.7", - "hash": "sha256-96ycmW7aMb9i0GFXoLVUlb0cc3IIpYXRJ3Pymz/QJi4=" + "pname": "Microsoft.Extensions.Primitives", + "version": "10.0.0", + "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -881,13 +896,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.1", - "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.10", - "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w=" + "version": "9.0.11", + "hash": "sha256-T1t0dsPVxP0TrmXfPXsA+wZKgS7TecZXvRS261G+KY8=" }, { "pname": "Microsoft.Identity.Client", @@ -970,35 +980,25 @@ "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo=" }, { - "pname": "Microsoft.JSInterop", - "version": "8.0.6", - "hash": "sha256-lKOvph7MvyvGuuNZZGa0ZGcSH87n6vVxUgc9C/rsC3E=" - }, - { - "pname": "Microsoft.JSInterop", - "version": "9.0.1", - "hash": "sha256-eDXtCDVi6LO2MA04ytmmOSVtvpINq0Km84hu6LOBa2A=" + "pname": "Microsoft.NET.Test.Sdk", + "version": "18.0.1", + "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, { "pname": "Microsoft.OpenApi", "version": "1.6.17", "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk=" }, + { + "pname": "Microsoft.OpenApi", + "version": "2.0.0", + "hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k=" + }, { "pname": "Microsoft.SqlServer.Server", "version": "1.0.0", @@ -1009,21 +1009,56 @@ "version": "160.1000.6", "hash": "sha256-XU5s3iwz8JIwIrG5Xe8wZJ8cuCUx7q3fOLYzNHmA9jg=" }, + { + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.9.0", + "hash": "sha256-JT91ThKLEyoRS/8ZJqZwlSTT7ofC2QhNqPFI3pYmMaw=" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.9.0", + "hash": "sha256-oscZOEKw7gM6eRdDrOS3x+CwqIvXWRmfmi0ugCxBRw0=" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.9.0", + "hash": "sha256-CadXLWD093sUDaWhnppzD9LvpxSRqqt93ZEOFiIAPyw=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.9.0", + "hash": "sha256-6nzjoYbJOh7v/GB7d+TDuM0l/xglCshFX6KWjg7+cFI=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.9.0", + "hash": "sha256-/bileP4b+9RZp8yjgS6eynXwc2mohyyzf6p/0LZJd8I=" + }, + { + "pname": "Microsoft.TestPlatform.AdapterUtilities", + "version": "17.13.0", + "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.13.0", + "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "18.0.1", + "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "18.0.1", + "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4=" + }, { "pname": "Microsoft.VisualStudio.Threading.Analyzers", "version": "17.14.15", "hash": "sha256-wv0Hi7pjPYeSwDFyaa8baIOyiUraVfudmVtpm0okoYU=" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" - }, { "pname": "Mono.TextTemplating", "version": "3.0.0", @@ -1031,8 +1066,8 @@ }, { "pname": "MudBlazor", - "version": "8.13.0", - "hash": "sha256-gBVfGt6wHgJmeN0vE0y7Ij+8CAq4aQNI43xiC8S0c6I=" + "version": "8.15.0", + "hash": "sha256-I6kJEvND0i3I/amZBhDF8LjYeGGWuMwoSLiev6BS3UM=" }, { "pname": "MySqlConnector", @@ -1041,18 +1076,18 @@ }, { "pname": "NaturalSort.Extension", - "version": "4.4.0", - "hash": "sha256-zLZLY2ONesj58plElgK00aRq0g+RHgp6f6vGrt6dUtc=" + "version": "4.4.1", + "hash": "sha256-JI3O5aySFcJkQXfhc1IIy3ri9jGboDx7LF6EHYqcUis=" }, { "pname": "NCalc.Core", - "version": "5.7.0", - "hash": "sha256-KjtUpx/2n/mN8iashgosKMZ59vE3V+iLnuj2IcgNWf8=" + "version": "5.8.0", + "hash": "sha256-gLexewkgetT42BHiJv5O62TKMYP/fmJlwmH2fdEyyTk=" }, { "pname": "NCalcSync", - "version": "5.7.0", - "hash": "sha256-C2sUHYUpn4g1vR2Lhi50CFic/QDnU/KJHX2UMf1yGIg=" + "version": "5.8.0", + "hash": "sha256-vq+eXmt1ykzTiyUCF/NHtbLQ+3x0soarZfJH2h6neEM=" }, { "pname": "NETStandard.Library", @@ -1114,6 +1149,26 @@ "version": "9.0.4", "hash": "sha256-jBgcWTQ2Y84rA04OBSzVLzKzYsFC+a1olwbb01wnd0w=" }, + { + "pname": "NSubstitute", + "version": "5.3.0", + "hash": "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0=" + }, + { + "pname": "NUnit", + "version": "4.4.0", + "hash": "sha256-5geF5QOF+X/WkuCEgkPVKH4AdKx4U0olpU07S8+G3nU=" + }, + { + "pname": "NUnit.Analyzers", + "version": "4.11.2", + "hash": "sha256-bVsDWOuTFtZTetikVdqOZ96SP0VV+XF4GPbGEaBgf8A=" + }, + { + "pname": "NUnit3TestAdapter", + "version": "5.2.0", + "hash": "sha256-ybTutL4VkX/fq61mS+O3Ruh+adic4fpv+MKgQ0IZvGg=" + }, { "pname": "Oracle.EntityFrameworkCore", "version": "9.23.90", @@ -1126,8 +1181,8 @@ }, { "pname": "Parlot", - "version": "1.4.0", - "hash": "sha256-4I9+uG+MW5KTxbGFjXoEjsK8/g6m6ZvuqUOohGNk2gE=" + "version": "1.5.2", + "hash": "sha256-gMKHhCNJTqjzZRGfXDTSUkJsqDCMY5TnJge0pAha4pE=" }, { "pname": "Pomelo.EntityFrameworkCore.MySql", @@ -1159,220 +1214,15 @@ "version": "0.4.167.3", "hash": "sha256-ntKXv6NYHYQSrqCIYvYSGrlk5B180wPb9JlCXYdHMp0=" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, { "pname": "Scalar.AspNetCore", - "version": "2.9.0", - "hash": "sha256-6ZGrchehXuV9MoXv6/3yzrJh0q1aHFuOsfIknZM/2uU=" + "version": "2.11.0", + "hash": "sha256-9tJSfcbv2ECnH0ZQb2ovQWsgYzMoVIgSOmctKiQUzp0=" }, { "pname": "Scriban.Signed", - "version": "6.4.0", - "hash": "sha256-DDXaTurUONBBG289NI2IYCyalDDFV9hlJo9McoCrBWQ=" + "version": "6.5.2", + "hash": "sha256-rnhmugQoX+lI0sO+V3KIAsQ9kWs0ow7EpEriQLCYAQw=" }, { "pname": "Serilog", @@ -1389,16 +1239,31 @@ "version": "4.3.0", "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw=" }, + { + "pname": "Serilog.AspNetCore", + "version": "10.0.0", + "hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs=" + }, { "pname": "Serilog.AspNetCore", "version": "9.0.0", "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ=" }, + { + "pname": "Serilog.Extensions.Hosting", + "version": "10.0.0", + "hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU=" + }, { "pname": "Serilog.Extensions.Hosting", "version": "9.0.0", "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw=" }, + { + "pname": "Serilog.Extensions.Logging", + "version": "10.0.0", + "hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE=" + }, { "pname": "Serilog.Extensions.Logging", "version": "9.0.0", @@ -1414,6 +1279,11 @@ "version": "4.0.0", "hash": "sha256-89+SaaXp9Pt8YTkTwVuMV3PzlPMg9mOHiFBKs3oHOUs=" }, + { + "pname": "Serilog.Settings.Configuration", + "version": "10.0.0", + "hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs=" + }, { "pname": "Serilog.Settings.Configuration", "version": "9.0.0", @@ -1424,6 +1294,11 @@ "version": "6.0.0", "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" }, + { + "pname": "Serilog.Sinks.Console", + "version": "6.1.1", + "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY=" + }, { "pname": "Serilog.Sinks.Debug", "version": "3.0.0", @@ -1439,10 +1314,15 @@ "version": "7.0.0", "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, + { + "pname": "Shouldly", + "version": "4.3.0", + "hash": "sha256-7pYi2aGqPIHzyhJelXWRLVCLzBxTiQr0DCTY325q6O8=" + }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.11", - "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA=" + "version": "3.1.12", + "hash": "sha256-FR8v74w4P/1AZdW5ARW0y8zgDqLtvhxQmL1CKv68xR0=" }, { "pname": "SkiaSharp", @@ -1504,21 +1384,6 @@ "version": "2.1.10", "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.ClientModel", "version": "1.5.1", @@ -1534,30 +1399,10 @@ "version": "8.0.0", "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, - { - "pname": "System.Collections.Immutable", - "version": "9.0.7", - "hash": "sha256-OI+/e7BtdXN+0Ef75ueb/NRf3OjFlJy22QXmodeHG60=" - }, { "pname": "System.CommandLine", - "version": "2.0.0-rc.2.25502.107", - "hash": "sha256-aa8dUxLHZxU4bDs1NJ70VhlvwmkxiP/yPHAXaSnT4Uw=" + "version": "2.0.0", + "hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc=" }, { "pname": "System.Composition", @@ -1600,34 +1445,9 @@ "hash": "sha256-hIde8A2EK+RpUSAMZx/xTVMRVeZWyaquVuSKmWbxrgw=" }, { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" - }, - { - "pname": "System.Diagnostics.Contracts", - "version": "4.3.0", - "hash": "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8=" - }, - { - "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.DiagnosticSource", - "version": "4.7.1", - "hash": "sha256-l2TM1pfyRF70Xmzoz1dAqWkB8+/K6b8t5Tj7aF1UO9Y=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + "pname": "System.Diagnostics.EventLog", + "version": "6.0.0", + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, { "pname": "System.Diagnostics.EventLog", @@ -1644,46 +1464,11 @@ "version": "8.0.0", "hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k=" }, - { - "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.DirectoryServices.Protocols", "version": "8.0.2", "hash": "sha256-kfqxVtIqF8b2FcEi9vCWKKEyQNagg7VZqvrp9ylAWxk=" }, - { - "pname": "System.Formats.Asn1", - "version": "8.0.1", - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" - }, - { - "pname": "System.Formats.Asn1", - "version": "9.0.9", - "hash": "sha256-HbbJ0jg+ivuuc/Hbl0DO1k263K/T8qzLjp2EB+H1/B4=" - }, - { - "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.IdentityModel.Tokens.Jwt", "version": "7.7.1", @@ -1695,230 +1480,20 @@ "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" }, { - "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": "7.0.0", - "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" - }, - { - "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.Linq.Queryable", - "version": "4.3.0", - "hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4=" + "pname": "System.Management", + "version": "6.0.1", + "hash": "sha256-g7bjwQv6af0kWiYtpXE8qgr1YMdD6Rf97TbhK5TxQG0=" }, { "pname": "System.Management", "version": "8.0.0", "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" }, - { - "pname": "System.Memory", - "version": "4.5.3", - "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, - { - "pname": "System.Memory", - "version": "4.6.0", - "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" - }, { "pname": "System.Memory.Data", "version": "8.0.1", "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, - { - "pname": "System.Net.Http", - "version": "4.3.0", - "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.7.0", - "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" - }, - { - "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.Emit.Lightweight", - "version": "4.7.0", - "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "7.0.0", - "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", "version": "8.0.1", @@ -1929,11 +1504,6 @@ "version": "9.0.4", "hash": "sha256-dfOvsCYBR2bGGvwm6tthWB8kdNS6bxoMTS/lxL4t1gA=" }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" - }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", @@ -1949,116 +1519,41 @@ "version": "9.0.4", "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA=" }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Json", - "version": "7.0.3", - "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.10", - "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.5", - "hash": "sha256-M5G8EtmsV13O3qNMsAdk4isdKJ/SHfrbRzMhdVsoG2c=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.9", - "hash": "sha256-I+GCgXZZUtgAta94BIBqy72HnZJ3egzNBOTxnVy2Ur8=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.0", - "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Channels", - "version": "7.0.0", - "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" - }, - { - "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": "TagLibSharp", "version": "2.3.0", "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w=" }, + { + "pname": "Testably.Abstractions", + "version": "10.0.0", + "hash": "sha256-2rixQaYGhCM+NjmkxgOBNjJMFcNHr+3TPP+vsRUMj4w=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "10.0.0", + "hash": "sha256-xEDpDTiT1lBFJHoWfJ9htPlwi5nrL5J/QJVj/9Slu48=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "10.0.0-pre.1", + "hash": "sha256-UO/Ly7Qd7AqYOIP52pS1YYoaQgOzzZ5745naHMqULZs=" + }, + { + "pname": "Testably.Abstractions.Interface", + "version": "10.0.0", + "hash": "sha256-3l5VILA3tf1J0CZJSlNn2vK34+grFSl+MTSjBuS16Mg=" + }, + { + "pname": "Testably.Abstractions.Interface", + "version": "10.0.0-pre.1", + "hash": "sha256-Te2+jj1jSleYGEJHlrmj9GYTht62mY14E5WCKDHx4pQ=" + }, + { + "pname": "Testably.Abstractions.Testing", + "version": "5.0.0", + "hash": "sha256-Y5739mTFHJMdJoCFM7FWr668aDOmppWBtt2Oc0I9uPM=" + }, { "pname": "TimeSpanParserUtil", "version": "1.2.0", @@ -2076,8 +1571,8 @@ }, { "pname": "WebMarkupMin.Core", - "version": "2.19.0", - "hash": "sha256-YB7zm1h8/+dlCjNNOYnnyrVMWG9G6KHlFcXvjtbhl6w=" + "version": "2.20.0", + "hash": "sha256-v0CpbncKPK7G7dnS0HQrdm+TXMJKhm8KK4T/eqNEeTI=" }, { "pname": "Winista.MimeDetect", diff --git a/pkgs/by-name/er/ersatztv/package.nix b/pkgs/by-name/er/ersatztv/package.nix index 209b68cd6cfc..ceb96934a0ff 100644 --- a/pkgs/by-name/er/ersatztv/package.nix +++ b/pkgs/by-name/er/ersatztv/package.nix @@ -9,14 +9,20 @@ buildDotnetModule rec { pname = "ersatztv"; - version = "25.8.0"; + version = "25.9.0"; src = fetchFromGitHub { owner = "ErsatzTV"; repo = "ErsatzTV"; rev = "v${version}"; - sha256 = "sha256-FuuX/SxhzzUn7ELJDXJuILkl3ubR3V+5hQwILvZZrFg="; + sha256 = "sha256-+ZMDMKrJN+nX9FeSZ8RTFGRf161Mhpqd7jY9FLZWNqM="; }; + postPatch = '' + # Remove config of development tools that don't end up in + # nuget-deps.json but would be looked up at build time + # leading to a missing package error. + rm -r .config + ''; buildInputs = [ ffmpeg ]; @@ -26,8 +32,8 @@ buildDotnetModule rec { "ErsatzTV.Scanner" ]; nugetDeps = ./nuget-deps.json; - dotnet-sdk = dotnetCorePackages.sdk_9_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; # ETV uses `which` to find `ffmpeg` and `ffprobe` makeWrapperArgs = [ diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index a58ffeca8d03..88cdf44ba5a1 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.11.2"; + version = "2025.11.4"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-nu5sJkihCptZ3KSBE/8xR31yl7gnFQQdT+auLQ2qEw0="; + hash = "sha256-uV5lSlAFHTxIJqkvwRiDWcB2Hw+z+4+phBm2JHld4jA="; }; patches = [ diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 024b3954f487..679c78f5a611 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -22,17 +22,18 @@ sqlite, desktop-file-utils, libxml2, + libsecret, }: stdenv.mkDerivation (finalAttrs: { pname = "euphonica"; - version = "0.96.4-beta"; + version = "0.98.0-beta"; src = fetchFromGitHub { owner = "htkhiem"; repo = "euphonica"; tag = "v${finalAttrs.version}"; - hash = "sha256-iPkqTnC5Gg2hnzQ2Lul5aXF5QhYpHQ1MiilvNiKHFdc="; + hash = "sha256-pLs8aLm2CyT8eVtbB8UQj9xSqnjViRxKjuH3A6RErjA="; fetchSubmodules = true; }; @@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-AISBkWJ0ZZy2HdZCwW6S5DcD09nVJOmglsoevCaD/3g="; + hash = "sha256-w6xZQP8QTTPKQgPCX20IvoWErrgWVisEIJKkxwtQHho="; }; mesonBuildType = "release"; @@ -74,13 +75,17 @@ stdenv.mkDerivation (finalAttrs: { pipewire sqlite libxml2 + libsecret ]; meta = { description = "MPD client with delusions of grandeur, made with Rust, GTK and Libadwaita"; homepage = "https://github.com/htkhiem/euphonica"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ paperdigits ]; + maintainers = with lib.maintainers; [ + paperdigits + aaravrav + ]; mainProgram = "euphonica"; platforms = with lib.platforms; linux; }; diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index 57b71e2b1455..3d1554d752a5 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -120,6 +120,12 @@ stdenv.mkDerivation (finalAttrs: { "-Dmultimedia=disabled" ]; + # Fix build with gcc15 + env.NIX_CFLAGS_COMPILE = toString [ + "-DHAVE_STRING_H" + "-DHAVE_STDLIB_H" + ]; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 0f8f047b1913..9f8739ea741f 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ coffeeispower - lom w-lfchen ]; mainProgram = "eww"; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 5865d889ab06..1001d11f4b14 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 = "2025-11-01"; + version = "2025-12-04"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-MXWP7YOv4JAIKerAGuSeiAiQ98sRU6mZ1ZQSJBPCZQs="; + hash = "sha256-mos58w5rJUNR0MTSOprHMf1wvVkmP+kWQU7YV/ABNNc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix index 2f30630226b5..d99fbdce7473 100644 --- a/pkgs/by-name/ez/ezquake/package.nix +++ b/pkgs/by-name/ez/ezquake/package.nix @@ -68,6 +68,5 @@ stdenv.mkDerivation rec { mainProgram = "ezquake"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix index 2cd29afd8782..a50001e3eeb6 100644 --- a/pkgs/by-name/f2/f2fs-tools/package.nix +++ b/pkgs/by-name/f2/f2fs-tools/package.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { description = "Userland tools for the f2fs filesystem"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - jagajaga - ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index d4f5e8cf688f..21b6adf4c32d 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.336"; + version = "1.4.340"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-E+EryezHZU81KKv/jr/rKDLEYL7yNRHMouAebDMmkTM="; + hash = "sha256-tXT5Xc/izx8tBqj0plvjVLMhpZlGzEIGx2qEPO3xmVM="; }; vendorHash = "sha256-qWaMBhjt20WAIhDcjY4oOFBT+neJiXg0N2WsPasuHSU="; diff --git a/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix b/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix index 123974150d0e..7959c39ed95e 100644 --- a/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix +++ b/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation { description = "Small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; license = licenses.bsd3; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/by-name/fa/fastJson/package.nix b/pkgs/by-name/fa/fastJson/package.nix index 5090cfcb9fc4..0544ab10093a 100644 --- a/pkgs/by-name/fa/fastJson/package.nix +++ b/pkgs/by-name/fa/fastJson/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Fast json library for C"; homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; - maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 4677d48ea5ae..f7cce76e7c7c 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -59,13 +59,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.55.1"; + version = "2.56.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-pHDKVVGKOl9vdPephuClIrsIU0ooJID3M6Hbcm5GSig="; + hash = "sha256-kOI0PUEKmI5hZowEl/VRinjRMDXOP4K12eoFHuIDqOo="; }; outputs = [ diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix index d0e895a6cbaf..874ee15e85d2 100644 --- a/pkgs/by-name/fa/fastmail-desktop/sources.nix +++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-11-29 +# Last updated: 2025-12-06 { fetchurl, fetchzip }: { aarch64-darwin = { - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.5-arm64-mac.zip"; - hash = "sha512-/QozVRmwVxOf97GI6TOoR/pAepSVQn/cVd9jdIi9yoOh82/pHUtHZAiL8K+YmxhjfKGumR9oG7rVbAzgrE+jRg=="; + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.6-arm64-mac.zip"; + hash = "sha512-viKPE0LS4dQQxw9jimEGjAl65uSE7XeAcuoLzq7n4i/BEfNo9QjzOzDMbxhwkGY0Ba92coddwJRXaSdx48fTTw=="; }; }; x86_64-linux = { - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.5.AppImage"; - hash = "sha512-p9g9K6hi4tceNlyAIgdkpc7VITwfSifsUBqXQWqMJU3aLAM5SH0WZcFQmcn94DWoq6e3bx3Z+7lCV1twhVLiyw=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.6.AppImage"; + hash = "sha512-WKMhy7dLoFUqUkevkZAgxgxpz5jD4O9VVaKDYxQs0jXJVt5GUcIHDJ6aZIJG6jyinAC18NzF3vJnOftw8ZWdmg=="; }; }; } diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 74939f65ebd2..620dece38da1 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "faugus-launcher"; - version = "1.10.4"; + version = "1.11.1"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = version; - hash = "sha256-FmbAlvjzUEjKDFEI1O9TJGpKl8/WJaCYUVT75+oG2vc="; + hash = "sha256-FBsk7JfsXRTNFd6htMCNYFurvQtw42k8OIEj+vRyQqU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index 90893c9e6987..9b316df28f77 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -2,26 +2,35 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fblog"; - version = "4.16.0"; + version = "4.17.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fblog"; - rev = "v${version}"; - hash = "sha256-SWwk7qNe2R1aBYGBFqltUZjeOvr4jG1P7/CPIAfHCc8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-SDOYW9CpC7E62nVnZL04Kx9ckVEZyvcMolJCfKDqdMk="; }; - cargoHash = "sha256-du9FXuUNqQm1AMqcCFqeso5OPrPCxzTVl5e7kR0rpwc="; + cargoHash = "sha256-Pn8HsBz+5OHz4jF6xmORLQSLYClTHpaJXWiS5sPyV2w="; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Small command-line JSON log viewer"; mainProgram = "fblog"; homepage = "https://github.com/brocode/fblog"; - license = licenses.wtfpl; - maintainers = [ ]; + changelog = "https://github.com/brocode/fblog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.wtfpl; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index b61a0ce95879..944441e9778e 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-mcbopomofo"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "openvanilla"; repo = "fcitx5-mcbopomofo"; rev = version; - hash = "sha256-2TWJsEScC5rMz5dowJOQHA2Mjzsq+d9n2lKXdEWiELU="; + hash = "sha256-4nJrNAAh7N2hJW/+cKz2pmu004VXAkuw9y0PJ7ktIug="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcron/package.nix b/pkgs/by-name/fc/fcron/package.nix index ccf8fb806c5a..c0c8aa8df2a4 100644 --- a/pkgs/by-name/fc/fcron/package.nix +++ b/pkgs/by-name/fc/fcron/package.nix @@ -6,8 +6,12 @@ stdenv, fetchurl, perl, + buildPackages, busybox, vim, + sendmailProgram ? + if lib.meta.availableOn stdenv.hostPlatform busybox then "${busybox}/sbin/sendmail" else null, + editorProgram ? if lib.meta.availableOn stdenv.hostPlatform vim then "${vim}/bin/vi" else null, }: stdenv.mkDerivation rec { @@ -24,14 +28,17 @@ stdenv.mkDerivation rec { patches = [ ./relative-fcronsighup.patch ]; configureFlags = [ - "--with-sendmail=${busybox}/sbin/sendmail" - "--with-editor=${vim}/bin/vi" # TODO customizable + "--with-sendmail=${if sendmailProgram == null then "no" else sendmailProgram}" + "--with-editor=${if editorProgram == null then "no" else editorProgram}" "--with-bootinstall=no" "--localstatedir=/var" "--sysconfdir=/etc" "--with-rootname=root" "--with-rootgroup=root" "--disable-checks" + ] + ++ lib.optionals (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ + "ac_cv_func_memcmp_working=yes" ]; installTargets = [ "install-staged" ]; # install does also try to change permissions of /etc/* files @@ -48,7 +55,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/* + sed -i 's@/usr/bin/env perl@${lib.getExe buildPackages.perl}@g' configure script/* # Don't let fcron create the group fcron, nix(os) should do this sed -i '2s@.*@exit 0@' script/user-group diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix index edd5776f60c9..f51d7cdcfff9 100644 --- a/pkgs/by-name/fd/fd/package.nix +++ b/pkgs/by-name/fd/fd/package.nix @@ -64,7 +64,6 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ dywedir - globin ma27 zowoq matthiasbeyer diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index 7d1642fa60b8..2a77b79e1d5b 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "fdroidserver"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "fdroid"; repo = "fdroidserver"; tag = version; - hash = "sha256-26D+nnytLOsEAWNj2XvKM2O00epGtvJaJhUw+yoBl9Y="; + hash = "sha256-9gRMjqxYKB/OSu1vn3jtNy1hROCpm8yJptlhkTt2hZw="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 99ef211419ea..2777de880602 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit-feh; maintainers = with maintainers; [ gepbird - globin ]; platforms = platforms.unix; mainProgram = "feh"; diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index 834339f6e076..fe0185a23ccb 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -10,16 +10,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ferron"; - version = "1.3.5"; + version = "2.2.1"; src = fetchFromGitHub { owner = "ferronweb"; repo = "ferron"; tag = finalAttrs.version; - hash = "sha256-bBIhLkh9UV2MJKovQaFk3cC1rYafiyxknRlKWVQ5gwY="; + hash = "sha256-+Esbsr+pqRSRd3M7mFhNl+KVcz3wO5YlZrna8mYsV80="; }; - cargoHash = "sha256-xsJJglSq8hpWWi0zknPL03nle99GxznPI3HON2o8zco="; + # ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md + postPatch = '' + substituteInPlace $cargoDepsCopy/monoio-0.2.4/src/lib.rs \ + --replace-fail '#![doc = include_str!("../../README.md")]' "" + ''; + + cargoHash = "sha256-/F1CqzOKscT/rOsJaY+PwZPMBDxSEoI+zN/GsH5P37k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix index 79055bf30885..2aeb49e18bab 100644 --- a/pkgs/by-name/fe/fetchmail/package.nix +++ b/pkgs/by-name/fe/fetchmail/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - hash = "sha256-ONAf5ATmdRTfOUpu0agVu7YaqQwPpEAiUlk6ztDjih0="; + hash = "sha256-pRCSlewzGeDkXt0AnS2XcEKoMmq1LGqBeoL6mHED5PM="; }; buildInputs = [ diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 62da7dd5f4b8..22c2f199c903 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -95,13 +95,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2511"; + version = "2512"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc="; + hash = "sha256-G61FdzNctTp8jarTcnBXd+MQpMxnPqd33hblvi9UXNo="; leaveDotGit = true; postFetch = '' @@ -192,7 +192,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "USE_LINKER" "lld") (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_THUNKS" true) (lib.cmakeBool "BUILD_FEXCONFIG" withQt) (lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}") @@ -202,8 +201,21 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # Unsupported on non-4K page size kernels (e.g. Apple Silicon) + # Running the tests isn't supported on non-4K pagesize systems, but the build + # itself doesn't require 4K pagesize. So, to avoid breaking the build, enable + # checkPhase by default (so that the check inputs are included) and then + # manually disable it if we're running on a non-4K pagesize system. doCheck = true; + preConfigure = '' + if [ "$(getconf PAGESIZE)" != "4096" ]; then + echo "Disabling checkPhase due to non-4K pagesize environment" + unset doCheck + cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE") + else + echo "Keeping checkPhase as-is" + cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}") + fi + ''; nativeCheckInputs = [ nasm ]; checkInputs = [ catch2_3 ]; diff --git a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix index ccd6ee4a6abb..3dea2e20478d 100644 --- a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix +++ b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { "; homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; license = licenses.gpl2Plus; - maintainers = [ maintainers.jagajaga ]; platforms = platforms.unix; mainProgram = "ffmpegthumbnailer"; }; diff --git a/pkgs/by-name/fi/field-monitor/package.nix b/pkgs/by-name/fi/field-monitor/package.nix new file mode 100644 index 000000000000..7cdfcf1421dd --- /dev/null +++ b/pkgs/by-name/fi/field-monitor/package.nix @@ -0,0 +1,102 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cargo, + meson, + ninja, + rustPlatform, + rustc, + pkg-config, + glib, + gsettings-desktop-schemas, + gtk4, + libadwaita, + libvirt, + gst_all_1, + desktop-file-utils, + appstream, + appstream-glib, + wrapGAppsHook4, + xdg-desktop-portal, + blueprint-compiler, + libxml2, + spice-protocol, + spice-gtk, + vte-gtk4, + gtk-vnc, + usbredir, + libepoxy, + libGL, + openssl, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "field-monitor"; + version = "49.1"; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "theCapypara"; + repo = "field-monitor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vtRubZwIQRV3ySFwdPgZ1Eyxh32FPsAvissxjrV3JcE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-zBCt/ptxAQ3TAzklmjbajQZ4Ou1+xlvH/k74yW34t9g="; + }; + + mesonBuildType = "release"; + + nativeBuildInputs = [ + appstream + appstream-glib + blueprint-compiler + cargo + desktop-file-utils + libxml2 + meson + ninja + pkg-config + rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk-vnc + gtk4 + libadwaita + libepoxy + libGL + libvirt + openssl + spice-gtk + spice-protocol + usbredir + vte-gtk4 + xdg-desktop-portal + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); + + postInstall = '' + wrapProgram $out/bin/de.capypara.FieldMonitor --prefix PATH ':' "$out/libexec" + ''; + + meta = { + description = "Viewer for virtual machines and other external screens"; + homepage = "https://github.com/theCapypara/field-monitor"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ theCapypara ]; + platforms = lib.platforms.linux; + mainProgram = "de.capypara.FieldMonitor"; + }; +}) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 39b6028d6161..8b33239cdf1f 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.156"; + version = "2.15.159"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-sVvo0LAdcJvxCSOdmjB2BiFxXscIn3d7yiZrcb7FVI8="; + hash = "sha256-dQFeHDMvK0NC+JCDxYc//0NYeixy+VILPqeCNd1vOjc="; }; - vendorHash = "sha256-gEoes1Q3ARAC2Fz0H9clNT/0LQ5RCfpLrQljgsMhOhA="; + vendorHash = "sha256-feVFjCJzSkmtjk5TWW4Kq29xejH3DCSjHOd88aXmwtc="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/findnewest/package.nix b/pkgs/by-name/fi/findnewest/package.nix index 78a46d1bde26..bffe16b4c7c8 100644 --- a/pkgs/by-name/fi/findnewest/package.nix +++ b/pkgs/by-name/fi/findnewest/package.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { description = "Recursively find newest file in a hierarchy and print its timestamp"; mainProgram = "fn"; license = licenses.bsd2; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 1c50809aad03..3da867a7df19 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -42,9 +42,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Findomain/Findomain"; changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - Br1ght0ne - ]; + maintainers = [ ]; mainProgram = "findomain"; }; } diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 73fd930c97d0..8ffa990e2bc8 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.26.0"; + version = "14.27.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-rtLjvD7HYqc2acteeBZEnFqMkAK3f5/5X8hgwPVMv+k="; + hash = "sha256-mkHZtC3W8ueB0cB4fVSAY5DID2QEdv+2ZmkhsVTunEc="; }; - npmDepsHash = "sha256-BqMXNV0sSfy+hitq4Ngv1OrYgC/vyqZCG39S0HMJh4o="; + npmDepsHash = "sha256-XDaFdYbowygMiM0BX1ggfWt1JXHaLOaZ2Npztip7CAU="; # No more package-lock.json in upstream src postPatch = '' diff --git a/pkgs/by-name/fi/fixjson/package.nix b/pkgs/by-name/fi/fixjson/package.nix index 37623c8bcc4f..5b95ac6a8e6a 100644 --- a/pkgs/by-name/fi/fixjson/package.nix +++ b/pkgs/by-name/fi/fixjson/package.nix @@ -2,21 +2,24 @@ lib, buildNpmPackage, fetchFromGitHub, + nix-update-script, }: buildNpmPackage { pname = "fixjson"; - version = "1.1.2-unstable-2021-01-05"; + version = "0-unstable-2023-01-06"; src = fetchFromGitHub { owner = "rhysd"; repo = "fixjson"; # Upstream has no tagged releases, but this commit bumps version - rev = "d0483f9cc59896ea59bb16f906f770562d332000"; - hash = "sha256-Mu7ho0t5GzFYuBK6FEXhpsaRxn9HF3lnvMxRpg0aqYI="; + rev = "c49f27a0268fca69021fa8aafc9bbef9960f82e9"; + hash = "sha256-Hse2EBppeEBoMQjRI97MNYWlRDpoOMhkZ/nbhpFgH5c="; }; - npmDepsHash = "sha256-tnsgNtMdnrKYxcYy9+4tgp1BX+o8e5/HUDeSP5BOvUQ="; + npmDepsHash = "sha256-mreSdJxFjSaz3kNoFC5ZSlBENA2sOLmsxS0VKW4o0z4="; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "JSON Fixer for Humans using (relaxed) JSON5"; diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 2c5fd85acacb..6d1d12177c3d 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-elHpiMGwJ2KnN75EOTjsjpziYfXiRyTeixhY4rd85m0="; + hash = "sha256-/hwcRsaVdLvjKnCjFzy4T/zdvWjWAMBtfgJX/cNpmOc="; }; - cargoHash = "sha256-QS38tAJ1V0Avd7N+Mhexv23oh+kxtmr/qvQZLRwP9zA="; + cargoHash = "sha256-5pK0l84L4cEhw5d8n8j6JWEXEbsmWHmHJxB5ZMrnAU0="; meta = with lib; { description = "Health checks for your Nix flakes"; diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index 1bc4d62518e2..d3497603a161 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -25,19 +25,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-GW7v5ZsVPqQ+hZLOB0A/wVbOQHA9OgGCfeSONCNPKhk="; + hash = "sha256-mmw1g1MG1oNGYmQOsnLZgdMFuZSiWehZ7ltPrQxQLys="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-CGgoHL6dDovBe1W04A8fOH5EnkqezPuiO8f7/ZCgjAM="; + hash = "sha256-m1IlDGCelklgXNCm0nsDczuUUMM+A6TyWkQiOo/JVVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flarum/composer.lock b/pkgs/by-name/fl/flarum/composer.lock index d7a951493415..1f360cc2ef3a 100644 --- a/pkgs/by-name/fl/flarum/composer.lock +++ b/pkgs/by-name/fl/flarum/composer.lock @@ -61,25 +61,25 @@ }, { "name": "brick/math", - "version": "0.12.1", + "version": "0.14.1", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "f510c0a40911935b77b86859eb5223d58d660df1" + "reference": "f05858549e5f9d7bb45875a75583240a38a281d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1", - "reference": "f510c0a40911935b77b86859eb5223d58d660df1", + "url": "https://api.github.com/repos/brick/math/zipball/f05858549e5f9d7bb45875a75583240a38a281d0", + "reference": "f05858549e5f9d7bb45875a75583240a38a281d0", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^8.2" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^10.1", - "vimeo/psalm": "5.16.0" + "phpstan/phpstan": "2.1.22", + "phpunit/phpunit": "^11.5" }, "type": "library", "autoload": { @@ -109,7 +109,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.12.1" + "source": "https://github.com/brick/math/tree/0.14.1" }, "funding": [ { @@ -117,7 +117,7 @@ "type": "github" } ], - "time": "2023-11-29T23:19:16+00:00" + "time": "2025-11-24T14:40:29+00:00" }, { "name": "carbonphp/carbon-doctrine-types", @@ -205,12 +205,12 @@ "type": "component", "extra": { "component": { - "styles": [ - "css/all.css" - ], "files": [ "css/all.min.css", "webfonts/*" + ], + "styles": [ + "css/all.css" ] } }, @@ -304,16 +304,16 @@ }, { "name": "dflydev/fig-cookies", - "version": "v3.1.0", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/dflydev/dflydev-fig-cookies.git", - "reference": "ebe6c15c9895fc490efe620ad734c8ef4a85bdb0" + "reference": "f9c63878e75483800477db4f897237b36556617b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-fig-cookies/zipball/ebe6c15c9895fc490efe620ad734c8ef4a85bdb0", - "reference": "ebe6c15c9895fc490efe620ad734c8ef4a85bdb0", + "url": "https://api.github.com/repos/dflydev/dflydev-fig-cookies/zipball/f9c63878e75483800477db4f897237b36556617b", + "reference": "f9c63878e75483800477db4f897237b36556617b", "shasum": "" }, "require": { @@ -360,9 +360,9 @@ ], "support": { "issues": "https://github.com/dflydev/dflydev-fig-cookies/issues", - "source": "https://github.com/dflydev/dflydev-fig-cookies/tree/v3.1.0" + "source": "https://github.com/dflydev/dflydev-fig-cookies/tree/v3.2.0" }, - "time": "2023-07-18T20:41:43+00:00" + "time": "2025-09-03T20:01:04+00:00" }, { "name": "doctrine/cache", @@ -455,6 +455,7 @@ "type": "tidelift" } ], + "abandoned": true, "time": "2022-05-20T20:07:39+00:00" }, { @@ -568,29 +569,30 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.3", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, + "conflict": { + "phpunit/phpunit": "<=7.5 || >=13" + }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "doctrine/coding-standard": "^9 || ^12 || ^13", + "phpstan/phpstan": "1.4.10 || 2.1.11", + "phpstan/phpstan-phpunit": "^1.0 || ^2", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -598,7 +600,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -609,9 +611,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + "source": "https://github.com/doctrine/deprecations/tree/1.1.5" }, - "time": "2024-01-30T19:34:25+00:00" + "time": "2025-04-07T20:06:18+00:00" }, { "name": "doctrine/event-manager", @@ -707,33 +709,32 @@ }, { "name": "doctrine/inflector", - "version": "2.0.10", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" + "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", - "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b", + "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^11.0", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "^8.5 || ^9.5", - "vimeo/psalm": "^4.25 || ^5.4" + "doctrine/coding-standard": "^12.0 || ^13.0", + "phpstan/phpstan": "^1.12 || ^2.0", + "phpstan/phpstan-phpunit": "^1.4 || ^2.0", + "phpstan/phpstan-strict-rules": "^1.6 || ^2.0", + "phpunit/phpunit": "^8.5 || ^12.2" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + "Doctrine\\Inflector\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -778,7 +779,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.10" + "source": "https://github.com/doctrine/inflector/tree/2.1.0" }, "funding": [ { @@ -794,7 +795,7 @@ "type": "tidelift" } ], - "time": "2024-02-18T20:23:39+00:00" + "time": "2025-08-10T19:31:58+00:00" }, { "name": "doctrine/lexer", @@ -874,29 +875,28 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.4.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "8c784d071debd117328803d86b2097615b457500" + "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", - "reference": "8c784d071debd117328803d86b2097615b457500", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013", + "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013", "shasum": "" }, "require": { - "php": "^7.2|^8.0", - "webmozart/assert": "^1.0" + "php": "^8.2|^8.3|^8.4|^8.5" }, "replace": { "mtdowling/cron-expression": "^1.0" }, "require-dev": { - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0" + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^1.12.32|^2.1.31", + "phpunit/phpunit": "^8.5.48|^9.0" }, "type": "library", "extra": { @@ -927,7 +927,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0" }, "funding": [ { @@ -935,7 +935,7 @@ "type": "github" } ], - "time": "2024-10-09T13:47:03+00:00" + "time": "2025-10-31T18:51:33+00:00" }, { "name": "egulias/email-validator", @@ -1063,16 +1063,16 @@ }, { "name": "filp/whoops", - "version": "2.16.0", + "version": "2.18.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", - "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", + "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d", + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d", "shasum": "" }, "require": { @@ -1122,7 +1122,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.16.0" + "source": "https://github.com/filp/whoops/tree/2.18.4" }, "funding": [ { @@ -1130,7 +1130,7 @@ "type": "github" } ], - "time": "2024-09-25T12:00:00+00:00" + "time": "2025-08-08T12:00:00+00:00" }, { "name": "flarum/approval", @@ -1155,34 +1155,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Approval", - "category": "feature", "icon": { "name": "fas fa-check", - "backgroundColor": "#ABDC88", - "color": "#3F8A32" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#3F8A32", + "backgroundColor": "#ABDC88" + }, + "title": "Approval", + "category": "feature" } }, "autoload": { @@ -1231,34 +1231,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": false, + "css": false, + "admin": false, + "forum": false, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": false, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": false, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "BBCode", - "category": "feature", "icon": { "name": "fas fa-bold", - "backgroundColor": "#238C59", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": false, - "forum": false, - "js": false, - "jsCommon": false, - "css": false, - "gitConf": true, - "githubActions": false, - "prettier": false, - "typescript": false, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#238C59" + }, + "title": "BBCode", + "category": "feature" } }, "autoload": { @@ -1290,16 +1290,16 @@ }, { "name": "flarum/core", - "version": "v1.8.9", + "version": "v1.8.11", "source": { "type": "git", "url": "https://github.com/flarum/flarum-core.git", - "reference": "c09efebdcfb4cdc396bee0efafa0a81946fc813f" + "reference": "ee319329968aa7ce9ca7be6153887abe77a84c80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/flarum/flarum-core/zipball/c09efebdcfb4cdc396bee0efafa0a81946fc813f", - "reference": "c09efebdcfb4cdc396bee0efafa0a81946fc813f", + "url": "https://api.github.com/repos/flarum/flarum-core/zipball/ee319329968aa7ce9ca7be6153887abe77a84c80", + "reference": "ee319329968aa7ce9ca7be6153887abe77a84c80", "shasum": "" }, "require": { @@ -1360,30 +1360,30 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.x-dev" - }, "flarum-cli": { - "excludeScaffolding": [ - "LICENSE.md", - "js/tsconfig.json", - "js/webpack.config.js" - ], "modules": { - "backendTesting": true, "js": true, + "css": true, + "admin": true, + "forum": true, "gitConf": true, - "githubActions": true, + "styleci": true, + "jsCommon": true, "prettier": true, "typescript": true, "bundlewatch": true, "editorConfig": true, - "styleci": true, - "admin": true, - "forum": true, - "jsCommon": true, - "css": true - } + "githubActions": true, + "backendTesting": true + }, + "excludeScaffolding": [ + "LICENSE.md", + "js/tsconfig.json", + "js/webpack.config.js" + ] + }, + "branch-alias": { + "dev-main": "1.x-dev" } }, "autoload": { @@ -1432,7 +1432,7 @@ "type": "other" } ], - "time": "2024-11-20T13:51:54+00:00" + "time": "2025-10-08T17:57:23+00:00" }, { "name": "flarum/emoji", @@ -1453,33 +1453,33 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": false, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Emoji", - "category": "feature", "icon": { "image": "icon.svg", "backgroundColor": "#FECC4D" - } - }, - "flarum-cli": { - "modules": { - "admin": false, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + }, + "title": "Emoji", + "category": "feature" } }, "notification-url": "https://packagist.org/downloads/", @@ -1528,34 +1528,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": true, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Flags", - "category": "feature", "icon": { "name": "fas fa-flag", - "backgroundColor": "#D659B5", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": true, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#D659B5" + }, + "title": "Flags", + "category": "feature" } }, "autoload": { @@ -1604,44 +1604,44 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": false, + "css": false, + "admin": false, + "forum": false, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": false, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": false, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, - "flarum-extension": { - "title": "English", - "category": "language", - "info": { - "donate": "https://flarum.org/donate/", - "website": "https://flarum.org", - "support": "https://discuss.flarum.org" - }, - "icon": { - "image": "icon.svg", - "backgroundColor": "#00247d", - "backgroundSize": "cover", - "backgroundPosition": "center" - } - }, "flarum-locale": { "code": "en", "title": "English" }, - "flarum-cli": { - "modules": { - "admin": false, - "forum": false, - "js": false, - "jsCommon": false, - "css": false, - "gitConf": true, - "githubActions": false, - "prettier": false, - "typescript": false, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + "flarum-extension": { + "icon": { + "image": "icon.svg", + "backgroundSize": "cover", + "backgroundColor": "#00247d", + "backgroundPosition": "center" + }, + "info": { + "donate": "https://flarum.org/donate/", + "support": "https://discuss.flarum.org", + "website": "https://flarum.org" + }, + "title": "English", + "category": "language" } }, "notification-url": "https://packagist.org/downloads/", @@ -1689,34 +1689,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Likes", - "category": "feature", "icon": { "name": "far fa-thumbs-up", - "backgroundColor": "#3A649D", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#3A649D" + }, + "title": "Likes", + "category": "feature" } }, "autoload": { @@ -1765,34 +1765,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Lock", - "category": "feature", "icon": { "name": "fas fa-lock", - "backgroundColor": "#ddd", - "color": "#666" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + "color": "#666", + "backgroundColor": "#ddd" + }, + "title": "Lock", + "category": "feature" } }, "autoload": { @@ -1841,37 +1841,37 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": false, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Markdown", - "category": "feature", "icon": { + "color": "#fff", "image": "icon.svg", - "backgroundColor": "#000", "backgroundSize": "100%", + "backgroundColor": "#000", "backgroundRepeat": "no-repeat", - "backgroundPosition": "center", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": false, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + "backgroundPosition": "center" + }, + "title": "Markdown", + "category": "feature" } }, "notification-url": "https://packagist.org/downloads/", @@ -1920,37 +1920,37 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { + "icon": { + "name": "fas fa-at", + "color": "#fff", + "backgroundColor": "#539EC1" + }, "title": "Mentions", "category": "feature", "optional-dependencies": [ "flarum/tags" - ], - "icon": { - "name": "fas fa-at", - "backgroundColor": "#539EC1", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + ] } }, "autoload": { @@ -2003,34 +2003,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": false, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Nicknames", - "category": "feature", "icon": { "name": "fas fa-user-tag", - "backgroundColor": "#8E4529", - "color": "#ffffff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": false, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#ffffff", + "backgroundColor": "#8E4529" + }, + "title": "Nicknames", + "category": "feature" } }, "autoload": { @@ -2083,37 +2083,37 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": true, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": false + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Pusher", - "category": "feature", "icon": { + "color": "#fff", "image": "icon.png", "backgroundSize": "46% 63%", - "backgroundPosition": "center", - "backgroundRepeat": "no-repeat", "backgroundColor": "#40bad8", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": true, - "bundlewatch": false, - "backendTesting": false, - "editorConfig": true, - "styleci": true - } + "backgroundRepeat": "no-repeat", + "backgroundPosition": "center" + }, + "title": "Pusher", + "category": "feature" } }, "autoload": { @@ -2165,37 +2165,37 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": false, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": true, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + }, + "excludeScaffolding": [ + "js/src/admin/index.ts" + ] + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Statistics", - "category": "feature", "icon": { "name": "fas fa-chart-bar", - "backgroundColor": "#6932d1", - "color": "#fff" - } - }, - "flarum-cli": { - "excludeScaffolding": [ - "js/src/admin/index.ts" - ], - "modules": { - "admin": true, - "forum": false, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": true, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#6932d1" + }, + "title": "Statistics", + "category": "feature" } }, "autoload": { @@ -2248,34 +2248,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Sticky", - "category": "feature", "icon": { "name": "fas fa-thumbtack", - "backgroundColor": "#D13E32", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#D13E32" + }, + "title": "Sticky", + "category": "feature" } }, "autoload": { @@ -2328,37 +2328,37 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": false, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { + "icon": { + "name": "fas fa-star", + "color": "#de8e00", + "backgroundColor": "#ffea7b" + }, "title": "Subscriptions", "category": "feature", "optional-dependencies": [ "flarum/approval" - ], - "icon": { - "name": "fas fa-star", - "backgroundColor": "#ffea7b", - "color": "#de8e00" - } - }, - "flarum-cli": { - "modules": { - "admin": false, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + ] } }, "autoload": { @@ -2410,34 +2410,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": false, + "prettier": true, + "typescript": false, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Suspend", - "category": "feature", "icon": { "name": "fas fa-ban", - "backgroundColor": "#ddd", - "color": "#666" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": false, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": true, - "typescript": false, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#666", + "backgroundColor": "#ddd" + }, + "title": "Suspend", + "category": "feature" } }, "autoload": { @@ -2469,16 +2469,16 @@ }, { "name": "flarum/tags", - "version": "v1.8.3", + "version": "v1.8.5", "source": { "type": "git", "url": "https://github.com/flarum/tags.git", - "reference": "1baea940d1504da46805e64575ae336e5da6b43c" + "reference": "1f8bcd261da7c3d4967785a5836ab641ad1ac991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/flarum/tags/zipball/1baea940d1504da46805e64575ae336e5da6b43c", - "reference": "1baea940d1504da46805e64575ae336e5da6b43c", + "url": "https://api.github.com/repos/flarum/tags/zipball/1f8bcd261da7c3d4967785a5836ab641ad1ac991", + "reference": "1f8bcd261da7c3d4967785a5836ab641ad1ac991", "shasum": "" }, "require": { @@ -2490,34 +2490,34 @@ }, "type": "flarum-extension", "extra": { + "flarum-cli": { + "modules": { + "js": true, + "css": true, + "admin": true, + "forum": true, + "gitConf": true, + "styleci": true, + "jsCommon": true, + "prettier": false, + "typescript": true, + "bundlewatch": false, + "editorConfig": true, + "githubActions": true, + "backendTesting": true + } + }, "branch-alias": { "dev-main": "1.x-dev" }, "flarum-extension": { - "title": "Tags", - "category": "feature", "icon": { "name": "fas fa-tags", - "backgroundColor": "#F28326", - "color": "#fff" - } - }, - "flarum-cli": { - "modules": { - "admin": true, - "forum": true, - "js": true, - "jsCommon": true, - "css": true, - "gitConf": true, - "githubActions": true, - "prettier": false, - "typescript": true, - "bundlewatch": false, - "backendTesting": true, - "editorConfig": true, - "styleci": true - } + "color": "#fff", + "backgroundColor": "#F28326" + }, + "title": "Tags", + "category": "feature" } }, "autoload": { @@ -2545,7 +2545,7 @@ "type": "website" } ], - "time": "2024-11-20T08:51:17+00:00" + "time": "2025-10-03T11:14:51+00:00" }, { "name": "franzl/whoops-middleware", @@ -2593,22 +2593,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.2", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.3", - "guzzlehttp/psr7": "^2.7.0", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2699,7 +2699,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.2" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -2715,20 +2715,20 @@ "type": "tidelift" } ], - "time": "2024-07-24T11:22:20+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.4", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { @@ -2736,7 +2736,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", "extra": { @@ -2782,7 +2782,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.4" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -2798,20 +2798,20 @@ "type": "tidelift" } ], - "time": "2024-10-17T10:06:22+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -2827,7 +2827,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2898,7 +2898,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.0" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -2914,7 +2914,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T11:15:46+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "illuminate/bus", @@ -4120,16 +4120,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.3.0", + "version": "v1.3.6", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "be155e11613fa618aa18aee438955588d1092a47" + "reference": "61f2ef1ad2d0ae922c265931cb0a8032a1ed2813" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/be155e11613fa618aa18aee438955588d1092a47", - "reference": "be155e11613fa618aa18aee438955588d1092a47", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/61f2ef1ad2d0ae922c265931cb0a8032a1ed2813", + "reference": "61f2ef1ad2d0ae922c265931cb0a8032a1ed2813", "shasum": "" }, "require": { @@ -4166,9 +4166,9 @@ ], "support": { "issues": "https://github.com/JayBizzle/Crawler-Detect/issues", - "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.3.0" + "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.3.6" }, - "time": "2024-11-25T19:38:36+00:00" + "time": "2025-09-30T16:22:43+00:00" }, { "name": "jenssegers/agent", @@ -4198,16 +4198,16 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - }, "laravel": { - "providers": [ - "Jenssegers\\Agent\\AgentServiceProvider" - ], "aliases": { "Agent": "Jenssegers\\Agent\\Facades\\Agent" - } + }, + "providers": [ + "Jenssegers\\Agent\\AgentServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "3.0-dev" } }, "autoload": { @@ -4255,20 +4255,20 @@ }, { "name": "laminas/laminas-diactoros", - "version": "3.5.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "143a16306602ce56b8b092a7914fef03c37f9ed2" + "reference": "60c182916b2749480895601649563970f3f12ec4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/143a16306602ce56b8b092a7914fef03c37f9ed2", - "reference": "143a16306602ce56b8b092a7914fef03c37f9ed2", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/60c182916b2749480895601649563970f3f12ec4", + "reference": "60c182916b2749480895601649563970f3f12ec4", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "psr/http-factory": "^1.1", "psr/http-message": "^1.1 || ^2.0" }, @@ -4285,17 +4285,17 @@ "ext-gd": "*", "ext-libxml": "*", "http-interop/http-factory-tests": "^2.2.0", - "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-coding-standard": "~3.1.0", "php-http/psr7-integration-tests": "^1.4.0", "phpunit/phpunit": "^10.5.36", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.26.1" + "psalm/plugin-phpunit": "^0.19.5", + "vimeo/psalm": "^6.13" }, "type": "library", "extra": { "laminas": { - "config-provider": "Laminas\\Diactoros\\ConfigProvider", - "module": "Laminas\\Diactoros" + "module": "Laminas\\Diactoros", + "config-provider": "Laminas\\Diactoros\\ConfigProvider" } }, "autoload": { @@ -4339,37 +4339,36 @@ "type": "community_bridge" } ], - "time": "2024-10-14T11:59:49+00:00" + "time": "2025-10-12T15:31:36+00:00" }, { "name": "laminas/laminas-escaper", - "version": "2.14.0", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "0f7cb975f4443cf22f33408925c231225cfba8cb" + "reference": "06f211dfffff18d91844c1f55250d5d13c007e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/0f7cb975f4443cf22f33408925c231225cfba8cb", - "reference": "0f7cb975f4443cf22f33408925c231225cfba8cb", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/06f211dfffff18d91844c1f55250d5d13c007e18", + "reference": "06f211dfffff18d91844c1f55250d5d13c007e18", "shasum": "" }, "require": { "ext-ctype": "*", "ext-mbstring": "*", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" }, "conflict": { "zendframework/zend-escaper": "*" }, "require-dev": { - "infection/infection": "^0.27.9", - "laminas/laminas-coding-standard": "~3.0.0", - "maglnet/composer-require-checker": "^3.8.0", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.21.1" + "infection/infection": "^0.31.0", + "laminas/laminas-coding-standard": "~3.1.0", + "phpunit/phpunit": "^11.5.42", + "psalm/plugin-phpunit": "^0.19.5", + "vimeo/psalm": "^6.13.1" }, "type": "library", "autoload": { @@ -4401,34 +4400,34 @@ "type": "community_bridge" } ], - "time": "2024-10-24T10:12:53+00:00" + "time": "2025-10-14T18:31:13+00:00" }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.11.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "c428d9f67f280d155637cbe2b7245b5188c8cdae" + "reference": "181eaeeb838ad3d80fbbcfb0657a46bc212bbd4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/c428d9f67f280d155637cbe2b7245b5188c8cdae", - "reference": "c428d9f67f280d155637cbe2b7245b5188c8cdae", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/181eaeeb838ad3d80fbbcfb0657a46bc212bbd4e", + "reference": "181eaeeb838ad3d80fbbcfb0657a46bc212bbd4e", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~3.0.0", - "laminas/laminas-diactoros": "^3.4.0", - "phpunit/phpunit": "^10.5.36", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.26.1" + "laminas/laminas-coding-standard": "~3.1.0", + "laminas/laminas-diactoros": "^3.6.0", + "phpunit/phpunit": "^10.5.46", + "psalm/plugin-phpunit": "^0.19.5", + "vimeo/psalm": "^6.10.3" }, "type": "library", "extra": { @@ -4468,26 +4467,26 @@ "type": "community_bridge" } ], - "time": "2024-10-17T20:37:17+00:00" + "time": "2025-10-12T20:58:29+00:00" }, { "name": "laminas/laminas-stratigility", - "version": "4.1.0", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stratigility.git", - "reference": "79f9302a19ef33d114d85656347b0880933cc210" + "reference": "3413771ac42d096a108236f2790bba6803df8a27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stratigility/zipball/79f9302a19ef33d114d85656347b0880933cc210", - "reference": "79f9302a19ef33d114d85656347b0880933cc210", + "url": "https://api.github.com/repos/laminas/laminas-stratigility/zipball/3413771ac42d096a108236f2790bba6803df8a27", + "reference": "3413771ac42d096a108236f2790bba6803df8a27", "shasum": "" }, "require": { "fig/http-message-util": "^1.1", "laminas/laminas-escaper": "^2.10.0", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "psr/http-factory": "^1.0.2", "psr/http-message": "^1.0 || ^2.0", "psr/http-server-middleware": "^1.0.2" @@ -4496,11 +4495,11 @@ "zendframework/zend-stratigility": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~3.0.0", - "laminas/laminas-diactoros": "^2.25 || ^3.5.0", - "phpunit/phpunit": "^10.5.37", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.26.1" + "laminas/laminas-coding-standard": "~3.1.0", + "laminas/laminas-diactoros": "^2.25 || ^3.8.0", + "phpunit/phpunit": "^11.5.42", + "psalm/plugin-phpunit": "^0.19.5", + "vimeo/psalm": "^6.13.1" }, "suggest": { "psr/http-factory-implementation": "Please install a psr/http-factory implementation to consume Stratigility; e.g., laminas/laminas-diactoros", @@ -4546,7 +4545,7 @@ "type": "community_bridge" } ], - "time": "2024-10-28T11:43:51+00:00" + "time": "2025-10-14T20:48:06+00:00" }, { "name": "laravel/serializable-closure", @@ -4611,16 +4610,16 @@ }, { "name": "league/commonmark", - "version": "2.5.3", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0" + "reference": "4efa10c1e56488e658d10adf7b7b7dcd19940bfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/4efa10c1e56488e658d10adf7b7b7dcd19940bfb", + "reference": "4efa10c1e56488e658d10adf7b7b7dcd19940bfb", "shasum": "" }, "require": { @@ -4645,10 +4644,11 @@ "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0 || ^7.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", + "symfony/finder": "^5.3 | ^6.0 | ^7.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", - "vimeo/psalm": "^4.24.0 || ^5.0.0" + "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0" }, "suggest": { "symfony/yaml": "v2.3+ required if using the Front Matter extension" @@ -4656,7 +4656,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.9-dev" } }, "autoload": { @@ -4713,7 +4713,7 @@ "type": "tidelift" } ], - "time": "2024-08-16T11:46:16+00:00" + "time": "2025-11-26T21:48:24+00:00" }, { "name": "league/config", @@ -4949,16 +4949,16 @@ }, { "name": "matthiasmullie/minify", - "version": "1.3.73", + "version": "1.3.75", "source": { "type": "git", "url": "https://github.com/matthiasmullie/minify.git", - "reference": "cb7a9297b4ab070909cefade30ee95054d4ae87a" + "reference": "76ba4a5f555fd7bf4aa408af608e991569076671" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/cb7a9297b4ab070909cefade30ee95054d4ae87a", - "reference": "cb7a9297b4ab070909cefade30ee95054d4ae87a", + "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/76ba4a5f555fd7bf4aa408af608e991569076671", + "reference": "76ba4a5f555fd7bf4aa408af608e991569076671", "shasum": "" }, "require": { @@ -4969,8 +4969,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": ">=2.0", "matthiasmullie/scrapbook": ">=1.3", - "phpunit/phpunit": ">=4.8", - "squizlabs/php_codesniffer": ">=3.0" + "phpunit/phpunit": ">=4.8" }, "suggest": { "psr/cache-implementation": "Cache implementation to use with Minify::cache" @@ -5008,7 +5007,7 @@ ], "support": { "issues": "https://github.com/matthiasmullie/minify/issues", - "source": "https://github.com/matthiasmullie/minify/tree/1.3.73" + "source": "https://github.com/matthiasmullie/minify/tree/1.3.75" }, "funding": [ { @@ -5016,7 +5015,7 @@ "type": "github" } ], - "time": "2024-03-15T10:27:10+00:00" + "time": "2025-06-25T09:56:19+00:00" }, { "name": "matthiasmullie/path-converter", @@ -5073,30 +5072,30 @@ }, { "name": "middlewares/base-path", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/middlewares/base-path.git", - "reference": "9540b7b3aea29f22be269ad4c182455e70e38b4a" + "reference": "243ad6a6435cc74e221d81867d1110853ebf6321" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/base-path/zipball/9540b7b3aea29f22be269ad4c182455e70e38b4a", - "reference": "9540b7b3aea29f22be269ad4c182455e70e38b4a", + "url": "https://api.github.com/repos/middlewares/base-path/zipball/243ad6a6435cc74e221d81867d1110853ebf6321", + "reference": "243ad6a6435cc74e221d81867d1110853ebf6321", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "psr/http-server-middleware": "^1.0" + "psr/http-server-middleware": "^1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "laminas/laminas-diactoros": "^2.3", - "middlewares/utils": "^3.0", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9", - "squizlabs/php_codesniffer": "^3.0" + "friendsofphp/php-cs-fixer": "^3", + "laminas/laminas-diactoros": "^2 || ^3", + "middlewares/utils": "^2 || ^3 || ^4", + "oscarotero/php-cs-fixer-config": "^2", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": "^3" }, "type": "library", "autoload": { @@ -5119,36 +5118,36 @@ ], "support": { "issues": "https://github.com/middlewares/base-path/issues", - "source": "https://github.com/middlewares/base-path/tree/v2.1.0" + "source": "https://github.com/middlewares/base-path/tree/v2.2.0" }, - "time": "2021-04-08T19:21:21+00:00" + "time": "2025-03-23T10:15:15+00:00" }, { "name": "middlewares/base-path-router", - "version": "v2.0.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/middlewares/base-path-router.git", - "reference": "36e3860cfd917ad51d10e238f82796c8b2504908" + "reference": "0f93a817c659084f9d8b70809d24e43b498ac502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/base-path-router/zipball/36e3860cfd917ad51d10e238f82796c8b2504908", - "reference": "36e3860cfd917ad51d10e238f82796c8b2504908", + "url": "https://api.github.com/repos/middlewares/base-path-router/zipball/0f93a817c659084f9d8b70809d24e43b498ac502", + "reference": "0f93a817c659084f9d8b70809d24e43b498ac502", "shasum": "" }, "require": { - "middlewares/utils": "^3.0", + "middlewares/utils": "^2 || ^3 || ^4", "php": "^7.2 || ^8.0", - "psr/http-server-middleware": "^1.0" + "psr/http-server-middleware": "^1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "laminas/laminas-diactoros": "^2.3", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9", - "squizlabs/php_codesniffer": "^3.0" + "friendsofphp/php-cs-fixer": "^3", + "laminas/laminas-diactoros": "^2 || ^3", + "oscarotero/php-cs-fixer-config": "^2", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": "^3" }, "type": "library", "autoload": { @@ -5172,37 +5171,37 @@ ], "support": { "issues": "https://github.com/middlewares/base-path-router/issues", - "source": "https://github.com/middlewares/base-path-router/tree/v2.0.1" + "source": "https://github.com/middlewares/base-path-router/tree/v2.1.0" }, - "time": "2020-12-02T00:05:22+00:00" + "time": "2025-03-22T13:12:28+00:00" }, { "name": "middlewares/request-handler", - "version": "v2.0.2", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/middlewares/request-handler.git", - "reference": "f07840434347520c11959caa54ab3476e16ceee2" + "reference": "732bc798d9ae11c2703b870ccd098030fb609c3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/request-handler/zipball/f07840434347520c11959caa54ab3476e16ceee2", - "reference": "f07840434347520c11959caa54ab3476e16ceee2", + "url": "https://api.github.com/repos/middlewares/request-handler/zipball/732bc798d9ae11c2703b870ccd098030fb609c3b", + "reference": "732bc798d9ae11c2703b870ccd098030fb609c3b", "shasum": "" }, "require": { - "middlewares/utils": "^3.0", + "middlewares/utils": "^2 || ^3 || ^4", "php": "^7.2 || ^8.0", "psr/container": "^1.0||^2.0", - "psr/http-server-middleware": "^1.0" + "psr/http-server-middleware": "^1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "laminas/laminas-diactoros": "^2.3", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9", - "squizlabs/php_codesniffer": "^3.0" + "friendsofphp/php-cs-fixer": "^3", + "laminas/laminas-diactoros": "^2 || ^3", + "oscarotero/php-cs-fixer-config": "^2", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": "^3" }, "type": "library", "autoload": { @@ -5229,9 +5228,9 @@ ], "support": { "issues": "https://github.com/middlewares/request-handler/issues", - "source": "https://github.com/middlewares/request-handler/tree/v2.0.2" + "source": "https://github.com/middlewares/request-handler/tree/v2.1.0" }, - "time": "2022-05-09T13:49:03+00:00" + "time": "2025-03-23T18:04:48+00:00" }, { "name": "middlewares/utils", @@ -5445,16 +5444,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.5", + "version": "2.73.0", "source": { "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed" + "url": "https://github.com/CarbonPHP/carbon.git", + "reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed", - "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/9228ce90e1035ff2f0db84b40ec2e023ed802075", + "reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075", "shasum": "" }, "require": { @@ -5474,7 +5473,7 @@ "doctrine/orm": "^2.7 || ^3.0", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", - "ondrejmirtes/better-reflection": "*", + "ondrejmirtes/better-reflection": "<6", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.99 || ^1.7.14", @@ -5487,10 +5486,6 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.x-dev", - "dev-2.x": "2.x-dev" - }, "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -5500,6 +5495,10 @@ "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-2.x": "2.x-dev", + "dev-master": "3.x-dev" } }, "autoload": { @@ -5548,29 +5547,29 @@ "type": "tidelift" } ], - "time": "2024-06-03T19:18:41+00:00" + "time": "2025-01-08T20:10:23+00:00" }, { "name": "nette/schema", - "version": "v1.3.2", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "da801d52f0354f70a638673c4a0f04e16529431d" + "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d", - "reference": "da801d52f0354f70a638673c4a0f04e16529431d", + "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004", + "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.4" + "php": "8.1 - 8.5" }, "require-dev": { "nette/tester": "^2.5.2", - "phpstan/phpstan-nette": "^1.0", + "phpstan/phpstan-nette": "^2.0@stable", "tracy/tracy": "^2.8" }, "type": "library", @@ -5580,6 +5579,9 @@ } }, "autoload": { + "psr-4": { + "Nette\\": "src" + }, "classmap": [ "src/" ] @@ -5608,35 +5610,35 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.2" + "source": "https://github.com/nette/schema/tree/v1.3.3" }, - "time": "2024-10-06T23:10:23+00:00" + "time": "2025-10-30T22:57:59+00:00" }, { "name": "nette/utils", - "version": "v4.0.5", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96" + "reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", - "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", + "url": "https://api.github.com/repos/nette/utils/zipball/fa1f0b8261ed150447979eb22e373b7b7ad5a8e0", + "reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0", "shasum": "" }, "require": { - "php": "8.0 - 8.4" + "php": "8.2 - 8.5" }, "conflict": { "nette/finder": "<3", "nette/schema": "<1.2.2" }, "require-dev": { - "jetbrains/phpstorm-attributes": "dev-master", + "jetbrains/phpstorm-attributes": "^1.2", "nette/tester": "^2.5", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan-nette": "^2.0@stable", "tracy/tracy": "^2.9" }, "suggest": { @@ -5650,10 +5652,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { + "psr-4": { + "Nette\\": "src" + }, "classmap": [ "src/" ] @@ -5694,9 +5699,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.5" + "source": "https://github.com/nette/utils/tree/v4.1.0" }, - "time": "2024-08-07T15:39:19+00:00" + "time": "2025-12-01T17:49:23+00:00" }, { "name": "nikic/fast-route", @@ -5747,16 +5752,16 @@ }, { "name": "opis/closure", - "version": "3.6.3", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad" + "reference": "b1a22a6be71c1263f3ca6e68f00b3fd4d394abc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad", + "url": "https://api.github.com/repos/opis/closure/zipball/b1a22a6be71c1263f3ca6e68f00b3fd4d394abc4", + "reference": "b1a22a6be71c1263f3ca6e68f00b3fd4d394abc4", "shasum": "" }, "require": { @@ -5806,9 +5811,9 @@ ], "support": { "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.3" + "source": "https://github.com/opis/closure/tree/3.7.0" }, - "time": "2022-01-27T09:35:39+00:00" + "time": "2025-07-08T20:30:08+00:00" }, { "name": "psr/clock", @@ -6424,16 +6429,16 @@ }, { "name": "ramsey/collection", - "version": "2.0.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", - "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2", + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2", "shasum": "" }, "require": { @@ -6441,25 +6446,22 @@ }, "require-dev": { "captainhook/plugin-composer": "^5.3", - "ergebnis/composer-normalize": "^2.28.3", - "fakerphp/faker": "^1.21", + "ergebnis/composer-normalize": "^2.45", + "fakerphp/faker": "^1.24", "hamcrest/hamcrest-php": "^2.0", - "jangregor/phpstan-prophecy": "^1.0", - "mockery/mockery": "^1.5", + "jangregor/phpstan-prophecy": "^2.1", + "mockery/mockery": "^1.6", "php-parallel-lint/php-console-highlighter": "^1.0", - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpcsstandards/phpcsutils": "^1.0.0-rc1", - "phpspec/prophecy-phpunit": "^2.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-mockery": "^1.1", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5", - "psalm/plugin-mockery": "^1.1", - "psalm/plugin-phpunit": "^0.18.4", - "ramsey/coding-standard": "^2.0.3", - "ramsey/conventional-commits": "^1.3", - "vimeo/psalm": "^5.4" + "php-parallel-lint/php-parallel-lint": "^1.4", + "phpspec/prophecy-phpunit": "^2.3", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-mockery": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^10.5", + "ramsey/coding-standard": "^2.3", + "ramsey/conventional-commits": "^1.6", + "roave/security-advisories": "dev-latest" }, "type": "library", "extra": { @@ -6497,37 +6499,26 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/2.0.0" + "source": "https://github.com/ramsey/collection/tree/2.1.1" }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ramsey/collection", - "type": "tidelift" - } - ], - "time": "2022-12-31T21:50:55+00:00" + "time": "2025-03-22T05:38:12+00:00" }, { "name": "ramsey/uuid", - "version": "4.7.6", + "version": "4.9.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "91039bc1faa45ba123c4328958e620d382ec7088" + "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088", - "reference": "91039bc1faa45ba123c4328958e620d382ec7088", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440", + "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12", - "ext-json": "*", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" }, @@ -6535,26 +6526,23 @@ "rhumsaa/uuid": "self.version" }, "require-dev": { - "captainhook/captainhook": "^5.10", + "captainhook/captainhook": "^5.25", "captainhook/plugin-composer": "^5.3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.8", - "ergebnis/composer-normalize": "^2.15", - "mockery/mockery": "^1.3", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "ergebnis/composer-normalize": "^2.47", + "mockery/mockery": "^1.6", "paragonie/random-lib": "^2", - "php-mock/php-mock": "^2.2", - "php-mock/php-mock-mockery": "^1.3", - "php-parallel-lint/php-parallel-lint": "^1.1", - "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-mockery": "^1.1", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5 || ^9", - "ramsey/composer-repl": "^1.4", - "slevomat/coding-standard": "^8.4", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.9" + "php-mock/php-mock": "^2.6", + "php-mock/php-mock-mockery": "^1.5", + "php-parallel-lint/php-parallel-lint": "^1.4.0", + "phpbench/phpbench": "^1.2.14", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-mockery": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^9.6", + "slevomat/coding-standard": "^8.18", + "squizlabs/php_codesniffer": "^3.13" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", @@ -6589,19 +6577,9 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.6" + "source": "https://github.com/ramsey/uuid/tree/4.9.1" }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid", - "type": "tidelift" - } - ], - "time": "2024-04-27T21:32:50+00:00" + "time": "2025-09-04T20:59:21+00:00" }, { "name": "s9e/regexp-builder", @@ -7293,16 +7271,16 @@ }, { "name": "symfony/css-selector", - "version": "v7.1.6", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66" + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", - "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135", + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135", "shasum": "" }, "require": { @@ -7338,7 +7316,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.1.6" + "source": "https://github.com/symfony/css-selector/tree/v7.4.0" }, "funding": [ { @@ -7349,25 +7327,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-10-30T13:39:42+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { @@ -7375,12 +7357,12 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.6-dev" } }, "autoload": { @@ -7405,7 +7387,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -7421,7 +7403,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/event-dispatcher", @@ -7510,16 +7492,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" + "reference": "59eb412e93815df44f05f342958efa9f46b1e586" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", + "reference": "59eb412e93815df44f05f342958efa9f46b1e586", "shasum": "" }, "require": { @@ -7528,12 +7510,12 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.6-dev" } }, "autoload": { @@ -7566,7 +7548,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" }, "funding": [ { @@ -7582,20 +7564,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", "shasum": "" }, "require": { @@ -7632,7 +7614,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.13" + "source": "https://github.com/symfony/filesystem/tree/v6.4.24" }, "funding": [ { @@ -7643,12 +7625,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/finder", @@ -7715,16 +7701,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.48", + "version": "v5.4.50", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3f38b8af283b830e1363acd79e5bc3412d055341" + "reference": "1a0706e8b8041046052ea2695eb8aeee04f97609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3f38b8af283b830e1363acd79e5bc3412d055341", - "reference": "3f38b8af283b830e1363acd79e5bc3412d055341", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1a0706e8b8041046052ea2695eb8aeee04f97609", + "reference": "1a0706e8b8041046052ea2695eb8aeee04f97609", "shasum": "" }, "require": { @@ -7771,7 +7757,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.48" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.50" }, "funding": [ { @@ -7782,12 +7768,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-13T18:58:02+00:00" + "time": "2025-11-03T12:58:48+00:00" }, { "name": "symfony/mime", @@ -7876,7 +7866,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -7900,8 +7890,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -7935,7 +7925,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -7946,6 +7936,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7955,16 +7949,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956" + "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956", - "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/5f3b930437ae03ae5dff61269024d8ea1b3774aa", + "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa", "shasum": "" }, "require": { @@ -7979,8 +7973,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8015,7 +8009,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.33.0" }, "funding": [ { @@ -8026,25 +8020,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-09-17T14:58:18+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -8056,8 +8054,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8093,7 +8091,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -8104,25 +8102,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3", + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3", "shasum": "" }, "require": { @@ -8135,8 +8137,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8176,7 +8178,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0" }, "funding": [ { @@ -8187,16 +8189,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-09-10T14:38:51+00:00" }, { "name": "symfony/polyfill-intl-messageformatter", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-messageformatter.git", @@ -8217,8 +8223,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8257,7 +8263,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-messageformatter/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-messageformatter/tree/v1.33.0" }, "funding": [ { @@ -8268,6 +8274,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -8277,7 +8287,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -8298,8 +8308,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8338,7 +8348,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -8349,6 +8359,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -8358,19 +8372,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -8382,8 +8397,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8418,7 +8433,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -8429,16 +8444,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -8456,8 +8475,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8494,7 +8513,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.33.0" }, "funding": [ { @@ -8505,6 +8524,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -8514,16 +8537,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", "shasum": "" }, "require": { @@ -8532,8 +8555,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8574,7 +8597,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" }, "funding": [ { @@ -8585,16 +8608,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-01-02T08:10:11+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -8612,8 +8639,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -8650,7 +8677,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" }, "funding": [ { @@ -8661,6 +8688,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -8732,16 +8763,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.5.1", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43", + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43", "shasum": "" }, "require": { @@ -8754,12 +8785,12 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.6-dev" } }, "autoload": { @@ -8795,7 +8826,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.6.1" }, "funding": [ { @@ -8806,25 +8837,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-07-15T11:30:57+00:00" }, { "name": "symfony/string", - "version": "v6.4.15", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" + "reference": "5621f039a71a11c87c106c1c598bdcd04a19aeea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "url": "https://api.github.com/repos/symfony/string/zipball/5621f039a71a11c87c106c1c598bdcd04a19aeea", + "reference": "5621f039a71a11c87c106c1c598bdcd04a19aeea", "shasum": "" }, "require": { @@ -8838,7 +8873,6 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", "symfony/http-client": "^5.4|^6.0|^7.0", "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", @@ -8881,7 +8915,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.15" + "source": "https://github.com/symfony/string/tree/v6.4.26" }, "funding": [ { @@ -8892,12 +8926,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-13T13:31:12+00:00" + "time": "2025-09-11T14:32:46+00:00" }, { "name": "symfony/translation", @@ -9018,12 +9056,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -9151,31 +9189,33 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "v2.2.7", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb" + "reference": "0d72ac1c00084279c1816675284073c5a337c20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d", + "reference": "0d72ac1c00084279c1816675284073c5a337c20d", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0 || ^8.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "php": "^7.4 || ^8.0", + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10" + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -9198,9 +9238,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0" }, - "time": "2023-12-08T13:03:43+00:00" + "time": "2024-12-21T16:25:41+00:00" }, { "name": "voku/portable-ascii", @@ -9276,64 +9316,6 @@ ], "time": "2022-01-24T18:55:24+00:00" }, - { - "name": "webmozart/assert", - "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "php": "^7.2 || ^8.0" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" - }, - "time": "2022-06-03T18:03:27+00:00" - }, { "name": "wikimedia/less.php", "version": "v3.2.1", diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix index 0043123e347b..bca506f0ccc0 100644 --- a/pkgs/by-name/fl/flarum/package.nix +++ b/pkgs/by-name/fl/flarum/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { composerLock = ./composer.lock; composerStrictValidation = false; - vendorHash = "sha256-4wB8MRnqnruo9VXupMmAqiRSZx8F2i+8zcOphTeDp1g="; + vendorHash = "sha256-peQMR7+Jx+oXo0HdXOHzTYB9Fn0AkELm43fiV4ssLnI="; meta = with lib; { changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md"; diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix similarity index 77% rename from pkgs/data/icons/flat-remix-icon-theme/default.nix rename to pkgs/by-name/fl/flat-remix-icon-theme/package.nix index ad9d166a5a6b..18f55e5cbda9 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -3,21 +3,21 @@ stdenvNoCC, fetchFromGitHub, gtk3, - breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "flat-remix-icon-theme"; version = "20240201"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; - rev = version; - sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; + tag = finalAttrs.version; + hash = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme @@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation rec { recordPropagatedDependencies ''; - meta = with lib; { + meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with licenses; [ gpl3Only ]; + license = with lib.licenses; [ gpl3Only ]; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 17588bf77ae8..d0de637eee4c 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,21 @@ { - "version": "12.7.0", + "version": "12.8.3", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.7.0/floorp-linux-aarch64.tar.xz", - "sha256": "d66d9d978902e22dc0c312e1f267e0f2537c8b0427857acb75532ef07b095c9d" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-linux-aarch64.tar.xz", + "sha256": "853acf48337d439de99bc29f3a29f20299de948d58c85de6f99ced2b78a2a83d" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.7.0/floorp-linux-x86_64.tar.xz", - "sha256": "8e97cbac7090cc3734eb63ce23e69495a0080dc881c6123b1b3b18bc7b6def62" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-linux-x86_64.tar.xz", + "sha256": "0e6642c8584fdcde953d347739eb87cab2e6bdc7d46571de2ec9ff4d3bbe235d" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.7.0/floorp-macOS-universal.dmg", - "sha256": "fce34267d614417ff2d672214dbc8e3c9577fa9898eecbac5fb3c98bc72bda70" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-macOS-universal.dmg", + "sha256": "a4718b942d63a3355f31f25a59059a67b7f99b5041f3ea9d63243dd3600c0c77" }, "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.7.0/floorp-macOS-universal.dmg", - "sha256": "fce34267d614417ff2d672214dbc8e3c9577fa9898eecbac5fb3c98bc72bda70" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-macOS-universal.dmg", + "sha256": "a4718b942d63a3355f31f25a59059a67b7f99b5041f3ea9d63243dd3600c0c77" } } } diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 61d88c37e69d..b9fedb2941ef 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; tag = "v${finalAttrs.version}"; - hash = "sha256-mu6WPp4jUAnLpZzFwy8HoKosCiYPxejsKEEnBRKodr4="; + hash = "sha256-/38eKwKEmDGJfZxcsnqrcb7OZoNxWgc+R+t3SRqktZY="; }; # The source build documentation covers some dependencies and CMake options. diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index 67ef54973f04..0be3bfad9be4 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "fna3d"; - version = "25.11"; + version = "25.12"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = version; fetchSubmodules = true; - hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk="; + hash = "sha256-nrCBW3UypXUYAt7Ccr3w64QikmN/Vg5TSlQ19/g+anM="; }; cmakeFlags = [ diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 121c3ece070d..5f3a114d3bc8 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -38,6 +38,10 @@ let # These tests rely on outbound IP address "TestHandler" "TestHandler_gcCache" + ] + ++ lib.optionals stdenv.isDarwin [ + # Uses docker-specific options, unsupported on Darwin + "TestMergeJobOptions" ]; in buildGoModule rec { @@ -92,8 +96,6 @@ buildGoModule rec { }; meta = with lib; { - # Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin' - broken = stdenv.hostPlatform.isDarwin; description = "Runner for Forgejo based on act"; homepage = "https://code.forgejo.org/forgejo/runner"; changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}"; @@ -103,6 +105,7 @@ buildGoModule rec { emilylange christoph-heiss tebriel + nrabulinski ]; mainProgram = "forgejo-runner"; }; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 4bcef84d11e2..5268e3ce2a5e 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -168,5 +168,9 @@ buildNpmPackage (finalAttrs: { ]; platforms = lib.platforms.linux; mainProgram = "pangolin"; + insecure = true; + knownVulnerabilities = [ + "CVE-2025-55182" + ]; }; }) diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index e69621c6d8af..4b87c0ecaa00 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-7AWugaSK9JFkWPKjjtgTZZ37rXUYYco2XXY4JEA7sSk="; + hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18="; }; - vendorHash = "sha256-87jMUtFy/BNUqsfzqyFtk3EB5i71O2zeFYvErV+HBAA="; + vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8="; ldflags = [ "-s" diff --git a/pkgs/by-name/fr/freedv/no-framework.patch b/pkgs/by-name/fr/freedv/no-framework.patch index 01bb31e00bf5..cf31c17b1d48 100644 --- a/pkgs/by-name/fr/freedv/no-framework.patch +++ b/pkgs/by-name/fr/freedv/no-framework.patch @@ -6,8 +6,8 @@ index 38b3b262..3be9bfee 100644 TARGET FreeDV POST_BUILD COMMAND rm -rf dist_tmp FreeDV.dmg || true -- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} -+ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src +- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} -s `dirname ${CLANG_SANITIZER_FILE}` ++ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}` COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index b558288d28d7..67c0ea5413d7 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -2,10 +2,13 @@ lib, stdenv, fetchFromGitHub, + cacert, + autoconf, + automake, + libtool, cmake, pkg-config, python3, - libopus, macdylibbundler, makeWrapper, darwin, @@ -18,7 +21,6 @@ speexdsp, hamlib_4, wxGTK32, - sioclient, dbus, apple-sdk_15, nix-update-script, @@ -37,22 +39,36 @@ let tag = "v2.2.4"; hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o="; }; + opusSrc = fetchFromGitHub { + owner = "xiph"; + repo = "opus"; + rev = "940d4e5af64351ca8ba8390df3f555484c567fbb"; + postFetch = '' + cd $out + export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + export SSL_CERT_FILE=$NIX_SSL_CERT_FILE + dnn/download_model.sh "4ed9445b96698bad25d852e912b41495ddfa30c8dbc8a55f9cde5826ed793453" + substituteInPlace autogen.sh \ + --replace-fail 'dnn/download_model.sh "4ed9445b96698bad25d852e912b41495ddfa30c8dbc8a55f9cde5826ed793453"' "" + ''; + hash = "sha256-P84gjnuiQQBVBExJBY3sUbwo00lXY6HB+AMpx/oovRg="; + }; radaeSrc = fetchFromGitHub { owner = "drowe67"; repo = "radae"; - rev = "2354cd2a4b3af60c7feb1c0d6b3d6dd7417c2ac9"; - hash = "sha256-yEr/OCXV83qXi89QHXMrUtQ2UwNOsijQMN35Or2JP+Y="; + rev = "0f26661b26d02e6963353dce7ad1bbe3f4791ab2"; + hash = "sha256-0pCH+oyVChWdOL5o6Uhb9DDSw4AqCfcsEKw2SZs3K4w="; }; in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-awWeq0ueKAK+4mAM0Nv3SsSv/mIFQ+/TqCPw9wjed1w="; + hash = "sha256-3nLO0UHoIjPN5liz3XJ7r9/Qo+a64ewqvzWPZuFG2SY="; }; patches = [ @@ -64,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: { cp -R ${mimallocSrc} mimalloc cp -R ${radaeSrc} radae chmod -R u+w ebur128 mimalloc radae - substituteInPlace radae/cmake/BuildOpus.cmake \ - --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \ - --replace-fail "./autogen.sh && " "" substituteInPlace cmake/BuildEbur128.cmake \ --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \ --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \ @@ -75,8 +88,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \ --replace-fail "GIT_TAG v2.2.4" "" substituteInPlace cmake/BuildRADE.cmake \ + --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \ - --replace-fail "GIT_TAG main" "" + --replace-fail "GIT_TAG ms-disable-python-gc" "" patchShebangs test/test_*.sh substituteInPlace cmake/CheckGit.cmake \ --replace-fail "git describe --abbrev=4 --always HEAD" "echo v${finalAttrs.version}" @@ -90,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ + autoconf + automake + libtool cmake pkg-config python3 @@ -115,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: { speexdsp hamlib_4 wxGTK32 - sioclient python3.pkgs.numpy ] ++ ( diff --git a/pkgs/by-name/fr/freefilesync/Makefile.patch b/pkgs/by-name/fr/freefilesync/Makefile.patch index 41e5617028fc..7e2a3db10590 100644 --- a/pkgs/by-name/fr/freefilesync/Makefile.patch +++ b/pkgs/by-name/fr/freefilesync/Makefile.patch @@ -9,15 +9,13 @@ index 9d81055..aed0f30 100644 CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` -lidn2 - CXXFLAGS += `pkg-config --cflags libssh2` +@@ -21,8 +21,9 @@ CXXFLAGS += `pkg-config --cflags libssh2` LDFLAGS += `pkg-config --libs libssh2` --CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+CXXFLAGS += `pkg-config --cflags gtk+-3.0` + CXXFLAGS += `pkg-config --cflags gtk+-3.0` +LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --CXXFLAGS += -isystem/usr/include/gtk-2.0 +-CXXFLAGS += -isystem/usr/include/gtk-3.0 +CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0 #support for SELinux (optional) @@ -33,15 +31,13 @@ index 0be46c9..f510284 100644 CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zen - LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread +@@ -9,8 +9,9 @@ LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread --CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+CXXFLAGS += `pkg-config --cflags gtk+-3.0` + CXXFLAGS += `pkg-config --cflags gtk+-3.0` +LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --CXXFLAGS += -isystem/usr/include/gtk-2.0 +-CXXFLAGS += -isystem/usr/include/gtk-3.0 +CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0 cppFiles= diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index f9ec4d5035f0..e374524bc8e5 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "14.5"; + version = "14.6"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f "$out" tryDownload "$url" "$out" ''; - hash = "sha256-+qfj1zf3V5xxtvXgCa0QDDRhEPQ3Qzii5eKiMySuUUY="; + hash = "sha256-OST2QIhPhKl9Qh4nHIno5XAJmLPNki0bU5A1ZXcUVTw="; }; sourceRoot = "."; @@ -60,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + touch zen/warn_static.h + ''; + nativeBuildInputs = [ copyDesktopItems pkg-config diff --git a/pkgs/by-name/fr/freetts/package.nix b/pkgs/by-name/fr/freetts/package.nix index 3d7c810ad7ab..5e644b86d33a 100644 --- a/pkgs/by-name/fr/freetts/package.nix +++ b/pkgs/by-name/fr/freetts/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://freetts.sourceforge.net"; license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ sander ]; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # jsapi.jar is bundled in a self-extracting shell-script diff --git a/pkgs/by-name/fr/froide-govplan/package.nix b/pkgs/by-name/fr/froide-govplan/package.nix index 4a2a802fd4d2..d4cb32d884b1 100644 --- a/pkgs/by-name/fr/froide-govplan/package.nix +++ b/pkgs/by-name/fr/froide-govplan/package.nix @@ -12,12 +12,7 @@ gettext, }: let - python = python3Packages.python.override { - packageOverrides = self: super: { - django_5 = super.django_5.override { withGdal = true; }; - django = super.django_5; - }; - }; + inherit (froide) python; in python.pkgs.buildPythonApplication rec { pname = "froide-govplan"; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index d80d15e03bd2..33102d00db7e 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -191,6 +191,10 @@ python.pkgs.buildPythonApplication rec { # Playwright tests not supported on RiscV yet doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers; + passthru = { + inherit python; + }; + meta = { description = "Freedom of Information Portal"; homepage = "https://github.com/okfde/froide"; diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 74f9021d1c26..82ee82d47d6b 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -39,6 +39,5 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/fatedier/frp"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ Br1ght0ne ]; }; }) diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index a950a00c56c7..f1af67e2aaa8 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-6TKCasE+Cks/f716mtEnPOvjcbQ7weipbGfFwnBYXJk="; + sha256 = "sha256-S9WlDpa9Qe3GVVC/L5KAyekH1NegdDttJ6HH5rwI6Dk="; }; - cargoHash = "sha256-2DmfbQWyU+1vNKxZvDw92Rh5rxFifeKEglZSV2YNfdA="; + cargoHash = "sha256-q7FBKzVH2EtP2PjrU8bvQTrzvMZ0T+Cgk7o+lpyuTPc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec { mit ]; maintainers = with maintainers; [ - Br1ght0ne matthiasbeyer ]; mainProgram = "fselect"; diff --git a/pkgs/by-name/fs/fsuae-launcher/package.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix index 7e756e0bc240..016638cee84e 100644 --- a/pkgs/by-name/fs/fsuae-launcher/package.nix +++ b/pkgs/by-name/fs/fsuae-launcher/package.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical front-end for the FS-UAE emulator"; license = lib.licenses.gpl2Plus; mainProgram = "fs-uae-launcher"; - maintainers = with lib.maintainers; [ - sander - ]; platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux; }; }) diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 8a5772ab4e6a..cdba3ec955da 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "sigstore"; repo = "fulcio"; tag = "v${version}"; - hash = "sha256-yAaMXlcGU1JXGMr2nkUHAWkd2JAlprPbKxs1MKvU6iM="; + hash = "sha256-yR8Q1ksz1fB8sc8NA6Hr4dwe5VXerEgIQYiIpNTOEf8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-xOM92evfKrjFhPPny1kIVK5uxZkLJZ+qyJ15/4HpsN0="; + vendorHash = "sha256-G+vtNCm9Ecpj5IzxXojzcjGEQL47R5gNMFI/JCs7C0w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fu/fusuma/Gemfile.lock b/pkgs/by-name/fu/fusuma/Gemfile.lock index 8b4fe181b2ec..42f8ab1955d8 100644 --- a/pkgs/by-name/fu/fusuma/Gemfile.lock +++ b/pkgs/by-name/fu/fusuma/Gemfile.lock @@ -1,24 +1,24 @@ GEM remote: https://rubygems.org/ specs: - fusuma (3.7.0) - fusuma-plugin-appmatcher (0.7.1) + fusuma (3.9.0) + fusuma-plugin-appmatcher (0.8.0) fusuma (>= 3.0) rexml ruby-dbus fusuma-plugin-keypress (0.11.0) fusuma (>= 3.1) - fusuma-plugin-sendkey (0.10.1) + fusuma-plugin-sendkey (0.14.0) fusuma (>= 3.1) revdev - fusuma-plugin-wmctrl (1.3.1) + fusuma-plugin-wmctrl (1.4.2) fusuma (>= 3.1) + logger (1.7.0) revdev (0.2.1) - rexml (3.2.8) - strscan (>= 3.0.9) - ruby-dbus (0.23.1) + rexml (3.4.1) + ruby-dbus (0.25.0) + logger rexml - strscan (3.1.0) PLATFORMS ruby @@ -31,4 +31,4 @@ DEPENDENCIES fusuma-plugin-wmctrl BUNDLED WITH - 2.5.9 + 2.6.6 diff --git a/pkgs/by-name/fu/fusuma/gemset.nix b/pkgs/by-name/fu/fusuma/gemset.nix index 4361532705fc..1dd415916093 100644 --- a/pkgs/by-name/fu/fusuma/gemset.nix +++ b/pkgs/by-name/fu/fusuma/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h8lj3g5q6cg6lf5axnbw4bpvml3xkf3ipbviw5mg1jh9r3apk5m"; + sha256 = "13kkqwd268haxap05282cizqrc7py4cn5r5mxk3z88qz950c8n02"; type = "gem"; }; - version = "3.7.0"; + version = "3.9.0"; }; fusuma-plugin-appmatcher = { dependencies = [ @@ -19,10 +19,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cj3d1yz3jdxmapgk8wv5ra57nyb278x2fjxdllc0gqdfih6pxhq"; + sha256 = "120imyw1ir7c94g4j16anfv4c61y4qmy9xj5rg75mypz97nq8xp7"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; fusuma-plugin-keypress = { dependencies = [ "fusuma" ]; @@ -44,10 +44,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rdpxq4nanw85x1djdanwnz46b19fr46kdlkkgbxa4dnjk0zx4pp"; + sha256 = "1gy0gz2kyavfvq4sfqvybzaah8hiajfzi2mlcizv2n834vy9lwhj"; type = "gem"; }; - version = "0.10.1"; + version = "0.14.0"; }; fusuma-plugin-wmctrl = { dependencies = [ "fusuma" ]; @@ -55,10 +55,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rgz1d6ahg5i9sr4z2kab5qk7pm3rm0h7r1vwkygi75rv2r3jy86"; + sha256 = "0v2g5a6qpzn7w2g0812qi3pxm0ilpb5wj00ivxfnflh74yyf69wi"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; }; revdev = { groups = [ "default" ]; @@ -71,35 +81,27 @@ version = "0.2.1"; }; rexml = { - dependencies = [ "strscan" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.8"; + version = "3.4.1"; }; ruby-dbus = { - dependencies = [ "rexml" ]; + dependencies = [ + "logger" + "rexml" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hf9y5lbi1xcadc2fw87wlif75s1359c2wwlvvd0gag7cq5dm0pm"; + sha256 = "0528x9jm3frq3r10ilf1fkhsy3m5w2gkr93pa5xcixv1daliqhzy"; type = "gem"; }; - version = "0.23.1"; - }; - strscan = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; + version = "0.25.0"; }; } diff --git a/pkgs/by-name/fu/fusuma/package.nix b/pkgs/by-name/fu/fusuma/package.nix index e43f5b7f0ca0..c6fa7961e736 100644 --- a/pkgs/by-name/fu/fusuma/package.nix +++ b/pkgs/by-name/fu/fusuma/package.nix @@ -7,7 +7,7 @@ libinput, }: -bundlerApp { +bundlerApp rec { pname = "fusuma"; gemdir = ./.; exes = [ "fusuma" ]; @@ -24,7 +24,7 @@ bundlerApp { } ''; - passthru.updateScript = bundlerUpdateScript "fusuma"; + passthru.updateScript = bundlerUpdateScript pname; meta = with lib; { description = "Multitouch gestures with libinput driver on X11, Linux"; @@ -32,7 +32,6 @@ bundlerApp { license = licenses.mit; maintainers = with maintainers; [ nicknovitski - Br1ght0ne ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 7a7911d600ae..ad81782efa2e 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -85,7 +85,6 @@ buildGoModule rec { homepage = "https://github.com/junegunn/fzf"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne ma27 zowoq ]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 3171d0d56e19..d9584ad0d204 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -49,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.17"; + version = "3.16.18"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-eKAOlmU0wc1DViZkUSrPFVjypa/kGfe+1+0lkXbaVJI="; + hash = "sha256-/5n1ZpZYg2KzlON7cgde96sTCO/jvvmr0AkWYF8IBGU="; }; patches = [ diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix index 0efaabed05d7..3ec2fc9fab2d 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-BcRVmVA5pnFzpg2gN/nKLzENnoEdwrE0EgulDizq8Ok="; + hash = "sha256-3842mgKcsa0FIAFdClVorYFKWODiQJm7ytw2bkJ1WG4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock index 92541abddcb8..cbd98fee0539 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock @@ -2,16 +2,21 @@ # yarn lockfile v1 -"@telegraf/types@^6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@telegraf/types/-/types-6.9.1.tgz#ee2d335164f582db55337d77cc440c1faeadd510" - integrity sha512-bzqwhicZq401T0e09tu8b1KvGfJObPmzKU/iKCT5V466AsAZZWQrBYQ5edbmD1VZuHLEwopoOVY5wPP4HaLtug== +"@telegraf/types@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@telegraf/types/-/types-7.1.0.tgz#d8bd9b2f5070b4de46971416e890338cd89fc23d" + integrity sha512-kGevOIbpMcIlCDeorKGpwZmdH7kHbqlk/Yj6dEpJMKEQw5lk0KVQY0OLXaCswy8GqlIVLd5625OB+rAntP9xVw== "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@types/trusted-types@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -33,14 +38,16 @@ acorn-globals@^7.0.0: acorn-walk "^8.0.2" acorn-walk@^8.0.2: - version "8.3.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43" - integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw== + version "8.3.4" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7" + integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g== + dependencies: + acorn "^8.11.0" -acorn@^8.1.0, acorn@^8.8.2: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +acorn@^8.1.0, acorn@^8.11.0, acorn@^8.8.2: + version "8.15.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816" + integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg== agent-base@6: version "6.0.2" @@ -72,6 +79,14 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== +call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6" + integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -96,16 +111,16 @@ data-urls@^4.0.0: whatwg-url "^12.0.0" debug@4, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== dependencies: - ms "2.1.2" + ms "^2.1.3" decimal.js@^10.4.3: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + version "10.6.0" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a" + integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg== delayed-stream@~1.0.0: version "1.0.0" @@ -120,14 +135,52 @@ domexception@^4.0.0: webidl-conversions "^7.0.0" dompurify@^3.0.2: - version "3.0.8" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.8.tgz#e0021ab1b09184bc8af7e35c7dd9063f43a8a437" - integrity sha512-b7uwreMYL2eZhrSCRC4ahLTeZcPZxSmYfmcQGXGkXiZSNW1X85v+SDM5KsWcpivIiUBH47Ji7NtyUdpLeF5JZQ== + version "3.3.0" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.0.tgz#aaaadbb83d87e1c2fbb066452416359e5b62ec97" + integrity sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ== + optionalDependencies: + "@types/trusted-types" "^2.0.7" -entities@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +dunder-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" + integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A== + dependencies: + call-bind-apply-helpers "^1.0.1" + es-errors "^1.3.0" + gopd "^1.2.0" + +entities@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694" + integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g== + +es-define-property@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" + integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g== + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-object-atoms@^1.0.0, es-object-atoms@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1" + integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA== + dependencies: + es-errors "^1.3.0" + +es-set-tostringtag@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d" + integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA== + dependencies: + es-errors "^1.3.0" + get-intrinsic "^1.2.6" + has-tostringtag "^1.0.2" + hasown "^2.0.2" escodegen@^2.0.0: version "2.1.0" @@ -161,14 +214,69 @@ event-target-shim@^5.0.0: integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + version "4.0.5" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053" + integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" + es-set-tostringtag "^2.1.0" + hasown "^2.0.2" mime-types "^2.1.12" +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +get-intrinsic@^1.2.6: + version "1.3.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01" + integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ== + dependencies: + call-bind-apply-helpers "^1.0.2" + es-define-property "^1.0.1" + es-errors "^1.3.0" + es-object-atoms "^1.1.1" + function-bind "^1.1.2" + get-proto "^1.0.1" + gopd "^1.2.0" + has-symbols "^1.1.0" + hasown "^2.0.2" + math-intrinsics "^1.1.0" + +get-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" + integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g== + dependencies: + dunder-proto "^1.0.1" + es-object-atoms "^1.0.0" + +gopd@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" + integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== + +has-symbols@^1.0.3, has-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" + integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== + +has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + +hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + html-encoding-sniffer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" @@ -237,6 +345,11 @@ jsdom@^21.1.0: ws "^8.13.0" xml-name-validator "^4.0.0" +math-intrinsics@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" + integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g== + mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" @@ -254,12 +367,12 @@ mri@^1.2.0: resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -node-fetch@^2.6.8: +node-fetch@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== @@ -267,9 +380,9 @@ node-fetch@^2.6.8: whatwg-url "^5.0.0" nwsapi@^2.2.4: - version "2.2.7" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + version "2.2.22" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.22.tgz#109f9530cda6c156d6a713cdf5939e9f0de98b9d" + integrity sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ== p-timeout@^4.1.0: version "4.1.0" @@ -277,18 +390,20 @@ p-timeout@^4.1.0: integrity sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw== parse5@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + version "7.3.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05" + integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw== dependencies: - entities "^4.4.0" + entities "^6.0.0" psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + version "1.15.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6" + integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w== + dependencies: + punycode "^2.3.1" -punycode@^2.1.1, punycode@^2.3.0: +punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== @@ -343,23 +458,23 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== telegraf@^4.8.5: - version "4.15.3" - resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.15.3.tgz#72e28e62c3cc7f97b88b5f1b04a0e0700a7df251" - integrity sha512-pm2ZQAisd0YlUvnq6xdymDfoQR++8wTalw0nfw7Tjy0va+V/0HaBLzM8kMNid8pbbt7GHTU29lEyA5CAAr8AqA== + version "4.16.3" + resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.16.3.tgz#f03fa30482b540a7f9895af8f13ec8f432840a66" + integrity sha512-yjEu2NwkHlXu0OARWoNhJlIjX09dRktiMQFsM678BAH/PEPVwctzL67+tvXqLCRQQvm3SDtki2saGO9hLlz68w== dependencies: - "@telegraf/types" "^6.9.1" + "@telegraf/types" "^7.1.0" abort-controller "^3.0.0" debug "^4.3.4" mri "^1.2.0" - node-fetch "^2.6.8" + node-fetch "^2.7.0" p-timeout "^4.1.0" safe-compare "^1.1.4" sandwich-stream "^2.0.2" tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -437,9 +552,9 @@ whatwg-url@^5.0.0: webidl-conversions "^3.0.0" ws@^8.13.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + version "8.18.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" + integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== xml-name-validator@^4.0.0: version "4.0.0" diff --git a/pkgs/by-name/ga/garmin-grafana/package.nix b/pkgs/by-name/ga/garmin-grafana/package.nix new file mode 100644 index 000000000000..262c1adaf30e --- /dev/null +++ b/pkgs/by-name/ga/garmin-grafana/package.nix @@ -0,0 +1,54 @@ +{ + fetchFromGitHub, + python3Packages, + lib, +}: +python3Packages.buildPythonPackage rec { + pname = "garmin-grafana"; + version = "0.3.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "arpanghosh8453"; + repo = "garmin-grafana"; + tag = "v${version}"; + hash = "sha256-nuVT6LK9KIs/FwUbdfI4xpKru4jfAyj1/vmk7ji43zk="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + fitparse + garminconnect + influxdb + influxdb3-python + python-dotenv + ]; + + doCheck = false; # there are no tests + + dontCheckRuntimeDeps = true; + + postInstall = '' + install -Dt $out/share/grafana-dashboards -m644 Grafana_Dashboard/Garmin-Grafana-Dashboard.json + ''; + + passthru.grafana-dashboard = "${placeholder "out"}/share/grafana-dashboards/Garmin-Grafana-Dashboard.json"; + + meta = { + description = "Export Garmin data to InfluxDB"; + longDescription = '' + A Python script to fetch Garmin health data and populate that in an InfluxDB database, + for visualizing long-term health trends with Grafana + ''; + homepage = "https://github.com/arpanghosh8453/garmin-grafana"; + changelog = "https://github.com/arpanghosh8453/garmin-grafana/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aciceri ]; + mainProgram = "garmin-fetch"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index de7aa57978fd..b4a27a6e997c 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.25.7"; + version = "0.25.8"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-omdIWyBdKNYSzaCZv1vZGPv3L7ileSVwuaX6C+ZUZXY="; + hash = "sha256-OT0TiYvbeybWPk2Sku38ip+qmUUuFRMu1wC9936EByY="; }; - vendorHash = "sha256-02q83ybAy2U1kdBKV6jJuK1zGFHRsCeEJdqJgWmNQBc="; + vendorHash = "sha256-LOim/rW8Uz5stpIQj2Ubx4F3bTv6nNAn2ZbWqW6B4rU="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 40bc9d3d0064..46dec148531d 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -6,7 +6,7 @@ let pname = "gate"; - version = "0.59.0"; + version = "0.61.0"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; tag = "v${version}"; - hash = "sha256-SB1rl5JjxFoA32Jyg6/ESuiOOS6RYsGp0HfL9O4tjyA="; + hash = "sha256-HCxsydmCjhbL2hiZ4EEjsODXKWoAv2Azi/HvUU6aOIg="; }; vendorHash = "sha256-f7SkECS80Lwkd0xSzHq+x05ZBjBYKXsA4rPidyIAYak="; diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix index a82dea06615f..f9eae3df486d 100644 --- a/pkgs/by-name/ga/gauge-unwrapped/package.nix +++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.21"; + version = "1.6.22"; patches = [ # adds a check which adds an error message when trying to @@ -18,10 +18,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; tag = "v${version}"; - hash = "sha256-mUuoGLAVUShhNsSjURCL6yWcIW+K7P8KEBwBoBelgyw="; + hash = "sha256-6RJj+sDffqzdMlMkE/rJ7AEKYcxDQBR86fjlaNDb6M0="; }; - vendorHash = "sha256-WyQbvZNd61L4Bz5btZ2hkrCTb5iuJJU5yNDzuYR5Sdc="; + vendorHash = "sha256-nxd+3hKHLUiHpSGTJpD5QRFJ4e0Boq5MTijmND56Uug="; excludedPackages = [ "build" diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 74bd63f082a1..b6d6e8508e95 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "3.5.2"; + version = "3.5.4"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-48m4/k9BLwFrNIXcRY25jvNd3E/9zwEsuf2ZVG00svM="; + hash = "sha256-+FMVAFiOH6LH5CODp7XwCbB98vRmDTNcfSy0qTQbuOI="; }; vendorHash = "sha256-gC7ngmy4xIkEp2lHOfGyDaZNqy/J4Uy8ox8F2uP7P/0="; diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index b4286505a520..7e2177cec74a 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-gf0KFCjtnDGwD9Y/t/usozflzLzDXp+HvYNYsd0iYiI="; + hash = "sha256-wZt4pCyYLB/7SalR8wxucizk7f1diNA8SiFsRn6ZM/g="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index b604e4861cdc..e7c057d1f5c1 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-4bXY1oKPuVOrsLuPST+9kV5TXIhoNZ3gmNSDRGcrVM0="; + hash = "sha256-6UuKEXxhMNFYvDITv9TeHBDd1hBz+jmwwSa6CAjDgDw="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 0b1e2303c9a4..8d4a7eb60f1c 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.5.247"; + version = "5.6.249"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 108053fa6894..97daa21e0af4 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.18.4"; + version = "0.19.4"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-hKtmIGysnJ2zlpfpd6W2yA2OqPwQW2xdaND6jMe7lgs="; + hash = "sha256-qOP+zt7iwBnNUkvCPmHO4DoYs8kJh1hvGeu0IbEA/E0="; }; dontUnpack = true; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 74e6dda39b29..b1fbc4fae070 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.18.4"; + version = "0.19.3"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-TSHL3X+p74yFGTNFk9r4r+nnul2etgVdXxy8x9BjsRg="; + hash = "sha256-kAb5CSD7PB3b63QnVSbgWxIMPO2Hh5LfmtZ3wE2TUFk="; }; - npmDepsHash = "sha256-2Z6YrmUHlYKRU3pR0ZGwQbBgzNFqakBB6LYZqf66nSs="; + npmDepsHash = "sha256-tCu98oLr/xh4MJR6q+AbySHOmFeZFH7z59rL0K5A9Es="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 0dbbe783edab..9e3e21c6dae5 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -1,28 +1,22 @@ { lib, rustPlatform, - fetchFromGitHub, + fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "genemichaels"; - version = "0.5.13"; + version = "0.8.5"; - src = fetchFromGitHub { - owner = "andrewbaxter"; - repo = "genemichaels"; - rev = "genemichaels-v${version}"; - hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ="; + src = fetchCrate { + inherit pname version; + hash = "sha256-5cM5VyS5w92CjP3nVumuUNkCFlhipukRhM8ERhE36n4="; }; - cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM="; + cargoHash = "sha256-aJDtXsGVUxUrh3yLWEcobvFUqy/7PGFQHWIWU54zYdE="; - cargoBuildFlags = [ "--package ${pname}" ]; - # cargoTestFlags is not used because genemichaels is tightly coupled to the - # other crates in the workspace and by not setting it, we run all the tests. - # If a dependency crate is failing its tests, we want to know about it. For - # example, between versions 0.5.8 and 0.5.12, there was a failing test in one - # of the other workspace members that genemichaels depends on. + passthru.updateScript = nix-update-script { }; meta = { description = "Even formats macros"; diff --git a/pkgs/by-name/ge/geoipjava/package.nix b/pkgs/by-name/ge/geoipjava/package.nix index 63759827a4f5..bff080287adc 100644 --- a/pkgs/by-name/ge/geoipjava/package.nix +++ b/pkgs/by-name/ge/geoipjava/package.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { meta = { description = "GeoIP Java API"; license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 85c30ddd24de..495c3971be02 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -21,7 +21,7 @@ let inherit buildInputs version; src = fetchzip { - url = "mirror://sourceforge/geoserver/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip"; + url = "https://sourceforge.net/projects/geoserver/files/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip"; inherit hash; # We expect several files. stripRoot = false; @@ -42,325 +42,334 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.27.2"; # app-schema - hash = "sha256-XJbuRdqvkusT1hZEuFoogTEB8vHOsX9cQxA0Mzhg1+8="; # app-schema + version = "2.28.1"; # app-schema + hash = "sha256-PwZW9hFRiZIxgil75DXMsq0ymo7jPYX4Boj+hkXW8NI="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.27.2"; # authkey - hash = "sha256-e43HG4iPgj9vj7lq0c9ATmWVumqHdtM9DrAwbQJqUcg="; # authkey + version = "2.28.1"; # authkey + hash = "sha256-Zg3Db5QG4w+yMZ75MqtHt1Kri8peDGMZ0va5ZwI+6dw="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.27.2"; # cas - hash = "sha256-kDYC8z5sRAycw6ZCKJ105XoYF5/ss4YTguqQ8pbnJls="; # cas + version = "2.28.1"; # cas + hash = "sha256-YMnaRVPLn98mXm2sErKSRlzmvQbnU9MGMDXuYgwm+H0="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.27.2"; # charts - hash = "sha256-zI+F21bQHcE4Lbh26bHeCTjTRJdswkUmmz+qAsP2t4k="; # charts + version = "2.28.1"; # charts + hash = "sha256-LM75iq2xvSQjVxGnngoLCz5IkSI9/YqAqOqgSUlkrUA="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.27.2"; # control-flow - hash = "sha256-5XW3l9MFEUeYuhOKqN4EqjwpRlMc8P8Tn46A2Z89Jks="; # control-flow + version = "2.28.1"; # control-flow + hash = "sha256-ZO04mls+OapOK/fi5IBy0mVJ5cF0fyQ1RgFhWt0AuEw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.27.2"; # css - hash = "sha256-1fpP70Ed4iUrUyMMiMFhkykuPCzBV5+lWFicl9sUjAg="; # css + version = "2.28.1"; # css + hash = "sha256-2PcZhxkHXEOAs46fnt37VhupVOfRNWaRynNlLGviAho="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.27.2"; # csw - hash = "sha256-4BYSY6tldkjd8KDlM/D+MNb9I8Ji0CVjyJcsBzRxC1Y="; # csw + version = "2.28.1"; # csw + hash = "sha256-6TmSWnny0OedvnLu+HnKpVxdfcicp1D//isFFOclcmk="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.27.2"; # csw-iso - hash = "sha256-/0soY61A1d4yKJolRtymoFOsKf42B/RacUSUqN/7uXo="; # csw-iso + version = "2.28.1"; # csw-iso + hash = "sha256-BlnIS8gpWwBuiwdIqvq3UpJrdKPULvJxR7o3XJtI5tQ="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.27.2"; # db2 - hash = "sha256-agZZHkwAx5YTOCzDlhpiTWxBTyhAoIW1BgW3QfV/kug="; # db2 + version = "2.28.1"; # db2 + hash = "sha256-Ga4Db6G+LxRN+casjs0nYD6TFN1YrDjgOIlu46/0RgQ="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.27.2"; # dxf - hash = "sha256-F93QOpe0nBQDD+8iDnenacNJ87h+jCqytJ3uz7weCcg="; # dxf + version = "2.28.1"; # dxf + hash = "sha256-703y8CBd9oYsryGgAftXq5Cr1lUeyws1Alx0tSwzZo8="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.27.2"; # excel - hash = "sha256-CYW9JBhDOLqxNKnlxNDy03sZzmGPLn9KaK4LScGMIIg="; # excel + version = "2.28.1"; # excel + hash = "sha256-9ti+J7e9QieVbCFQ2xxuqX8TvQCcLPw0tPUNVqGG9+0="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.27.2"; # feature-pregeneralized - hash = "sha256-0MuzhZ8Y/yy/AJ6vTvfJxXPgnf+fTJPfB8wNTboYHOw="; # feature-pregeneralized + version = "2.28.1"; # feature-pregeneralized + hash = "sha256-eGayG9FUJabhP60iypib1gLcRStqz5J4PMTuSB+xL60="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.27.2"; # gdal + version = "2.28.1"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-Krdj96ddLsrA8J6B8ap3BBBe/+flVX7/GJRLN4UnKiY="; # gdal + hash = "sha256-sVI9o2xwbvez7Gm8gY9DAbEr5TUluVGDoC7ZweK4BUE="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.27.2"; # geofence - # hash = "sha256-Rzi8oZFy+SglTuPSYBFi/Wge4pOVY5yE50c8+jRI+4Y="; # geofence + # version = "2.28.1"; # geofence + # hash = "sha256-POBOhg3d8HlA3qF2W41UTVhISM5vAQi74cI+y+Rj+Ic="; # geofence #}; - #geofence-server = mkGeoserverExtension { - # name = "geofence-server"; - # version = "2.27.2"; # geofence-server - # hash = ""; # geofence-server + #geofence-server-h2 = mkGeoserverExtension { + # name = "geofence-server-h2"; + # version = "2.28.1"; # geofence-server + # hash = "sha256-8lY+wrCD7PizeNvh9hDRhxdFxT7n1SVKD8TVU80iiZk="; # geofence-server-h2 + #}; + + #geofence-server-postgres = mkGeoserverExtension { + # name = "geofence-server-postgres"; + # version = "2.28.1"; # geofence-server + # hash = "sha256-DB3OK2dvPrDtlRRHaDUXqQW7AlOhN4zFm2t0N1+B3rk="; # geofence-server-postgres #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.27.2"; # geofence-wps - # hash = "sha256-dry787XPCVBPi4TXKyFL85QZwX0WdWfiXqz/yriMiWc="; # geofence-wps + # version = "2.28.1"; # geofence-wps + # hash = "sha256-tP3hnN0kXKFIdgKrS7juyrCh1OoQD0Bx54/xq6nUzWA="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.27.2"; # geopkg-output - hash = "sha256-LlYjYTa0mjOh+q2ILJORTAUlWy3mW9lEMd1vUyyhDV8="; # geopkg-output + version = "2.28.1"; # geopkg-output + hash = "sha256-6ARKLmhc5lhqi841Ou5ZrBuj6bdOwQDSGPwzGcBTNJw="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.27.2"; # grib - hash = "sha256-/OBhwToUuJfDcRnx4aJbXDb6HdGGtM8SCkjmFgfX65s="; # grib + version = "2.28.1"; # grib + hash = "sha256-AW/i+vRthQct3U45EGw/6uPDZNdS9z816nnKVIGCg/k="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.27.2"; # gwc-s3 - hash = "sha256-A0I2/+pRuvcXCVduTNn/e1nDZnNkt7cKtPNNO3Yo8Bk="; # gwc-s3 + version = "2.28.1"; # gwc-s3 + hash = "sha256-wVLW7qbKDRmf1okTI0PDREQ5eoJOVGMVLS+uusY2+cM="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.27.2"; # h2 - hash = "sha256-kGXqb5xH4Jn6nhN8nfhldUcHtQodBUp9y3bviPim1Ak="; # h2 + version = "2.28.1"; # h2 + hash = "sha256-zEjNN1dCmNR/5st/yNpWP1G3P6Zqf3RSFdUKOgdwff4="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.27.2"; # iau - hash = "sha256-KVkpQ92cvmc3nIsBygUU58vsIY8BZXEEXQrUeH/eEyM="; # iau + version = "2.28.1"; # iau + hash = "sha256-zn4FlC/vVvq1K6mSplOKarHHUWLNev5IW76wSiTvBuE="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.27.2"; # importer - hash = "sha256-Sumh9148zqwLCbpiknwLyVpxqufkoizMgszy//qC5dA="; # importer + version = "2.28.1"; # importer + hash = "sha256-7v5MvpvVbVKOBxUlEwem8MzPUTtBc8z+1JAEqeHUmYI="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.27.2"; # inspire - hash = "sha256-IDX93Cu7BgrkmI5QcdYu++XzVwHOeCM17eXgqhDPSRQ="; # inspire + version = "2.28.1"; # inspire + hash = "sha256-kgqwO3elSnT/4M9G+OgULaW+i/nDNGhvHblmWZRjTTA="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.27.2"; # jp2k - # hash = "sha256-Ar+mVXZqYfP6OGISdRzBntWRo2msL5RN44bgPeMOqQw="; # jp2k + # version = "2.28.1"; # jp2k + # hash = "sha256-sLUgsMXymnTuceCRLzqIAPmk4/Q3BO+A+7BLQoc3iP0="; # jp2k #}; - libjpeg-turbo = mkGeoserverExtension { - name = "libjpeg-turbo"; - version = "2.27.2"; # libjpeg-turbo - hash = "sha256-6e9Bdy/Lh7ZXPzHVGX/f/qa53v1JWrUshlrtcziIbQs="; # libjpeg-turbo - buildInputs = [ libjpeg.out ]; - }; + # Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'" + # as of 2.28.1. + # NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix) + #libjpeg-turbo = mkGeoserverExtension { + # name = "libjpeg-turbo"; + # version = "2.28.1"; # libjpeg-turbo + # hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo + # buildInputs = [ libjpeg.out ]; + #}; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.27.2"; # mapml - hash = "sha256-QTAoesynmxv+9bYwak6jat6J3In5ULdsy2ozjMbsoXI="; # mapml + version = "2.28.1"; # mapml + hash = "sha256-AonH/wBRh0oVs8psJ+XRutkSwybN3fs505SI/0qzG3o="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.27.2"; # mbstyle - hash = "sha256-zKdX77zy72lkMB928XIjU0pYZ7zFVEI7OfbJ2ozFIHk="; # mbstyle + version = "2.28.1"; # mbstyle + hash = "sha256-SvgvBkp6dS6v1JjQxpa7m7tqc2c63hruWCcFcouHXaQ="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.27.2"; # metadata - hash = "sha256-VLBuqh9qfcv2BRHhjF1tAc6ACCOUPQcY4Yc0Vko/2l0="; # metadata + version = "2.28.1"; # metadata + hash = "sha256-M3HcgrPGZBBotNm6dsw4UjrH1onIQHDMdxuwNVuqO84="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.27.2"; # mongodb - hash = "sha256-xXgiOEMQhPbw6GorrkEiyV7isgmSuimzT/LK41c0bzA="; # mongodb + version = "2.28.1"; # mongodb + hash = "sha256-Urp8d0i6Xlk2muNKKioJTnrEvzC05tqiipLT162L7uk="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.27.2"; # monitor - hash = "sha256-1x+Rz8wXl3cAsX5rHgMEe1+h17QS7PDBJGDFmKf+SMY="; # monitor + version = "2.28.1"; # monitor + hash = "sha256-Qo9aFOjbg9s1RZVqa/z1ka+QmFrPZJgrH8qMcstCywQ="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.27.2"; # mysql - hash = "sha256-mmquP4u3YqqbGVK2jkbNtGiqVMENCThpRTWOz6f74Pk="; # mysql + version = "2.28.1"; # mysql + hash = "sha256-5/xP8vPNhOYN9YXL4sZk16652ZBB7Ivm7Cq05fYi7wI="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.27.2"; # netcdf - hash = "sha256-GhPde3Fw04lutbgPmDyxO/C7wkZO1ttASqqj2g6JuCM="; # netcdf + version = "2.28.1"; # netcdf + hash = "sha256-qKgSyFrKI7JVMNt/qjgJ5puLaTsU406P5VyUpncMHOg="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.27.2"; # netcdf-out - hash = "sha256-r4CyrlRm04tE3+vJfF+KlHAczrOy+dsTHXBG++GG0ys="; # netcdf-out + version = "2.28.1"; # netcdf-out + hash = "sha256-Xk3cTve45U9LDv8lWugtGpfid4yr5yDWh7H7daVlAc8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.27.2"; # ogr-wfs + version = "2.28.1"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-EI0FNYFwcmsLYiYauvCAvweAIn6bI7WaCVPcCtkGrys="; # ogr-wfs + hash = "sha256-ykFfqoLXeGigAdCLnDCKiCGD++n7jiOivua8Oh2DwU8="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.27.2"; # ogr-wps + version = "2.28.1"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-CtsaQg9IZxlRW4oQwmdBA+VLWtsNP3+jS1Mj2RxAJw4="; # ogr-wps + hash = "sha256-WxOZ5WDNxV1HAT9cfCPm9DwoU/96OobuODOjd5dGN94="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.27.2"; # oracle - hash = "sha256-8cRDvWWFJHZZGmbZEruvp1whfhXZ/c7TYha4Fa5DuzM="; # oracle + version = "2.28.1"; # oracle + hash = "sha256-lj53CC6f9vXatH9vxHaFZvEGDpplTZSYy56fz4d4Qs0="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.27.2"; # params-extractor - hash = "sha256-Y7tt0F//dANcKds/mU6702S5PMJNVLcxxc+hYFNOt5M="; # params-extractor + version = "2.28.1"; # params-extractor + hash = "sha256-1Znwqb+PHFlsuQIs8pMqo08s4uSc7wLZRYE+hVZzoQY="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.27.2"; # printing - hash = "sha256-I5vVlpX2kXof3wuyRs2QvhWdx0Okm7StYvY8I/AL8Ug="; # printing + version = "2.28.1"; # printing + hash = "sha256-OeMHkx4d7/FwNigQ8Mnz9UlqFJbMZFGmxZT8kJ3iPp8="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.27.2"; # pyramid - hash = "sha256-/iIwS5iw95qotmmLWGU11br36dVc+o5LmwTDXBL7zaY="; # pyramid + version = "2.28.1"; # pyramid + hash = "sha256-fLe2SeRSNvj6qqh6CMDu2w0gubf+xi3Ez7jO2fEbpjc="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.27.2"; # querylayer - hash = "sha256-G66AkPkytzXvEi9hbudvBphFKrvMrhUbPSVvexXRJh4="; # querylayer + version = "2.28.1"; # querylayer + hash = "sha256-QM5DAoTFsn6JTLubQy4p0qsA91DcfU7C74cb80jzzWM="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.27.2"; # sldservice - hash = "sha256-djERawjM06NtZK6RnNh/qIS/x5ZjSWeUMHlUSF4/5aA="; # sldservice + version = "2.28.1"; # sldservice + hash = "sha256-u5uzwyrwBzz5qcEtRS+ZIbmis9kVuGPt6+qo19K1HCM="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.27.2"; # sqlserver - hash = "sha256-Kad2wJmN/67xlLDViFfYWxvsSjmW+j3/iQEAvwEMZW4="; # sqlserver + version = "2.28.1"; # sqlserver + hash = "sha256-19KyMBZEYBeUKiogxux8jrc8VgNDdCnvhrEV8Q84SG0="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.27.2"; # vectortiles - hash = "sha256-S5ujjj8JLXbybbjpA8qLF4sapVIECDZ8l+iqqUoVHuc="; # vectortiles + version = "2.28.1"; # vectortiles + hash = "sha256-tT4phUdL8yMKzobxWNivMpHJYu6KQmPiNECK9TtJgjg="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.27.2"; # wcs2_0-eo - hash = "sha256-S2d3Yel0B0DJubuMUywPB2gDiWIpdkniDksZcq8j9BI="; # wcs2_0-eo + version = "2.28.1"; # wcs2_0-eo + hash = "sha256-HawDOyymB01x7PaFg5QKQhTSFdybeY5oAAusaG95To8="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.27.2"; # web-resource - hash = "sha256-HJ+GPrprrCPlzh9q+PZr0QEJE/YVXaqgxhUlYHPkgho="; # web-resource + version = "2.28.1"; # web-resource + hash = "sha256-FkuxR3WN95jyorpcv4ShT9J6jmUi0Z9NNwLEW3OKzx0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.27.2"; # wmts-multi-dimensional - hash = "sha256-de+0UEsRJyl9plnmOaWSI8xNc6RG+U7uJVEyvgwng4Q="; # wmts-multi-dimensional + version = "2.28.1"; # wmts-multi-dimensional + hash = "sha256-tJP9pPKKYFLGbLWZEV5gWSaQdTbml3OKiIPM1sqhekY="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.27.2"; # wps - hash = "sha256-Fn0XWncwqUmMub9eBxb5GN2cc3eMdyB55NB9AUvVQpQ="; # wps + version = "2.28.1"; # wps + hash = "sha256-aYAN89XFpwzsW5aRBKSnixks3bxCAfOOznFDpoIvbIk="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.27.2"; # wps-cluster-hazelcast - # hash = "sha256-xV6JddIC5Uq8H3RaE9tqCMK+5OA5WrXfh6O82BVw+P0="; # wps-cluster-hazelcast + # version = "2.28.1"; # wps-cluster-hazelcast + # hash = "sha256-hO1/7OG9J5Ot5xKhMUbTAqm7B6TlecqNGxxbIuFCpCc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.27.2"; # wps-download - hash = "sha256-loP1oYqie2U00RWOwlLzprECfnBTG2MeJNhPZJx8Q1o="; # wps-download + version = "2.28.1"; # wps-download + hash = "sha256-qB1vtczNULOsEjZaof9cA5YKPDE0Dwcz6mlUtzCanPQ="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.27.2"; # wps-jdbc - hash = "sha256-LpxGscFx7DCeM90VGs4lAMoKNXJVDnSCptdC9VeeU/o="; # wps-jdbc + version = "2.28.1"; # wps-jdbc + hash = "sha256-9S6/TXK9YFzPD8u/S7SQuBcIGjUTalY69kzG4xbIU3g="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.27.2"; # ysld - hash = "sha256-1yOaJcPyLOm/lYdOazHU5DjfahSjuN00yYvxgsE5RKM="; # ysld + version = "2.28.1"; # ysld + hash = "sha256-qLWnujvB32U0EW7xW12GaAx6mPHkrU5Pa3S+T8+19r8="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 7d03232a5d76..4c66b14da3dd 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "geoserver"; - version = "2.27.2"; + version = "2.28.1"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; - hash = "sha256-yzejVi+0FzTCtUirCvn3PsxLLmoIUSxS2sA1KWWo30U="; + hash = "sha256-wll05KPMVfpZGnybBxLeGH3pan8q4eWy8F4v5y5N3Gk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ge/geoserver/update.sh b/pkgs/by-name/ge/geoserver/update.sh index e3b2f25fbaa4..133519136043 100755 --- a/pkgs/by-name/ge/geoserver/update.sh +++ b/pkgs/by-name/ge/geoserver/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I ./. -i bash -p common-updater-scripts jq set -eEuo pipefail -test ${DEBUG:-0} -eq 1 && set -x +test "${DEBUG:-0}" -eq 1 && set -x # Current version. LATEST_NIXPKGS_VERSION=$(nix eval --raw .#geoserver.version 2>/dev/null) @@ -12,7 +12,7 @@ UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION} LATEST_GITHUB_VERSION=$(curl -s "https://api.github.com/repos/geoserver/geoserver/releases/latest" | jq -r '.tag_name') UPDATE_NIX_NEW_VERSION=${UPDATE_NIX_NEW_VERSION:-$LATEST_GITHUB_VERSION} -SMALLEST_VERSION=$(printf "$UPDATE_NIX_OLD_VERSION\n$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1) +SMALLEST_VERSION=$(printf "%s\n%s" "$UPDATE_NIX_OLD_VERSION" "$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1) if [[ "$SMALLEST_VERSION" == "$UPDATE_NIX_NEW_VERSION" ]]; then echo "geoserver is up-to-date: $SMALLEST_VERSION" @@ -24,18 +24,18 @@ update-source-version geoserver "$UPDATE_NIX_NEW_VERSION" cd "$(dirname "$(readlink -f "$0")")" -EXT_NAMES=($(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort)) +mapfile -t EXT_NAMES < <(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort) -if [[ $# -gt 0 ]] ; then - EXT_NAMES=(${@:1}) +if [[ $# -gt 0 ]]; then + EXT_NAMES=("${@:1}") fi -for EXT_NAME in "${EXT_NAMES[@]}" ; do - echo "Updating extension $EXT_NAME..." - URL="mirror://sourceforge/geoserver/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip" - HASH=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --unpack "$URL")) - sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix - sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix +for EXT_NAME in "${EXT_NAMES[@]}"; do + echo "Updating extension $EXT_NAME..." + URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip" + HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --unpack "$URL")") + sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix + sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix done cd - diff --git a/pkgs/by-name/gh/gh-copilot/package.nix b/pkgs/by-name/gh/gh-copilot/package.nix index 55b68840f5e4..c9c609233d65 100644 --- a/pkgs/by-name/gh/gh-copilot/package.nix +++ b/pkgs/by-name/gh/gh-copilot/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/github/gh-copilot"; license = lib.licenses.unfree; mainProgram = "gh-copilot"; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; platforms = lib.attrNames systemToPlatform; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix index bfcc60c30d00..bf801f147529 100644 --- a/pkgs/by-name/gh/gh-skyline/package.nix +++ b/pkgs/by-name/gh/gh-skyline/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { description = "Generate a 3D model of your GitHub contribution history"; homepage = "https://github.com/github/gh-skyline"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; mainProgram = "gh-skyline"; }; } diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix index 27bb61be7a3b..ac7a035de0d5 100644 --- a/pkgs/by-name/gh/ghorg/package.nix +++ b/pkgs/by-name/gh/ghorg/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.11.6"; + version = "1.11.7"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-M1Kd0cpV/GRbxGdGs6nMn9DEnUdrSh9J5U52j7Hm6S8="; + sha256 = "sha256-3aFEpSyKICJ6jWZAMprE4nV6OxMFVvM82bmKSV87Sng="; }; doCheck = false; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 280c7161c57d..708ee6f12bbb 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.219.0"; + version = "2.221.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-WXBKUvwfllH6HQFgUBcUSaaHqhMrWU3V969ZtJ9y7KQ="; + hash = "sha256-hcFzcaa8SpwecyPeDbKE2/hnANUFP4EiUzJCs5Ybkyc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-Xn+8+CHgCQ6Zh2/HUbl1xW8LkIypCfHAFzflc6vIeKQ="; + npmDepsHash = "sha256-fzY/gf65u5iQe/J+7p46lSp4uAEZ21nr+L0OB9GyWxk="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gh/ghz/package.nix b/pkgs/by-name/gh/ghz/package.nix index a5d37a552d22..993911fa52ff 100644 --- a/pkgs/by-name/gh/ghz/package.nix +++ b/pkgs/by-name/gh/ghz/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ghz"; - version = "0.120.0"; + version = "0.121.0"; src = fetchFromGitHub { owner = "bojand"; repo = "ghz"; rev = "v${version}"; - sha256 = "sha256-EzyQbMoR4veHbc9VaNfiXMi18wXbTbDPfDxo5NCk7CE="; + sha256 = "sha256-hfHhsargP/odmpbfO24aDXr5m9VeDNOYyi1n9ji2trU="; }; - vendorHash = "sha256-7TrYWmVKxHKVTyiIak7tRYKE4hgG/4zfsM76bJRxnAk="; + vendorHash = "sha256-eu0YPKddYfjbOkF0yrUPu2PsjsyIn2pBm9+CDrRlB2k="; subPackages = [ "cmd/ghz" diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 0d0506ac77dc..4bd67d4473aa 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.27.2"; + version = "2.27.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-+B/yl6Jl7BwtyGUWuyBPPK2bT+vulHtUbn8GygPlbh0="; + sha256 = "sha256-qEGV5QLRVuy0pNBat19u3kp8jUrUHFjyY1pC1nkyZC0="; }; vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ="; diff --git a/pkgs/by-name/gi/giph/package.nix b/pkgs/by-name/gi/giph/package.nix index a31e134dac57..c015ad02553c 100644 --- a/pkgs/by-name/gi/giph/package.nix +++ b/pkgs/by-name/gi/giph/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/giph"; description = "Simple gif recorder"; license = licenses.mit; - maintainers = [ maintainers.lom ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "giph"; }; diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix index d2f49f131d73..fd8ed62e6755 100644 --- a/pkgs/by-name/gi/gir-rs/package.nix +++ b/pkgs/by-name/gi/gir-rs/package.nix @@ -30,7 +30,6 @@ rustPlatform.buildRustPackage { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ekleog ]; mainProgram = "gir"; }; } diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix index 793b26abcc23..ba8d9e1ecc52 100644 --- a/pkgs/by-name/gi/git-machete/package.nix +++ b/pkgs/by-name/gi/git-machete/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "git-machete"; - version = "3.37.1"; + version = "3.38.0"; pyproject = true; src = fetchFromGitHub { owner = "virtuslab"; repo = "git-machete"; tag = "v${version}"; - hash = "sha256-E1rLMCFnczZqwxC+hNDCyhRFHM39/oQMlaa5D363Ac4="; + hash = "sha256-cn++U2Vy6LCEZvtmvDOTQydnAxapUZxLUE+6Kxg7Rq8="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix index 3920719869b7..2163069a62b3 100644 --- a/pkgs/by-name/gi/git-pages-cli/package.nix +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -8,14 +8,14 @@ buildGoModule (finalAttrs: { pname = "git-pages-cli"; - version = "1.3.1"; + version = "1.5.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "git-pages"; repo = "git-pages-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-BApqy0eTTl7OyJGnnNiVXiPKNN4tPoq88ucA/Ipe16Q="; + hash = "sha256-T6spNuuG0l1bFv7SnsDTGBtD3Sa+8zKN0/VbsKVkGrM="; }; vendorHash = "sha256-5vjUhN3lCr41q91lOD7v0F9c6a8GJj7wBGnnzgFBhJU="; diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 5d154c1cd570..522598eae58f 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-YC6nLDOBvLEw07UdgmGgFX3w91/qqK+CiDw2K+eMk7Q="; + hash = "sha256-w7MBbR5eEtpP1ydSAEYlsmg+SOQTwHVRp8rrFMhgqfc="; }; - vendorHash = "sha256-CXCp61iBBhANFjmFybRWQ5cj/JKOfzHX2xjLzJ4IQTc="; + vendorHash = "sha256-4We8i/A1YDcmR/9MIf6D+z3oKZ3ZGQvdPuKRuhmJPyY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-tools/package.nix b/pkgs/by-name/gi/git-tools/package.nix new file mode 100644 index 000000000000..ca96ce256e8a --- /dev/null +++ b/pkgs/by-name/gi/git-tools/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + installShellFiles, + versionCheckHook, + nix-update-script, + bash, + git, + python3, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "git-tools"; + version = "2025.08"; + + src = fetchFromGitHub { + owner = "MestreLion"; + repo = "git-tools"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DuhvepcDXk+UTFbvmv5V/EGP9ZEnHBYk7ARm/z0gTLY="; + }; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + buildInputs = [ + bash + git + python3 + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 git-* -t "$out"/bin + + for exe in "$out"/bin/*; do + wrapProgram "$exe" \ + --prefix PATH : "$out"/bin:${lib.makeBinPath finalAttrs.buildInputs} + done + + runHook postInstall + ''; + postInstall = '' + installManPage \ + man1/*.1 + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/git-restore-mtime"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/MestreLion/git-tools/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "Assorted git tools, including git-restore-mtime"; + homepage = "https://github.com/MestreLion/git-tools"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ aduh95 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch b/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch index 2763ab3a3fe1..d3b0459f8037 100644 --- a/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch +++ b/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch @@ -1,18 +1,18 @@ diff --git a/wt b/wt -index 60999f2..5687822 100755 +index 7166bf2..cdbebab 100755 --- a/wt +++ b/wt -@@ -27,7 +27,6 @@ help_message() { - echo -e "\twt: go to the main worktree" - echo -e "\twt : search for worktree names and change to that directory." +@@ -48,7 +48,6 @@ help_message() { + echo -e "\twt -i: interactively select a worktree using fzf." + echo -e "\twt list: list out all the git worktrees." echo -e "\twt names: list out only the git worktree names." - echo -e "\twt update: update to the latest release of worktree switcher." echo -e "\twt version: show the CLI version." echo -e "\twt init : print the init script for ." echo -e "\twt help: shows this help message." -@@ -163,9 +162,6 @@ case "${args[0]}" in - names) - worktree_list_names +@@ -189,9 +188,6 @@ names) + echo -e '\033[0;31mThe '\''names'\'' option is deprecated and will be removed in future versions.\033[0m' >&2 + echo -e '\033[0;31mUse '\''list'\'' instead.\033[0m' >&2 ;; -update) - update @@ -20,11 +20,11 @@ index 60999f2..5687822 100755 help) help_message ;; -@@ -176,7 +172,6 @@ init) +@@ -202,7 +198,6 @@ init) init ;; *) - auto_check_update - directory=$(git worktree list --porcelain 2> /dev/null | sed -n '/'"${arg:-.}"'/{s/^worktree\s*//p;q}') - ;; - esac + if [[ "$is_interactive" == true ]]; then + directory=$(git worktree list --porcelain | + awk '/worktree/ {wt=$2} /branch/ {sub("refs/heads/", "", $2); print wt " [" $2 "]"}' | diff --git a/pkgs/by-name/gi/git-worktree-switcher/package.nix b/pkgs/by-name/gi/git-worktree-switcher/package.nix index eed927c03043..6bd44b5b0b81 100644 --- a/pkgs/by-name/gi/git-worktree-switcher/package.nix +++ b/pkgs/by-name/gi/git-worktree-switcher/package.nix @@ -6,22 +6,24 @@ installShellFiles, git, jq, + fzf, }: stdenv.mkDerivation (finalAttrs: { pname = "git-worktree-switcher"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { owner = "mateusauler"; repo = "git-worktree-switcher"; tag = "${finalAttrs.version}-fork"; - hash = "sha256-vPnAXiizCU5nXce+aE2x2G5ei+7A+eBTUpxcGleSSa8="; + hash = "sha256-OXUVIL4bIqqxnLLwdO0+8gxCDMqA4TPvjIc2i8BeBmw="; }; buildInputs = [ - jq + fzf git + jq ]; nativeBuildInputs = [ @@ -39,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { cp wt $out/bin wrapProgram $out/bin/wt --prefix PATH : ${ lib.makeBinPath [ + fzf git jq ] diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index 48c9febe8352..dc94caea8a90 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.53.0"; + version = "0.55.0"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = version; - hash = "sha256-/TDKtMkysd9tuvsS8K2Xl+6qUckwRrz4BorEkjTBqnA="; + hash = "sha256-28u21SO6G1lrMq6Ihl+tRSit5Jh9w2mwjK+3r3YfH5M="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index a5839f46e545..c78d81bcbfb1 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "0.0.365"; + version = "0.0.367"; src = fetchzip { url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; - hash = "sha256-tOsF3B1GB7/Gs9E8dw/P2SCcrmjIjYj/kfP6wWqBEUA="; + hash = "sha256-RkJLklYZx1xWuRpxbZQDLPvRbfSbI6JhBZAswfyN+zk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/gi/gitlogue/package.nix b/pkgs/by-name/gi/gitlogue/package.nix index 68b69309e227..09c274598dd1 100644 --- a/pkgs/by-name/gi/gitlogue/package.nix +++ b/pkgs/by-name/gi/gitlogue/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gitlogue"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "unhappychoice"; repo = "gitlogue"; tag = "v${finalAttrs.version}"; - hash = "sha256-SkdyOEMN4neW/KHf5nuBh3e5CJ2Vrul/1ydOhpK1Rdg="; + hash = "sha256-OKRgtWa1HbUgczuS0EdMgosuKPaZJhzIfjwKZAAaBCs="; }; - cargoHash = "sha256-RIs7pf+S01nupYzOIferlh+c/NuNHgBTspx+9MGl33g="; + cargoHash = "sha256-cq1bjOxuGJDRLoO0p5tmGF4IjUojXF52p/n6mugPdPg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index f72cabe64756..11456c11f171 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -48,7 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.mit; mainProgram = "gitmoji"; maintainers = with lib.maintainers; [ - nequissimus yzx9 ]; }; diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index 8abe536cbb67..63b193d3c3f1 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -79,7 +79,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; mainProgram = "gitui"; maintainers = with lib.maintainers; [ - Br1ght0ne yanganto mfrw ]; diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index cb05a2d44a89..c7d0ed73ae29 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.18"; + version = "1.0.19"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; tag = version; - hash = "sha256-d8NHRcCPTW935lb5MNkmxc8lhyByU0X+iKTUwY8ycRo="; + hash = "sha256-jdN91oiKMr8ozjsQG2+lI55nPbjBa+ipWG9GYeFXCDw="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index f79895b5ffbe..11aec019f8e3 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -36,12 +36,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.32"; + version = "1.1.47"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-uZrq4RM50NcQPHFFfqIRBJ/rq/I09D8WxKz3/xqpOEI="; + hash = "sha256-iMMl99qrcAxSX0ReonSjtY6oDTmDwug8TDXngUTngfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index c2da76007822..57bdd59aaa1c 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${final.version}"; - hash = "sha256-eBgcIhmezfYYaqBrKh6elbTMIQCUXd3W9TAuS/RDXcA="; + hash = "sha256-H1paMc0LH743aMHCO/Ocp96SaaoXLcl/MDmmbtSJG+Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix index 02278f4ac9b2..f44bb13b4ca0 100644 --- a/pkgs/by-name/gl/global-platform-pro/package.nix +++ b/pkgs/by-name/gl/global-platform-pro/package.nix @@ -84,7 +84,6 @@ maven.buildMavenPackage rec { binaryBytecode # deps ]; license = with licenses; [ lgpl3 ]; - maintainers = with maintainers; [ ekleog ]; mainProgram = "gp"; }; } diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index acd687d5574b..84715a4b78cf 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-i2+CEPHK2C34ulY4nRTVw0sNBsHzD1WlKiZRjwHJOVc="; + hash = "sha256-RPt353Rwahr9a4xodm//4TZGNuHPGOF/GurxchI2y7s="; }; vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o="; diff --git a/pkgs/by-name/gl/glow/package.nix b/pkgs/by-name/gl/glow/package.nix index f18173ed1769..238f2b8c1c11 100644 --- a/pkgs/by-name/gl/glow/package.nix +++ b/pkgs/by-name/gl/glow/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { homepage = "https://github.com/charmbracelet/glow"; changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "glow"; }; } diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix index 20b5fd96f3d1..66c9e7046f10 100644 --- a/pkgs/by-name/gn/gnote/package.nix +++ b/pkgs/by-name/gn/gnote/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0="; + hash = "sha256-l845YCx31l3w1d0z4HtbhtakWFdtzh5rbtGx5If14HM="; }; buildInputs = [ diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index d651beeadcec..537634913e74 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 rec { pname = "go-containerregistry"; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "google"; repo = "go-containerregistry"; rev = "v${version}"; - sha256 = "sha256-fmn2SPmYecyKY7HMPjPKvovRS/Ez+SwDe+1maccq4Hc="; + sha256 = "sha256-UDLKdeQ2Nxf5MCruN4IYNGL0xOp8Em2d+wmXX+R9ow4="; }; vendorHash = null; diff --git a/pkgs/by-name/go/go-csp-collector/package.nix b/pkgs/by-name/go/go-csp-collector/package.nix index c8437b2b122b..8ca56da69489 100644 --- a/pkgs/by-name/go/go-csp-collector/package.nix +++ b/pkgs/by-name/go/go-csp-collector/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "go-csp-collector"; - version = "0.0.16-unstable-2025-10-10"; + version = "0.0.17-unstable-2025-11-24"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = "go-csp-collector"; - rev = "a0cf22ac6d1f5c8972bf53671ba174767d2adcd5"; - hash = "sha256-xFvO8ZuJQ5luCDOTPHtVeb1+3VvIKSwjt2TqkxBIY58="; + rev = "c997e31172ed2d785fc960296b826a9587bd5de9"; + hash = "sha256-ZfE8xa+og14dlUmvYfatecSdrhmuMbFFNTw5RZ3ZHXU="; }; vendorHash = "sha256-SrQahSHO5ZIkcLR3BR5CR5BTStW1pH1Ij1Eql0b3tuU="; diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index f26d837ca275..2aa1c845ba2a 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,22 +6,23 @@ buildGoModule rec { pname = "go-dnscollector"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "go-dnscollector"; - rev = "v${version}"; - sha256 = "sha256-oip7rMCcWppUwCPy6VG/kJsNWf1EZZmf0iTj8FSvHeE="; + tag = "v${version}"; + hash = "sha256-J6h/td5vCZwVruamZziIxRhAOdLdlv3Aupz9m0bExU4="; }; - vendorHash = "sha256-1gFsLsPrsJhZ6V3/H22ZjIHrG1hTsRCj/Ur3gC01NSE="; + vendorHash = "sha256-BQLlEY9CJDwJRbzB5kflBwwxcWMLbaqgWUtz2p3CJsE="; subPackages = [ "." ]; meta = with lib; { description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata"; homepage = "https://github.com/dmachard/go-dnscollector"; + changelog = "https://github.com/dmachard/DNS-collector/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ shift ]; }; diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix index a369de31d911..732ae6ea64c4 100644 --- a/pkgs/by-name/go/go-errorlint/package.nix +++ b/pkgs/by-name/go/go-errorlint/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitHub, + fetchFromGitea, nix-update-script, }: @@ -9,7 +9,8 @@ buildGoModule rec { pname = "go-errorlint"; version = "1.8.0"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "polyfloyd"; repo = "go-errorlint"; rev = "v${version}"; @@ -24,12 +25,13 @@ buildGoModule rec { ]; passthru.updateScript = nix-update-script { }; - meta = with lib; { + + meta = { description = "Source code linter that can be used to find code that will cause problems with Go's error wrapping scheme"; - homepage = "https://github.com/polyfloyd/go-errorlint"; - changelog = "https://github.com/polyfloyd/go-errorlint/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + homepage = "https://codeberg.org/polyfloyd/go-errorlint"; + changelog = "https://codeberg.org/polyfloyd/go-errorlint/src/tag/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ meain polyfloyd ]; diff --git a/pkgs/by-name/go/go-exploitdb/package.nix b/pkgs/by-name/go/go-exploitdb/package.nix index 28d130d27d97..39acebab9ed4 100644 --- a/pkgs/by-name/go/go-exploitdb/package.nix +++ b/pkgs/by-name/go/go-exploitdb/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-exploitdb"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "vulsio"; repo = "go-exploitdb"; tag = "v${version}"; - hash = "sha256-kfPM1p7ihfCRsxYjqfKbcwaM2DLdOAqQ2ywxzEQV8A4="; + hash = "sha256-GT5kEEYdjyHQTF0m9pMX+uxH++BuA8ORIL7loc5hSfI="; }; - vendorHash = "sha256-0RYc0ssdyV1b0DsMD5+0FA6oGStextvajX7SgHVQueU="; + vendorHash = "sha256-8xUoCamF2VV+D04XBwc3OtQTI2/j6uMbhmDXpHQZxXI="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index 58cdace2892a..a193255af630 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.19.0"; + version = "4.19.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-u8lP1mQLZ3WtX8NV8mnlNut5bLqkWk2blaoYJPOQoCk="; + sha256 = "sha256-Z8ufA2z5XeJ80Jfd6NSls/SurR8rMTO4zq88fQYGGpA="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-aAtPYD8gZReUJu+oOkuZ1afUKnGvP5shXCo7FgigBDI="; + vendorHash = "sha256-IaTNm119GO+1DkGYHFD8A8B/rWOVy0KAiXMhKj0zC/M="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix index f89fe81b97ea..df1eb6e62842 100644 --- a/pkgs/by-name/go/gobgp/package.nix +++ b/pkgs/by-name/go/gobgp/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gobgp"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-hXpNNDGiiJ0m8TjZe4ZOFhwma7KG7bm5iud1F0lcRzg="; + sha256 = "sha256-Lm0nJfvXGoRBu6Yv698zf74/xOfG7UagzvTExK6KXbo="; }; vendorHash = "sha256-y8nhrKQnTXfnDDyr/xZd5b9ccXaM85rd8RKHtoDBuwI="; diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index 7294e569b4c6..f4dadc9858ed 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${version}"; - hash = "sha256-hXpNNDGiiJ0m8TjZe4ZOFhwma7KG7bm5iud1F0lcRzg="; + hash = "sha256-Lm0nJfvXGoRBu6Yv698zf74/xOfG7UagzvTExK6KXbo="; }; vendorHash = "sha256-y8nhrKQnTXfnDDyr/xZd5b9ccXaM85rd8RKHtoDBuwI="; diff --git a/pkgs/by-name/go/gokey/package.nix b/pkgs/by-name/go/gokey/package.nix index f1775c771227..ee5e6c2be92e 100644 --- a/pkgs/by-name/go/gokey/package.nix +++ b/pkgs/by-name/go/gokey/package.nix @@ -5,18 +5,16 @@ }: buildGoModule rec { pname = "gokey"; - version = "0.1.3"; - - patches = [ ./version.patch ]; + version = "0.2.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "gokey"; tag = "v${version}"; - hash = "sha256-pvtRSWq/vXlyUShb61aiDlis9AiQnrA2PWycr1Zw0og="; + hash = "sha256-tJ9nCHhKPrw7SRGsqAlo/tf3tBLF63+CevEXggZADlE="; }; - vendorHash = "sha256-qlP2tI6QQMjxP59zaXgx4mX9IWSrOKWmme717wDaUEc="; + vendorHash = "sha256-Btac9Oi8efqRy+OH49Na3Y6RGehHEmGfvDo2/7EWPL4="; meta = with lib; { homepage = "https://github.com/cloudflare/gokey"; diff --git a/pkgs/by-name/go/gokey/version.patch b/pkgs/by-name/go/gokey/version.patch deleted file mode 100644 index e52620da0fb6..000000000000 --- a/pkgs/by-name/go/gokey/version.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/go.mod b/go.mod -index 50b6806..f23b2ec 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,9 @@ - module github.com/cloudflare/gokey - --go 1.13 -+go 1.17 - - require ( - golang.org/x/crypto v0.17.0 - golang.org/x/term v0.15.0 -+ golang.org/x/sys v0.15.0 - ) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 406ac4e78283..2941c2185df6 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -14,16 +14,16 @@ buildGo125Module (finalAttrs: { pname = "golangci-lint"; - version = "2.6.2"; + version = "2.7.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-E/qubcF5AFgWicszZcGNBlRLYqk0ZpGilR1LNw7bO/c="; + hash = "sha256-8dVIWa+yFvuBz2yXcPG1cBkxltqdjlb+tmQ+AtYuicc="; }; - vendorHash = "sha256-KuTACpyMqq3h2MXfJ3wuD+9Z803sXROLfxtZXCbX1RA="; + vendorHash = "sha256-MHz9VQvObHkvf62HNcPGfsskv5RJpe6g23CoXHOGUZc"; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 25fc3cc9ddd5..d09e99eea157 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gollama"; - version = "v1.37.5"; + version = "v2.0.1"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${version}"; - hash = "sha256-UBvnWHk/txjz/RCIDmdXW64qPy0K0OkZEv/M24LFg8c="; + hash = "sha256-6r0mAimyFxQ/cJyB9vMJeP6S5cEdzzfb5axXfeOE1nU="; }; - vendorHash = "sha256-kHWBFSp9JrlSVVmAcvH1MX6rBMRD7Ka5HTZZXPALciw="; + vendorHash = "sha256-eOxEq+4JQCCWpnVy7aKM9GiZ29bzvfsrqXD4Op8+/K4="; doCheck = false; diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix index bdbf6d97628d..1d329fd42656 100644 --- a/pkgs/by-name/go/gonzo/package.nix +++ b/pkgs/by-name/go/gonzo/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gonzo"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "control-theory"; repo = "gonzo"; tag = "v${finalAttrs.version}"; - hash = "sha256-NoZDSKdFb805WjtXLwA8/bnbTdJgnCtFxk6FqbuEo/0="; + hash = "sha256-fLTZwxZcwh7y83GfuOvG0R6vm/TgKIJjBWbt39mV6H8="; }; - vendorHash = "sha256-XKwtq8EF774lHLHtyFzveFa5agJa15CvhsuwwaQdJwU="; + vendorHash = "sha256-uYQlZvsLUOmy7P/goNpwTGQrGFMW6LSILC6VjGbNrjI="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index b7e1925495b2..ea1afb5c0fd9 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo125Module rec { pname = "gotenberg"; - version = "8.25.0"; + version = "8.25.1"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo125Module rec { owner = "gotenberg"; repo = "gotenberg"; tag = "v${version}"; - hash = "sha256-C/qUEyYYcp/VQ3++FbBK1etNhoJQ5om2PiCAgt6U91k="; + hash = "sha256-qQuK7ylwKeBI+ijScFB2jTd0nmb+tGuk09AOFroDIG0="; }; - vendorHash = "sha256-RxpQIx2HTEjpUi5RsRiV9Nc7VUBOJI0YA2rH40iHRXE="; + vendorHash = "sha256-uQDRo5TbT+9s0YZxcUqOESHU9hTvXAMrIiaz/6ZZEAY="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix index 4061de8a3808..e7ee44dd5c43 100644 --- a/pkgs/by-name/go/gotlsaflare/package.nix +++ b/pkgs/by-name/go/gotlsaflare/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotlsaflare"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Stenstromen"; repo = "gotlsaflare"; tag = "v${finalAttrs.version}"; - hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4="; + hash = "sha256-oGuK6jyThBG/Kvsa/g+Z27HuU8n+EX7FDsQVuJPsjS0="; }; - vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM="; + vendorHash = "sha256-NNmNX4ZZsL2m9RfVwy5uJ1uj+YG2jV1hgrrPyZ4dkb8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 75bbce55ca3c..e928bd3b5977 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -13,6 +13,8 @@ nix-update-script, installShellFiles, testers, + lld, + useLLD ? stdenv.hostPlatform.isArmv7, }: buildGoModule (finalAttrs: { @@ -34,7 +36,10 @@ buildGoModule (finalAttrs: { yarn nodejs installShellFiles - ]; + ] + ++ lib.optionals useLLD [ lld ]; + + env = lib.optionalAttrs useLLD { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; ldflags = let diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 4d495f7d7fea..10cfc0cba3d5 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphicsmagick"; - version = "1.3.45"; + version = "1.3.46"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${finalAttrs.version}.tar.xz"; - hash = "sha256-3OpRZ0FPfIBVV94tekepsxR7y/YXuR9fD0r+XmVDAms="; + hash = "sha256-x8cGpQXpxsN2QVa7lKDJZE15ExeF3xWonJ+HIdGr0GE="; }; outputs = [ diff --git a/pkgs/by-name/gr/graphql-client/package.nix b/pkgs/by-name/gr/graphql-client/package.nix index 950e099493ee..8adf9c39e05b 100644 --- a/pkgs/by-name/gr/graphql-client/package.nix +++ b/pkgs/by-name/gr/graphql-client/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "graphql-client"; - version = "0.13.0"; + version = "0.15.0"; src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; + hash = "sha256-kYznUgLe2hg8dOPJQVrl+zZQFAbiSkeHAgxiSiVsHoE="; }; - cargoHash = "sha256-GPUOIDKlxk2P+cPmOPlpz/EM9TCXvHo41+1fQ0xAqto="; + cargoHash = "sha256-Knet/xIBZwbKWQHSVWCGxS+2W1qBRvQqEHhak6wWr94="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json index fc77a37568c5..5777b554270e 100644 --- a/pkgs/by-name/gr/grayjay/deps.json +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -14,6 +14,11 @@ "version": "2.1.28", "hash": "sha256-qCbqEwIB/j6HToEPpDEdQGGIPGQNmrULrCHnEGZSd5c=" }, + { + "pname": "FCastSenderSDKDotnet", + "version": "0.0.3", + "hash": "sha256-5pca9ywSOTVbNsuHKT980hz5sfWe8QQ0HzXwedqfF7M=" + }, { "pname": "Fizzler", "version": "1.2.0", @@ -59,6 +64,11 @@ "version": "7.4.5", "hash": "sha256-54bbiVJoXDrePISZHuEcOax+kgyaIftL684bt3EgYy8=" }, + { + "pname": "Microsoft.ClearScript.V8.Native.linux-arm64", + "version": "7.4.5", + "hash": "sha256-pufUKVsXaKOc7FoKxHwtvMDzx2etOLOzTXvWhBRy1Ho=" + }, { "pname": "Microsoft.ClearScript.V8.Native.linux-x64", "version": "7.4.5", diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 3b2269ed1eef..93c690aa8698 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -35,13 +35,13 @@ _experimental-update-script-combinators, }: let - version = "10"; + version = "12"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "Grayjay.Desktop"; tag = version; - hash = "sha256-ap0NnjyBjvyFjHPu9vACQMoOXqwz90/8QqSfPFqfh5U="; + hash = "sha256-KVmik/YaJAr76QwXYRajXj7EVTJBs2NdbkDvIpLxlFc="; fetchSubmodules = true; fetchLFS = true; }; @@ -52,7 +52,7 @@ let sourceRoot = "source/Grayjay.Desktop.Web"; npmBuildScript = "build"; - npmDepsHash = "sha256-3RMUV6o6422PEuqYg7B+y6JjlaiHDhnwsgsaKEbu5BM="; + npmDepsHash = "sha256-3nPzQcDWhPCdLrPvwGY+K0t1OSxWrVwQ3hH7i0eynRU="; installPhase = '' runHook preInstall @@ -198,7 +198,10 @@ buildDotnetModule (finalAttrs: { ''; homepage = "https://grayjay.app/desktop/"; license = lib.licenses.sfl; - maintainers = with lib.maintainers; [ samfundev ]; + maintainers = with lib.maintainers; [ + kruziikrel13 + samfundev + ]; platforms = [ "x86_64-linux" ]; mainProgram = "Grayjay"; }; diff --git a/pkgs/by-name/gr/greg/package.nix b/pkgs/by-name/gr/greg/package.nix index da9eca5d24ff..d0833a2b5f7e 100644 --- a/pkgs/by-name/gr/greg/package.nix +++ b/pkgs/by-name/gr/greg/package.nix @@ -28,6 +28,5 @@ python3Packages.buildPythonApplication rec { description = "Command-line podcast aggregator"; mainProgram = "greg"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 4f2c9ea734b6..3fb44f733ad1 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -19,13 +19,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-10-04"; + version = "0.1-unstable-2025-12-01"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "32e1a75b65553daefb419f0906ce19e04815aa3a"; - hash = "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg="; + rev = "e88d93f8aed2b9631b62ca273590fd3528310d7e"; + hash = "sha256-71vBBU9GC+A+tdqAuFDRdx8WEVuj4OaVY5apoaAALkc="; }; strictDeps = true; diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index e76f80fa95f1..48b28dbb356f 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, pkg-config, gtk3, @@ -22,22 +21,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gromit-mpx"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; tag = finalAttrs.version; - hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk="; + hash = "sha256-dqZbkbjcfNO/rlUn5pCDdPU5rYyG1qSR38WROFwPlN0="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/bk138/gromit-mpx/commit/e3b501d497374da083b97d0b3bbd40c5c766d2d1.patch?full_index=1"; - hash = "sha256-MJFwwYuvIZeLJBi4p/JQ6qJo6fntj2Q7y+ufap/MGdY="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/gr/grooveauthor/package.nix b/pkgs/by-name/gr/grooveauthor/package.nix new file mode 100644 index 000000000000..261ac7b44723 --- /dev/null +++ b/pkgs/by-name/gr/grooveauthor/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenvNoCC, + fetchzip, + autoPatchelfHook, + copyDesktopItems, + makeDesktopItem, + wrapGAppsHook3, + alsa-lib, + dotnetCorePackages, + gtk3, + libGL, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "grooveauthor"; + version = "1.1.3"; + + src = fetchzip { + url = "https://github.com/PerryAsleep/GrooveAuthor/releases/download/v${finalAttrs.version}/GrooveAuthor-v${finalAttrs.version}-linux-x64.tar.gz"; + hash = "sha256-XuELs7Sj/M32ros5clKxKuVo/CdCja39Lwc+zsFGvFU="; + stripRoot = false; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + wrapGAppsHook3 + ]; + + runtimeDependencies = [ gtk3 ]; + + desktopItems = [ + (makeDesktopItem { + desktopName = "GrooveAuthor"; + name = finalAttrs.pname; + genericName = "Editor for StepMania"; + icon = "GrooveAuthor"; + exec = "GrooveAuthor"; + categories = [ + "AudioVideo" + "AudioVideoEditing" + ]; + keywords = [ + "GrooveAuthor" + "StepMania" + "ITG" + "ITGmania" + "DDR" + "PIU" + "Pump It Up" + "Dance" + "StepF2" + "StepP1" + ]; + prefersNonDefaultGPU = true; + singleMainWindow = true; + terminal = false; + }) + ]; + + installPhase = '' + runHook preInstall + install -Dm444 grooveauthor/Icon.svg $out/share/icons/hicolor/scalable/apps/GrooveAuthor.svg + mv grooveauthor $out/bin + rm $out/bin/{GrooveAuthor.desktop,Icon.svg} + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set DOTNET_ROOT ${dotnetCorePackages.runtime_8_0}/share/dotnet + --suffix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + alsa-lib + libGL + ] + }" + ) + ''; + + meta = { + description = "GrooveAuthor is an editor for authoring StepMania charts"; + homepage = "https://github.com/PerryAsleep/GrooveAuthor"; + license = with lib.licenses; [ + mit + mspl + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ ungeskriptet ]; + mainProgram = "GrooveAuthor"; + }; +}) diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix similarity index 75% rename from pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix rename to pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix index f0cd2ed87c5f..1095643dbd14 100644 --- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix +++ b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix @@ -3,26 +3,26 @@ stdenvNoCC, fetchFromGitHub, gtk3, - breeze-icons, gnome-icon-theme, hicolor-icon-theme, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-dark-icons-gtk"; version = "1.0.0"; src = fetchFromGitHub { owner = "jmattheis"; repo = "gruvbox-dark-icons-gtk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2"; }; nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -36,11 +36,11 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; - meta = with lib; { + meta = { description = "Gruvbox icons for GTK based desktop environments"; homepage = "https://github.com/jmattheis/gruvbox-dark-gtk"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.nomisiv ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nomisiv ]; }; -} +}) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 034bb6d60ae6..40a518637480 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.104.1"; + version = "0.104.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-6oXpS3rJIQpUfMNRfIFT09HhOs7sTL1EqGouSZlr3z8="; + hash = "sha256-S+oscpVa8HhZZKd8qFX8xR84tc7pAncofp/5QzCX/bI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-Z5QrF/d1RDUsQniCfbk6729TXTAHmcrGT+8F9K68HAo="; + vendorHash = "sha256-liVutQcKrOjG8/m0uMFE85MejTvd2kCVQ5iLWtnb/94="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix index 4bcbe2a441e0..8abd74e7e25f 100644 --- a/pkgs/by-name/gt/gtg/package.nix +++ b/pkgs/by-name/gt/gtg/package.nix @@ -62,6 +62,7 @@ python3Packages.buildPythonApplication rec { gst-python liblarch caldav + vobject ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index 9e2069a3a996..5ff5312110d2 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gthumb"; - version = "3.12.8.1"; + version = "3.12.8.2"; src = fetchurl { url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s="; + sha256 = "sha256-q8V7EQMWXdaRU1eW99vbp2hiF8fQael07Q89gA/oh5Y="; }; strictDeps = true; @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs data/gschemas/make-enums.py \ gthumb/make-gthumb-h.py \ po/make-potfiles-in.py \ - postinstall.py \ gthumb/make-authors-tab.py ''; diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/by-name/gu/guglielmo/package.nix similarity index 68% rename from pkgs/applications/radio/guglielmo/default.nix rename to pkgs/by-name/gu/guglielmo/package.nix index e1a81e9b40f1..b16b3393064a 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/by-name/gu/guglielmo/package.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -9,22 +9,21 @@ fdk_aac, faad2, fftwFloat, + libsForQt5, libsndfile, libsamplerate, portaudio, - qtmultimedia, - qwt, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guglielmo"; version = "0.5"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = "guglielmo"; - rev = "v${version}"; - sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; }; postInstall = '' @@ -34,6 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ airspy @@ -44,8 +44,8 @@ mkDerivation rec { libsndfile libsamplerate portaudio - qtmultimedia - qwt + libsForQt5.qtmultimedia + libsForQt5.qwt ]; postFixup = '' @@ -53,12 +53,12 @@ mkDerivation rec { patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped ''; - meta = with lib; { + meta = { description = "Qt based FM / Dab tuner"; mainProgram = "guglielmo"; homepage = "https://github.com/marcogrecopriolo/guglielmo"; - license = licenses.gpl2Only; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.markuskowa ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 451190ee7430..1abbe69d55b6 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 rec { pname = "gvm-libs"; - version = "22.33.0"; + version = "22.34.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${version}"; - hash = "sha256-TFXM348a+PgpSyPENNlfoIGb/h6HvtIM1jlDnSbt/KI="; + hash = "sha256-MCriCweaB2UbQzW/ojsyJgh/bn9l5XHqSicGYTnfQrw="; }; postPatch = '' diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index e168cd2e9e43..9335383fb799 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-11-08"; + version = "2.3.0-rolling-2025-12-05"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "607b732b668a06826709c0f72bd4fd680f2372bc"; - hash = "sha256-JdtBedmz84LnlePKif3vnq5YbTAIumvzPcjlJ/Br5hQ="; + rev = "df3d192f701e48864459fff80bc81135c339b7b0"; + hash = "sha256-XArZFBkV0nnsh+QXmoZUttvB9vlz8+CrFWaQt8dR7n4="; }; outputs = [ diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix index e86245297da3..b242f3ebd014 100644 --- a/pkgs/by-name/ha/hap-py/package.nix +++ b/pkgs/by-name/ha/hap-py/package.nix @@ -37,22 +37,26 @@ let ]; my-python = python3.withPackages my-python-packages; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hap.py"; version = "0.3.15"; src = fetchFromGitHub { owner = "Illumina"; repo = "hap.py"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ="; }; - # For illumina script - BOOST_ROOT = "${boost.out}"; - ZLIBSTATIC = "${zlib.static}"; - # For cmake : boost lib and includedir are in different location - BOOST_LIBRARYDIR = "${boost.out}/lib"; - BOOST_INCLUDEDIR = "${boost.dev}/include"; + + # CMake 4 dropped support of versions lower than 3.5, + # versions lower than 3.10 are deprecated. + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required (VERSION 2.8)" \ + "cmake_minimum_required (VERSION 3.10)" + ''; patches = [ # Compatibility with nix for boost and library flags : zlib, bzip2, curl, crypto, lzma @@ -76,17 +80,27 @@ stdenv.mkDerivation rec { zlib ]; + env = { + # For illumina script + BOOST_ROOT = "${boost.out}"; + ZLIBSTATIC = "${zlib.static}"; + + # For cmake : boost lib and includedir are in different location + BOOST_LIBRARYDIR = "${boost.out}/lib"; + BOOST_INCLUDEDIR = "${boost.dev}/include"; + }; + postFixup = '' wrapProgram $out/bin/hap.py \ --set PATH ${lib.makeBinPath runtime} \ - --add-flags "--engine-vcfeval-path=${rtg-tools}/bin/rtg" + --add-flags "--engine-vcfeval-path=${lib.getExe rtg-tools}" ''; - meta = with lib; { + meta = { description = "Compare genetics variants against a gold dataset"; homepage = "https://github.com/Illumina/hap.py"; - license = licenses.bsd2; - maintainers = with maintainers; [ apraga ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ apraga ]; mainProgram = "hap.py"; }; -} +}) diff --git a/pkgs/by-name/ha/happy-coder/package.nix b/pkgs/by-name/ha/happy-coder/package.nix new file mode 100644 index 000000000000..1c412a51a033 --- /dev/null +++ b/pkgs/by-name/ha/happy-coder/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "happy-coder"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "slopus"; + repo = "happy-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WKzbpxHqE3Dxqy/PDj51tM9+Wl2Pallfrc5UU2MxNn8="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-3/qcbCJ+Iwc+9zPCHKsCv05QZHPUp0it+QR3z7m+ssw="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + yarnInstallHook + makeWrapper + ]; + + # Currently `happy` requires `node` to start its daemon + postInstall = '' + wrapProgram $out/bin/happy \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs + ] + } + wrapProgram $out/bin/happy-mcp \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs + ] + } + ''; + + meta = { + description = "Mobile and web client wrapper for Claude Code and Codex with end-to-end encryption"; + homepage = "https://github.com/slopus/happy-cli"; + changelog = "https://github.com/slopus/happy-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onsails ]; + mainProgram = "happy"; + }; +}) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9a3b8247e90e..46688f772f7a 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-U0k6DODMW9OK+sR9kt8JzpmV32d9py9Pehv/0h8SqDg="; + hash = "sha256-Lh612FwMvr3Dn8LxixF+igrLyGYiIFOSRzCpASB8zZ8="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-TyqUKAlrcoqsDBS2Y3jzUFNNRazSBsCf6una0znc+yw="; + cargoHash = "sha256-lNFxnp1s7WMwgauPGexWc6swVSz8GpAOYJnUszXM3G0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix index 0222ed4879af..fd8c57126f90 100644 --- a/pkgs/by-name/ha/harsh/package.nix +++ b/pkgs/by-name/ha/harsh/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "harsh"; - version = "0.11.3"; + version = "0.12.3"; src = fetchFromGitHub { owner = "wakatara"; repo = "harsh"; tag = "v${finalAttrs.version}"; - hash = "sha256-mQhBQFDint6ZlS5yQ9oGLJVxmol9p+st9X7wRCBuc/g="; + hash = "sha256-/NgYjw/euTD55Ao91JL9og2FvHEYhDyT7mmPnJzoH4o="; }; - vendorHash = "sha256-+yHIpUttvrdiTt0IuMTT4iCN34hNOb3JjZTmi5qb8yI="; + vendorHash = "sha256-dGHEP5OYr/t2JNhfIHKGXJMl8OJS5FJPXsDQXa1AiEA="; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/ha/hayabusa-sec/package.nix b/pkgs/by-name/ha/hayabusa-sec/package.nix index 8dc4adb95493..bc563871de4c 100644 --- a/pkgs/by-name/ha/hayabusa-sec/package.nix +++ b/pkgs/by-name/ha/hayabusa-sec/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + makeWrapper, + unstableGitUpdater, pkg-config, openssl, rust-jemalloc-sys, @@ -9,20 +11,21 @@ rustPlatform.buildRustPackage { pname = "hayabusa-sec"; - version = "3.3.0-unstable-2025-07-17"; + version = "3.7.0-unstable-2025-12-02"; src = fetchFromGitHub { owner = "Yamato-Security"; repo = "hayabusa"; - rev = "feaa165b4c0af34919ad26f634cb684e23172359"; - hash = "sha256-h08InhNVW33IjPA228gv6Enlg6EKmj0yHb/UvJ/f7uw="; + rev = "1c4f332b446f20af154257b2e9b581f7bcb4b1a2"; + hash = "sha256-JWb54yudfB6pOMZca8sFeoRqNA7M//xJ3IBKfIcGBnM="; # Include the hayabusa-rules fetchSubmodules = true; }; - cargoHash = "sha256-wcH1Ron5Zx2ypWyaW0z7L9rCanAcosvpPQnP60qbvWQ="; + cargoHash = "sha256-JIHkFokaZ+nt1hW+gRxFrb1DVZcm4jsZKT12gx/BRCA="; nativeBuildInputs = [ + makeWrapper pkg-config ]; @@ -39,6 +42,15 @@ rustPlatform.buildRustPackage { # > error: unexpected argument '--skip' found doCheck = false; + postInstall = '' + mkdir -p $out/share/hayabusa-sec + cp -r rules $out/share/hayabusa-sec/ + mv $out/bin/hayabusa $out/share/hayabusa-sec/ + makeWrapper $out/share/hayabusa-sec/hayabusa $out/bin/hayabusa + ''; + + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Sigma-based threat hunting and fast forensics timeline generator for Windows event logs"; homepage = "https://github.com/Yamato-Security/hayabusa"; diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix index 323a57698210..c792bff5464e 100644 --- a/pkgs/by-name/hd/hdf5-blosc/package.nix +++ b/pkgs/by-name/hd/hdf5-blosc/package.nix @@ -61,6 +61,5 @@ stdenv.mkDerivation rec { description = "Filter for HDF5 that uses the Blosc compressor"; homepage = "https://github.com/Blosc/hdf5-blosc"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/by-name/he/hedgedoc/missing-hashes.json b/pkgs/by-name/he/hedgedoc/missing-hashes.json index a203ed4e54ca..755c9e97e4a9 100644 --- a/pkgs/by-name/he/hedgedoc/missing-hashes.json +++ b/pkgs/by-name/he/hedgedoc/missing-hashes.json @@ -1,27 +1,28 @@ { - "@esbuild/aix-ppc64@npm:0.25.2": "3b5ee5599a8446074bd6aad732c5f2833a4b77e8af62cfcdee7508ded661daa054c481c2fa69f5341e65cc8846a2b3f026ffca12934cb24d76df93e4800e2979", - "@esbuild/android-arm64@npm:0.25.2": "556d958ea6f33073669a8a41645b0e51cecb2c0788ece8827a8752e666fd178ae28b2f9749b8a968f1e9c66b09dab7933be8d8b53e391ea9eca7bddf3f53b26a", - "@esbuild/android-arm@npm:0.25.2": "0ce9f260216520a4d53c2736b60e8e55b8c6569b944555cb7840fbe2ff16278d4e6591aedcbc38b3f69a6d98167367f36bba1d35b41d725e4d68a67f942e2a28", - "@esbuild/android-x64@npm:0.25.2": "57d0c438a3bcc25db5aa89c9d9b60827d3ee6d9553234d95a16f52f8a7780778e5e7a9975374e4d37a81e600d2b8f32bd46d5633bb83bcd958ee2f5162d1359b", - "@esbuild/darwin-arm64@npm:0.25.2": "e148927428c0c5d69e681ee8d4b47e0bcc5116296c47c41ed44068d686a0568b23dc493dc47b4d103e7b21894fafbaf5c2d64bf2420a5d6b6b22f71bf6c2fb08", - "@esbuild/darwin-x64@npm:0.25.2": "2bc37a902d7828f3973d28f486bcf26da13f6f421122348fc510551a4674bc706eb8e6f692ccd3d887523c373580b3228797f2fd73d641b2e106a6d44e3f20c7", - "@esbuild/freebsd-arm64@npm:0.25.2": "431ddf98e7c0b7c6a7d1a689454ab449df8eaacca242442153a4f149017d6bd03e16b7fda01e9fe26316d135176d74f5de09e9a21357648c320a3211a1c862a2", - "@esbuild/freebsd-x64@npm:0.25.2": "21545ec11969db7ed091819b63c88a9c4490edce8a98d64718f79352a5001927d1d85e6261170562850afdb5a7a2182ccf3d936eab0db615e51188ab6f95789b", - "@esbuild/linux-arm64@npm:0.25.2": "332ba0533f2a2bba21dfb3c9130f9a1cef5b420da29f67116e7fbff4cfd12039d06646b4a636952b873b22129a4e5c6ea6ea9b57286949980add7bab5d6684c1", - "@esbuild/linux-arm@npm:0.25.2": "a89613faa8ce9f307eea4c2b4ada8cdb56e378716d5250fc163674032bfbdda8b8aacc730c6b5fa05b5e5bff04a9a11dd02934d69b2233ecf0ff58af4ef5bb45", - "@esbuild/linux-ia32@npm:0.25.2": "5907824945c067f092bb28807080a2617b5208583ef71b2091d57b6039df182735ba62ee0142e993260d80df3a5b7ae88c0fff28f2e4efd8254dd34de2f4ad95", - "@esbuild/linux-loong64@npm:0.25.2": "ed521bfa81db13fc628455fc0feec4e75150ed2248013baaf8fa7d6d278295d3a2b09196c79169b7331e50e6d3abf86ee5773ad28f8d5914bbe4034758a424c2", - "@esbuild/linux-mips64el@npm:0.25.2": "9961d5853e7ff048ae2cb3997136f96ca5180dcc483e88e2ae0d34ca8ec097af3cc7d7c8ac6303a3cf2582eadbe905fa97a38dd9b402f82b9e104a0070f04b79", - "@esbuild/linux-ppc64@npm:0.25.2": "9ee2360fa976e7c0e16b09fd551fba232e19ede65a326544d16bcae0c399e2937b853eab5649a52589e483c77dbc4ab5e082177ee70e6fd2de53c421314ea458", - "@esbuild/linux-riscv64@npm:0.25.2": "e6bff41e76d44a8d6f27a53b2aeb98c771f6215590d411a1b6b682aa41c96cc9ed8baa6d17412d09419b10778dc40ca75b6cfe71dc8e24f1bf5c1e7793e2c560", - "@esbuild/linux-s390x@npm:0.25.2": "34ca97c2506f1a1e646bc74f7cfff7bc7990052c3a2ade963c010c6bff6ae6135b9788f7972af2fb47e1a5380b26b8ca1b7a6c3f2bc9eaa7c9e7fdf227e38ab0", - "@esbuild/linux-x64@npm:0.25.2": "ac2c60f9dcbf9c55f66aef618b2a3218ddde92aad764aa6645b94b50c8c6242f1f97a0af956759738bca97686918dd71a0cfc82c73eadb0ab921918c9927a627", - "@esbuild/netbsd-arm64@npm:0.25.2": "6d820e86cbf10d305520ed7dbf4358bd4d75d333de39c100156dcc5619446916b4d5a1c1e07b838d22f6013aaf57bdd93187f2e97b1357a426e94e91b485e0e1", - "@esbuild/netbsd-x64@npm:0.25.2": "89153d1753254cd88f12b9e088a79398dcee11c0a1349a0886b54dd2db0ae2faf64ac0e364494f0cbd64163320cff94f02fc1fe827ff950daa0a27e50ef84a27", - "@esbuild/openbsd-arm64@npm:0.25.2": "71ede4e8f1086bece4e6d528b46ee3a493e0d33d749d5ac9050afd5471465badce7f36f1d04c1edddec75fde49e1229adb0f7758bcd508219a7598086b9a3c5c", - "@esbuild/openbsd-x64@npm:0.25.2": "95d90426c96d27980340d29c6d83f79ea2a22008041a5366c81820275ce36ba95ad0bf5e89ee199747a5921953587e7dcdc2e5a97368dec4efbcfc83ab5be4ee", - "@esbuild/sunos-x64@npm:0.25.2": "da59382e27897f98ee7261651eff1bcf42b1d659b078e500f664ef18137d70298f0bc0a50cf5af2311931e5b0454c6d3756a0ff9e560ab0a754ea56b0f04768c", - "@esbuild/win32-arm64@npm:0.25.2": "39f9a30d00a788ef168d7186f366397f7c471f1db3328efc0b9ff0861475f8a4484723b60ab6ab04c3bb27ebcdc8632e4883c28b5fa93b0606dd9f85f7904043", - "@esbuild/win32-ia32@npm:0.25.2": "74a7726d21a347faa1debdcd540e77fa5af9f96d5e0d625f2752d24a1616ac0fdea6582a0499935d9d964ee4c7a57ad8f30c6fe355089af2095bd0e41b70ea49", - "@esbuild/win32-x64@npm:0.25.2": "1e3f44cc53acaff9d45e2cded9811c750b7eb946f7b76d1fec66b862a89da800f9291269607d7cbb8d7e6068504571904d93a0813692e74fbae1fc321fe46440" + "@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537", + "@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865", + "@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99", + "@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48", + "@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d", + "@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d", + "@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0", + "@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e", + "@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e", + "@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b", + "@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235", + "@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4", + "@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2", + "@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38", + "@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1", + "@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab", + "@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6", + "@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73", + "@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab", + "@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e", + "@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8", + "@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825", + "@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639", + "@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b", + "@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980", + "@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3" } diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index eae02d40d918..b7a9ec779d58 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = version; - hash = "sha256-hXcPcGj+efvRVt3cHQc9KttE0/DOD9Bul6f3cY4ofgs="; + hash = "sha256-ysiHvRMOgVFTFKeMWjshZpIZAOTf+EbBQQm3dDeMB3I="; }; missingHashes = ./missing-hashes.json; @@ -30,7 +30,7 @@ stdenv.mkDerivation { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-V7ptquAohv0t5oA+3iTvlQOZoEtY5xWyhSoJP8jwYI8="; + hash = "sha256-jMJXNWvmlweCJu+xs2ucMtB6N+0r1cgP/aGt2zfH4iQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index f1e6556686ce..5a9dd02687e2 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.16"; + version = "3.17"; src = fetchFromGitHub { owner = "helio-fm"; repo = "helio-workstation"; tag = version; fetchSubmodules = true; - hash = "sha256-JzJA9Y710upgzvsgPEV9QzpRUTYI0i2yi6thnUAcrL0="; + hash = "sha256-uEo4dxwc1HksYGU5ssYp3rLugszSir2kKo4XxgqvSno="; }; buildInputs = [ diff --git a/pkgs/by-name/he/hey/package.nix b/pkgs/by-name/he/hey/package.nix index 18cf86788dd1..64b12a0576e2 100644 --- a/pkgs/by-name/he/hey/package.nix +++ b/pkgs/by-name/he/hey/package.nix @@ -21,7 +21,6 @@ buildGoModule rec { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "hey"; }; } diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index 906660f7dfd9..1b35c0466334 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -8,7 +8,7 @@ qt6, libusb1, protobuf, - asio, + asio_1_32_0, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace {hidviz,libhidx{,/libhidx{,_server{,_daemon}}}}/CMakeLists.txt \ --replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.10)' - substituteInPlace libhidx/cmake_modules/Findasio.cmake --replace-fail '/usr/include/asio' '${lib.getDev asio}/include/asio' + substituteInPlace libhidx/cmake_modules/Findasio.cmake --replace-fail '/usr/include/asio' '${lib.getDev asio_1_32_0}/include/asio' substituteInPlace libhidx/libhidx/src/Connector.cc --replace-fail '/usr/local/libexec' "$out/libexec" ''; @@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwebengine libusb1 protobuf - asio + # depends on io_service + asio_1_32_0 ]; meta = with lib; { diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 3e381fa8b2ca..27235f203e95 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,8 +2,8 @@ lib, appimageTools, fetchurl, - version ? "0.9.12.3", - hash ? "sha256-ImVZyO3ucBGtbXtHGocTap0GPt2/9x4nOLat2R4hwMQ=", + version ? "0.9.13.0", + hash ? "sha256-eD4wl56gd9k/9mpb4q1YPVQk5t36cr5INdsJOsFYg1g=", }: let diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index eeafb30d0e02..a07bb0716c28 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-11-30"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "83053e1d337f33e0b48250588006e4b9df2f0d9d"; - hash = "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ="; + rev = "27a6182347ccae90a88231ae0dc5dfa7d15815bb"; + hash = "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 121e3603bc0d..eddb9fc819a1 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 = "25.9.1-0"; + version = "25.11.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-mV/k+9NgHp9fyc8i0trewobvk3Fcu4JnRofHGV7dp70="; + hash = "sha256-twEBbr00uUYQq6fGcywb/L3SdCwMyT9ChoY7I7ytcuE="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-5UMZw3n7lINJSWf0SKmux7s8ISKGn+GppXbK1gcbeVs="; + hash = "sha256-TcEp+xJRPmQd8yR5OQelhd5KiDZd7IYxb8ZVnpKmYso="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-aW83wSbIV31sakiZxOaUd2QjxOwK2tcnaEMF9jrvrHg="; + hash = "sha256-QnGoMnPhynVBWrfWb6GUiUG1C49d0FgtSHigNpxMGXs="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix index 63b2477849b4..a29b038884a0 100644 --- a/pkgs/by-name/ho/horizon-eda/base.nix +++ b/pkgs/by-name/ho/horizon-eda/base.nix @@ -24,13 +24,13 @@ in # This base is used in horizon-eda and python3Packages.horizon-eda rec { pname = "horizon-eda"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - hash = "sha256-gigfwam7+KvmGAxex7Bi7a8xAmiNZ+YBZ5iMXneD4cw="; + hash = "sha256-YiTdY5FVbCSzohz0pZu8vLI2lohIbQYGAQIdQJwXAps="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hp/hpx/package.nix b/pkgs/by-name/hp/hpx/package.nix index 12e03214d444..d83564b94bdd 100644 --- a/pkgs/by-name/hp/hpx/package.nix +++ b/pkgs/by-name/hp/hpx/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { hash = "sha256-AhByaw1KnEDuRfKiN+/vQMbkG0BJ6Z3+h+QT8scFzAY="; }; + patches = [ + # https://github.com/STEllAR-GROUP/hpx/pull/6731 + # Fix build with asio >= 1.34.0 + ./remove_deprecated_asio_features.patch + ]; + propagatedBuildInputs = [ hwloc ]; buildInputs = [ asio diff --git a/pkgs/by-name/hp/hpx/remove_deprecated_asio_features.patch b/pkgs/by-name/hp/hpx/remove_deprecated_asio_features.patch new file mode 100644 index 000000000000..68d99bdb82a9 --- /dev/null +++ b/pkgs/by-name/hp/hpx/remove_deprecated_asio_features.patch @@ -0,0 +1,557 @@ +From f073c54f9c69108707dc477c890592049fcd95db Mon Sep 17 00:00:00 2001 +From: Hartmut Kaiser +Date: Mon, 30 Jun 2025 09:49:03 -0500 +Subject: [PATCH 1/2] Removing deprecated Asio features + +Signed-off-by: Hartmut Kaiser +--- + .../iostreams/src/server/output_stream.cpp | 30 ++++-- + examples/async_io/async_io_low_level.cpp | 5 + + libs/core/asio/include/hpx/asio/asio_util.hpp | 6 ++ + libs/core/asio/src/asio_util.cpp | 102 +++++++++++++++++- + libs/core/executors/src/service_executors.cpp | 10 +- + .../hpx/io_service/io_service_pool.hpp | 4 + + libs/core/io_service/src/io_service_pool.cpp | 4 + + libs/core/runtime_local/src/pool_timer.cpp | 2 +- + .../src/parcelport_gasnet.cpp | 6 ++ + .../parcelport_lci/src/parcelport_lci.cpp | 13 ++- + .../parcelport_mpi/src/parcelport_mpi.cpp | 6 ++ + 11 files changed, 168 insertions(+), 20 deletions(-) + +diff --git a/components/iostreams/src/server/output_stream.cpp b/components/iostreams/src/server/output_stream.cpp +index dd0a519b27f8..40f8ee0758a3 100644 +--- a/components/iostreams/src/server/output_stream.cpp ++++ b/components/iostreams/src/server/output_stream.cpp +@@ -34,7 +34,7 @@ namespace hpx::iostreams::detail { + ar << valid; + if (valid) + { +- ar& data_; ++ ar & data_; + } + } + +@@ -44,7 +44,7 @@ namespace hpx::iostreams::detail { + ar >> valid; + if (valid) + { +- ar& data_; ++ ar & data_; + } + } + } // namespace hpx::iostreams::detail +@@ -53,23 +53,29 @@ namespace hpx::iostreams::server { + /////////////////////////////////////////////////////////////////////////// + void output_stream::call_write_async(std::uint32_t locality_id, + std::uint64_t count, detail::buffer const& in, hpx::id_type /*this_id*/) +- { // {{{ ++ { + // Perform the IO operation. + pending_output_.output(locality_id, count, in, write_f, mtx_); +- } // }}} ++ } + + void output_stream::write_async(std::uint32_t locality_id, + std::uint64_t count, detail::buffer const& buf_in) +- { // {{{ ++ { + // Perform the IO in another OS thread. + detail::buffer in(buf_in); + // we need to capture the GID of the component to keep it alive long + // enough. + hpx::id_type this_id = this->get_id(); ++#if ASIO_VERSION >= 103400 ++ asio::post(hpx::get_thread_pool("io_pool")->get_io_service(), ++ hpx::bind_front(&output_stream::call_write_async, this, locality_id, ++ count, HPX_MOVE(in), HPX_MOVE(this_id))); ++#else + hpx::get_thread_pool("io_pool")->get_io_service().post( + hpx::bind_front(&output_stream::call_write_async, this, locality_id, + count, HPX_MOVE(in), HPX_MOVE(this_id))); +- } // }}} ++#endif ++ } + + /////////////////////////////////////////////////////////////////////////// + void output_stream::call_write_sync(std::uint32_t locality_id, +@@ -86,16 +92,22 @@ namespace hpx::iostreams::server { + + void output_stream::write_sync(std::uint32_t locality_id, + std::uint64_t count, detail::buffer const& buf_in) +- { // {{{ ++ { + // Perform the IO in another OS thread. + detail::buffer in(buf_in); ++#if ASIO_VERSION >= 103400 ++ asio::post(hpx::get_thread_pool("io_pool")->get_io_service(), ++ hpx::bind_front(&output_stream::call_write_sync, this, locality_id, ++ count, std::ref(in), ++ threads::thread_id_ref_type(threads::get_outer_self_id()))); ++#else + hpx::get_thread_pool("io_pool")->get_io_service().post( + hpx::bind_front(&output_stream::call_write_sync, this, locality_id, + count, std::ref(in), + threads::thread_id_ref_type(threads::get_outer_self_id()))); +- ++#endif + // Sleep until the worker thread wakes us up. + this_thread::suspend(threads::thread_schedule_state::suspended, + "output_stream::write_sync"); +- } // }}} ++ } + } // namespace hpx::iostreams::server +diff --git a/examples/async_io/async_io_low_level.cpp b/examples/async_io/async_io_low_level.cpp +index 75312984bf7f..153e5d124930 100644 +--- a/examples/async_io/async_io_low_level.cpp ++++ b/examples/async_io/async_io_low_level.cpp +@@ -39,7 +39,12 @@ hpx::future async_io(char const* string_to_write) + hpx::get_runtime().get_thread_pool("io_pool"); + + // ... and schedule the handler to run on one of its OS-threads. ++#if ASIO_VERSION >= 103400 ++ asio::post( ++ pool->get_io_service(), hpx::bind(&do_async_io, string_to_write, p)); ++#else + pool->get_io_service().post(hpx::bind(&do_async_io, string_to_write, p)); ++#endif + + return p->get_future(); + } +diff --git a/libs/core/asio/include/hpx/asio/asio_util.hpp b/libs/core/asio/include/hpx/asio/asio_util.hpp +index 286536692102..e79bb15c4cb1 100644 +--- a/libs/core/asio/include/hpx/asio/asio_util.hpp ++++ b/libs/core/asio/include/hpx/asio/asio_util.hpp +@@ -17,6 +17,7 @@ + #endif + #include + #include ++#include + + /* The asio support includes termios.h. + * The termios.h file on ppc64le defines these macros, which +@@ -50,7 +51,12 @@ namespace hpx::util { + [[nodiscard]] HPX_CORE_EXPORT std::string cleanup_ip_address( + std::string const& addr); + ++#if ASIO_VERSION >= 103400 ++ using endpoint_iterator_type = ++ asio::ip::basic_resolver_iterator; ++#else + using endpoint_iterator_type = asio::ip::tcp::resolver::iterator; ++#endif + + [[nodiscard]] endpoint_iterator_type HPX_CORE_EXPORT connect_begin( + std::string const& address, std::uint16_t port, +diff --git a/libs/core/asio/src/asio_util.cpp b/libs/core/asio/src/asio_util.cpp +index b5443e5dfa4e..bd248f3345d0 100644 +--- a/libs/core/asio/src/asio_util.cpp ++++ b/libs/core/asio/src/asio_util.cpp +@@ -54,8 +54,13 @@ namespace hpx::util { + { + using namespace asio::ip; + std::error_code ec; ++#if ASIO_VERSION >= 103400 ++ address_v4 const addr4 = //-V821 ++ make_address_v4(addr.c_str(), ec); ++#else + address_v4 const addr4 = //-V821 + address_v4::from_string(addr.c_str(), ec); ++#endif + if (!ec) + { // it's an IPV4 address + ep = tcp::endpoint(address(addr4), port); +@@ -64,8 +69,13 @@ namespace hpx::util { + + if (!force_ipv4) + { ++#if ASIO_VERSION >= 103400 ++ address_v6 const addr6 = //-V821 ++ make_address_v6(addr.c_str(), ec); ++#else + address_v6 const addr6 = //-V821 + address_v6::from_string(addr.c_str(), ec); ++#endif + if (!ec) + { // it's an IPV6 address + ep = tcp::endpoint(address(addr6), port); +@@ -108,8 +118,26 @@ namespace hpx::util { + { + // resolve the given address + tcp::resolver resolver(io_service); +- tcp::resolver::query query(hostname, std::to_string(port)); + ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = resolver.resolve( ++ asio::ip::tcp::v4(), hostname, std::to_string(port)); ++ ++ auto it = resolver_results.begin(); ++ auto end = resolver_results.begin(); ++ ++ // skip ipv6 results, if required ++ if (it == end && !force_ipv4) ++ { ++ resolver_results = resolver.resolve( ++ asio::ip::tcp::v6(), hostname, std::to_string(port)); ++ it = resolver_results.begin(); ++ } ++ ++ HPX_ASSERT(it != end); ++ return *it; ++#else ++ tcp::resolver::query query(hostname, std::to_string(port)); + asio::ip::tcp::resolver::iterator it = resolver.resolve(query); + + // skip ipv6 results, if required +@@ -121,9 +149,9 @@ namespace hpx::util { + ++it; + } + } +- + HPX_ASSERT(it != asio::ip::tcp::resolver::iterator()); + return *it; ++#endif + } + catch (std::system_error const&) + { +@@ -149,8 +177,21 @@ namespace hpx::util { + { + asio::io_context io_service; + tcp::resolver resolver(io_service); ++ ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = resolver.resolve( ++ asio::ip::tcp::v4(), asio::ip::host_name(), ""); ++ auto it = resolver_results.begin(); ++ if (it == resolver_results.end()) ++ { ++ resolver_results = resolver.resolve( ++ asio::ip::tcp::v6(), asio::ip::host_name(), ""); ++ it = resolver_results.begin(); ++ } ++#else + tcp::resolver::query query(asio::ip::host_name(), ""); + tcp::resolver::iterator it = resolver.resolve(query); ++#endif + tcp::endpoint endpoint = *it; + return endpoint.address().to_string(); + } +@@ -230,8 +271,14 @@ namespace hpx::util { + tcp::endpoint ep; + if (util::get_endpoint(address, port, ep)) + { ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = ++ tcp::resolver::results_type::create(ep, address, port_str); ++ return resolver_results.begin(); ++#else + return { + tcp::resolver::results_type::create(ep, address, port_str)}; ++#endif + } + } + catch (std::system_error const&) +@@ -244,10 +291,24 @@ namespace hpx::util { + { + // resolve the given address + tcp::resolver resolver(io_service); ++ ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = resolver.resolve(asio::ip::tcp::v4(), ++ !address.empty() ? address : asio::ip::host_name(), port_str); ++ auto it = resolver_results.begin(); ++ if (it == resolver_results.end()) ++ { ++ resolver_results = resolver.resolve(asio::ip::tcp::v6(), ++ !address.empty() ? address : asio::ip::host_name(), ++ port_str); ++ it = resolver_results.begin(); ++ } ++ return it; ++#else + tcp::resolver::query query( + !address.empty() ? address : asio::ip::host_name(), port_str); +- + return {resolver.resolve(query)}; ++#endif + } + catch (std::system_error const&) + { +@@ -276,8 +337,14 @@ namespace hpx::util { + tcp::endpoint ep; + if (util::get_endpoint(address, port, ep)) + { ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = ++ tcp::resolver::results_type::create(ep, address, port_str); ++ return resolver_results.begin(); ++#else + return { + tcp::resolver::results_type::create(ep, address, port_str)}; ++#endif + } + } + catch (std::system_error const&) +@@ -290,9 +357,21 @@ namespace hpx::util { + { + // resolve the given address + tcp::resolver resolver(io_service); ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = ++ resolver.resolve(asio::ip::tcp::v4(), address, port_str); ++ auto it = resolver_results.begin(); ++ if (it == resolver_results.end()) ++ { ++ resolver_results = ++ resolver.resolve(asio::ip::tcp::v6(), address, port_str); ++ it = resolver_results.begin(); ++ } ++ return it; ++#else + tcp::resolver::query query(address, port_str); +- + return {resolver.resolve(query)}; ++#endif + } + catch (std::system_error const&) + { +@@ -306,9 +385,22 @@ namespace hpx::util { + { + // resolve the given address + tcp::resolver resolver(io_service); +- tcp::resolver::query query(asio::ip::host_name(), port_str); + ++#if ASIO_VERSION >= 103400 ++ auto resolver_results = resolver.resolve( ++ asio::ip::tcp::v4(), asio::ip::host_name(), port_str); ++ auto it = resolver_results.begin(); ++ if (it == resolver_results.end()) ++ { ++ resolver_results = resolver.resolve( ++ asio::ip::tcp::v6(), asio::ip::host_name(), port_str); ++ it = resolver_results.begin(); ++ } ++ return it; ++#else ++ tcp::resolver::query query(asio::ip::host_name(), port_str); + return {resolver.resolve(query)}; ++#endif + } + catch (std::system_error const&) + { +diff --git a/libs/core/executors/src/service_executors.cpp b/libs/core/executors/src/service_executors.cpp +index 4e3ba88a2392..3e39e59ede45 100644 +--- a/libs/core/executors/src/service_executors.cpp ++++ b/libs/core/executors/src/service_executors.cpp +@@ -1,4 +1,4 @@ +-// Copyright (c) 2023 Hartmut Kaiser ++// Copyright (c) 2023-2025 Hartmut Kaiser + // + // SPDX-License-Identifier: BSL-1.0 + // Distributed under the Boost Software License, Version 1.0. (See accompanying +@@ -10,12 +10,20 @@ + #include + + #include ++#include ++#if ASIO_VERSION >= 103400 ++#include ++#endif + + namespace hpx::parallel::execution::detail { + + void service_executor::post( + hpx::util::io_service_pool* pool, hpx::function&& f) + { ++#if ASIO_VERSION >= 103400 ++ asio::post(pool->get_io_service(), HPX_MOVE(f)); ++#else + pool->get_io_service().post(HPX_MOVE(f)); ++#endif + } + } // namespace hpx::parallel::execution::detail +diff --git a/libs/core/io_service/include/hpx/io_service/io_service_pool.hpp b/libs/core/io_service/include/hpx/io_service/io_service_pool.hpp +index 8d800f36d18d..8441886b9a1d 100644 +--- a/libs/core/io_service/include/hpx/io_service/io_service_pool.hpp ++++ b/libs/core/io_service/include/hpx/io_service/io_service_pool.hpp +@@ -19,6 +19,10 @@ + #endif + #include + #include ++#include ++#if ASIO_VERSION >= 103400 ++#include ++#endif + + // The boost asio support includes termios.h. The termios.h file on ppc64le + // defines these macros, which are also used by blaze, blaze_tensor as Template +diff --git a/libs/core/io_service/src/io_service_pool.cpp b/libs/core/io_service/src/io_service_pool.cpp +index 44eb3318c04b..ca2fe443e219 100644 +--- a/libs/core/io_service/src/io_service_pool.cpp ++++ b/libs/core/io_service/src/io_service_pool.cpp +@@ -259,7 +259,11 @@ namespace hpx::util { + for (std::size_t i = 0; i < pool_size_; ++i) + { + work_.emplace_back(initialize_work(*io_services_[i])); ++#if ASIO_VERSION >= 103400 ++ io_services_[i]->restart(); ++#else + io_services_[i]->reset(); ++#endif + } + + continue_barrier_->wait(); +diff --git a/libs/core/runtime_local/src/pool_timer.cpp b/libs/core/runtime_local/src/pool_timer.cpp +index 7487b5a72692..d2723d2452e8 100644 +--- a/libs/core/runtime_local/src/pool_timer.cpp ++++ b/libs/core/runtime_local/src/pool_timer.cpp +@@ -146,7 +146,7 @@ namespace hpx::util::detail { + } + + HPX_ASSERT(timer_ != nullptr); +- timer_->expires_from_now(time_duration.value()); ++ timer_->expires_at(time_duration.from_now()); + timer_->async_wait(hpx::bind_front( //-V779 + &pool_timer::timer_handler, this->shared_from_this())); + +diff --git a/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp b/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp +index 77da0c839b16..16160af101b7 100644 +--- a/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp ++++ b/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp +@@ -142,8 +142,14 @@ namespace hpx::parcelset { + + for (std::size_t i = 0; i != io_service_pool_.size(); ++i) + { ++#if ASIO_VERSION >= 103400 ++ asio::post( ++ io_service_pool_.get_io_service(static_cast(i)), ++ hpx::bind(&parcelport::io_service_work, this)); ++#else + io_service_pool_.get_io_service(int(i)).post( + hpx::bind(&parcelport::io_service_work, this)); ++#endif + } + return true; + } +diff --git a/libs/full/parcelport_lci/src/parcelport_lci.cpp b/libs/full/parcelport_lci/src/parcelport_lci.cpp +index d9083191376a..40cf14faba5c 100644 +--- a/libs/full/parcelport_lci/src/parcelport_lci.cpp ++++ b/libs/full/parcelport_lci/src/parcelport_lci.cpp +@@ -98,8 +98,13 @@ namespace hpx::parcelset::policies::lci { + sender_p->run(); + for (std::size_t i = 0; i != io_service_pool_.size(); ++i) + { ++#if ASIO_VERSION >= 103400 ++ asio::post(io_service_pool_.get_io_service(static_cast(i)), ++ hpx::bind(&parcelport::io_service_work, this)); ++#else + io_service_pool_.get_io_service(int(i)).post( + hpx::bind(&parcelport::io_service_work, this)); ++#endif + } + return true; + } +@@ -167,10 +172,10 @@ namespace hpx::parcelset::policies::lci { + static_cast(hpx::get_local_worker_thread_num()); + HPX_ASSERT(prg_thread_id < config_t::progress_thread_num); + for (int i = prg_thread_id * config_t::ndevices / +- config_t::progress_thread_num; +- i < (prg_thread_id + 1) * config_t::ndevices / +- config_t::progress_thread_num; +- ++i) ++ config_t::progress_thread_num; ++ i < (prg_thread_id + 1) * config_t::ndevices / ++ config_t::progress_thread_num; ++ ++i) + { + devices_to_progress.push_back(&devices[i]); + } +diff --git a/libs/full/parcelport_mpi/src/parcelport_mpi.cpp b/libs/full/parcelport_mpi/src/parcelport_mpi.cpp +index e30025899e76..c319c54df7ef 100644 +--- a/libs/full/parcelport_mpi/src/parcelport_mpi.cpp ++++ b/libs/full/parcelport_mpi/src/parcelport_mpi.cpp +@@ -181,8 +181,14 @@ namespace hpx::parcelset { + + for (std::size_t i = 0; i != io_service_pool_.size(); ++i) + { ++#if ASIO_VERSION >= 103400 ++ asio::post( ++ io_service_pool_.get_io_service(static_cast(i)), ++ hpx::bind(&parcelport::io_service_work, this)); ++#else + io_service_pool_.get_io_service(static_cast(i)) + .post(hpx::bind(&parcelport::io_service_work, this)); ++#endif + } + return true; + } + +From 85805f56579fe6fa6c5905daa0d228eba26c40c3 Mon Sep 17 00:00:00 2001 +From: Hartmut Kaiser +Date: Mon, 30 Jun 2025 10:31:26 -0500 +Subject: [PATCH 2/2] Changing some CIs to use Asio 1.34.2 + +Signed-off-by: Hartmut Kaiser +--- + .github/workflows/linux_debug.yml | 1 + + .github/workflows/macos_debug.yml | 1 + + .github/workflows/windows_debug_vs2022.yml | 1 + + libs/full/parcelport_lci/src/parcelport_lci.cpp | 2 ++ + 4 files changed, 5 insertions(+) + +diff --git a/.github/workflows/linux_debug.yml b/.github/workflows/linux_debug.yml +index 551e6d7215b2..0048b533326f 100644 +--- a/.github/workflows/linux_debug.yml ++++ b/.github/workflows/linux_debug.yml +@@ -26,6 +26,7 @@ jobs: + -DCMAKE_BUILD_TYPE=Debug \ + -DHPX_WITH_MALLOC=system \ + -DHPX_WITH_FETCH_ASIO=ON \ ++ -DHPX_WITH_ASIO_TAG=asio-1-34-2 \ + -DHPX_WITH_EXAMPLES=ON \ + -DHPX_WITH_TESTS=ON \ + -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \ +diff --git a/.github/workflows/macos_debug.yml b/.github/workflows/macos_debug.yml +index 7d0936730d54..5406fc0be0f1 100644 +--- a/.github/workflows/macos_debug.yml ++++ b/.github/workflows/macos_debug.yml +@@ -29,6 +29,7 @@ jobs: + -GNinja \ + -DCMAKE_BUILD_TYPE=Debug \ + -DHPX_WITH_FETCH_ASIO=ON \ ++ -DHPX_WITH_ASIO_TAG=asio-1-34-2 \ + -DHPX_WITH_EXAMPLES=ON \ + -DHPX_WITH_TESTS=ON \ + -DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=3 \ +diff --git a/.github/workflows/windows_debug_vs2022.yml b/.github/workflows/windows_debug_vs2022.yml +index cebecd992140..f91765418163 100644 +--- a/.github/workflows/windows_debug_vs2022.yml ++++ b/.github/workflows/windows_debug_vs2022.yml +@@ -31,6 +31,7 @@ jobs: + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' \ + -DHPX_WITH_FETCH_ASIO=ON \ ++ -DHPX_WITH_ASIO_TAG=asio-1-34-2 \ + -DHPX_WITH_EXAMPLES=ON \ + -DHPX_WITH_TESTS=ON \ + -DHPX_WITH_TESTS_EXAMPLES=ON \ +diff --git a/libs/full/parcelport_lci/src/parcelport_lci.cpp b/libs/full/parcelport_lci/src/parcelport_lci.cpp +index 40cf14faba5c..b9d1bcf293e9 100644 +--- a/libs/full/parcelport_lci/src/parcelport_lci.cpp ++++ b/libs/full/parcelport_lci/src/parcelport_lci.cpp +@@ -171,6 +171,7 @@ namespace hpx::parcelset::policies::lci { + int prg_thread_id = + static_cast(hpx::get_local_worker_thread_num()); + HPX_ASSERT(prg_thread_id < config_t::progress_thread_num); ++ // clang-format off + for (int i = prg_thread_id * config_t::ndevices / + config_t::progress_thread_num; + i < (prg_thread_id + 1) * config_t::ndevices / +@@ -179,6 +180,7 @@ namespace hpx::parcelset::policies::lci { + { + devices_to_progress.push_back(&devices[i]); + } ++ // clang-format on + } + } + } + diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index 046cb4be7ef8..f484915fcfc2 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.4"; + version = "2.5"; format = "setuptools"; src = fetchFromGitHub { owner = "fermitools"; repo = "htgettoken"; tag = "v${version}"; - hash = "sha256-3xBACXxH5G1MO2dNFFSL1Rssc8RdauvLZ4Tx2djOgyw="; + hash = "sha256-CUzkivrkvMr8EE00tjHswyK5WidQjmki5nLYpeb8jjU="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix index fa5c7f20a965..7c158685a512 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { license = licenses.libpng; # very close to it - the 3 clauses are identical homepage = "http://html-tidy.org"; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; mainProgram = "tidy"; }; } diff --git a/pkgs/by-name/ht/httpstat/package.nix b/pkgs/by-name/ht/httpstat/package.nix index 826e2b874db8..e82c1a9182b5 100644 --- a/pkgs/by-name/ht/httpstat/package.nix +++ b/pkgs/by-name/ht/httpstat/package.nix @@ -30,6 +30,5 @@ python3Packages.buildPythonApplication rec { mainProgram = "httpstat"; homepage = "https://github.com/reorx/httpstat"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index fad93cf36372..9016a910ac9d 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${version}"; - hash = "sha256-UZybzKPBattd2WIkATJEywPiRJ1v6B20it5Jqnle7Xo="; + hash = "sha256-Ujpcl16Ftyi6W7OjofrjEobnRzAeBulsmWUEcDsmdmM="; }; - vendorHash = "sha256-T9nq2Ad2UhndOC5KUZ+ix4PzmzKD1la2zmo5L6vq2Yk="; + vendorHash = "sha256-0p2JSmmUQBLpQno3XjMHnRD9Rva627J/dd2n03oZ1WI="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/by-name/ht/httraqt/package.nix b/pkgs/by-name/ht/httraqt/package.nix new file mode 100644 index 000000000000..4accd79bbaf8 --- /dev/null +++ b/pkgs/by-name/ht/httraqt/package.nix @@ -0,0 +1,64 @@ +{ + stdenv, + lib, + fetchurl, + cmake, + pkg-config, + httrack, + qt6Packages, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "httraqt"; + version = "1.4.11"; + + src = fetchurl { + url = "mirror://sourceforge/httraqt/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-HfnUlJifpzWiP1rb+Kn3I/H6nYBeEB6cXVI5pu28K5E="; + }; + + buildInputs = [ + httrack + qt6Packages.qtbase + qt6Packages.qtmultimedia + ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt6Packages.wrapQtAppsHook + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" \ + --replace-fail "CMAKE_POLICY(SET CMP0003 OLD)" "" \ + --replace-fail "CMAKE_POLICY(SET CMP0015 OLD)" "" + + substituteInPlace cmake/FindHttrack.cmake \ + --replace-fail /usr/include/httrack/ ${httrack}/include/httrack/ + + substituteInPlace distribution/posix/CMakeLists.txt \ + --replace-fail /usr/share $out/share + + substituteInPlace desktop/httraqt.desktop \ + --replace-fail Exec=httraqt Exec=$out/bin/httraqt + + substituteInPlace sources/main/httraqt.cpp \ + --replace-fail /usr/share/httraqt/ $out/share/httraqt + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + broken = stdenv.hostPlatform.isDarwin; + description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; + mainProgram = "httraqt"; + homepage = "https://httraqt.sourceforge.net"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/hu/hub/package.nix b/pkgs/by-name/hu/hub/package.nix index 5dbfba555ffb..f56a610e5635 100644 --- a/pkgs/by-name/hu/hub/package.nix +++ b/pkgs/by-name/hu/hub/package.nix @@ -77,6 +77,6 @@ buildGoModule rec { description = "Command-line wrapper for git that makes you better at GitHub"; homepage = "https://hub.github.com/"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 751af66bee41..a9bbe0138ef8 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -81,7 +81,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.asl20; mainProgram = "hugo"; maintainers = with lib.maintainers; [ - Br1ght0ne Frostman savtrip ]; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index a8e40efcdf39..4dab94d9e0b5 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -123,7 +123,7 @@ let UUID4Tiny XMLSimple YAML - (nix.libs.nix-perl-bindings or nix.perl-bindings) + (nix.libs.nix-perl-bindings or nix.perl-bindings or null) git ]; }; diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 18f0b9992470..d53ffa4fe712 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-A68WatvQrq7QI7DvzFNkG5Sgsz6fZkaxc1soeAaDwOs="; + hash = "sha256-wYhkuDA+Fxj4blVBw670UQ3uAvBfM5suWq5LOixI9Ps="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hydroxide/package.nix b/pkgs/by-name/hy/hydroxide/package.nix index 226198d7de63..8719e19d5cbb 100644 --- a/pkgs/by-name/hy/hydroxide/package.nix +++ b/pkgs/by-name/hy/hydroxide/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { description = "Third-party, open-source ProtonMail bridge"; homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "hydroxide"; }; } diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix index 51dd533f7726..4a2676384e38 100644 --- a/pkgs/by-name/hy/hyperspeedcube/package.nix +++ b/pkgs/by-name/hy/hyperspeedcube/package.nix @@ -119,7 +119,10 @@ rustPlatform.buildRustPackage rec { records and runs on all major operating systems plus the web. ''; homepage = "https://ajfarkas.dev/hyperspeedcube/"; - license = lib.licenses.cc-by-nc-sa-40; + license = with lib.licenses; [ + mit + asl20 + ]; maintainers = [ lib.maintainers.omnipotententity ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index e95c789633a6..a58f9bf3c70f 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.52.1-b", - "commit_hash": "967c3c7404d4fa00234e29c70df3e263386d2597", - "commit_message": "version: bump to 0.52.1", - "date": "2025-11-09", - "tag": "v0.52.1" + "branch": "v0.52.2-b", + "commit_hash": "386376400119dd46a767c9f8c8791fd22c7b6e61", + "commit_message": "[gha] Nix: update inputs", + "date": "2025-12-03", + "tag": "v0.52.2" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index ea7641639e2d..4c0c200850e2 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -91,14 +91,14 @@ assert assertMsg ( customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.52.1"; + version = "0.52.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-Lr8kwriXtUxjYsi1sGRMIR2LZilgrxYQA1TTmbpSJ+g="; + hash = "sha256-R2Hm7XbW8CTLEIeYCAlSQ3U5bFhn76FC17hEy/ws8EM="; }; postPatch = '' diff --git a/pkgs/by-name/hy/hyprlax/package.nix b/pkgs/by-name/hy/hyprlax/package.nix new file mode 100644 index 000000000000..415c5627c561 --- /dev/null +++ b/pkgs/by-name/hy/hyprlax/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + wayland, + wayland-protocols, + wayland-scanner, + libGL, +}: + +stdenv.mkDerivation rec { + pname = "hyprlax"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "sandwichfarm"; + repo = "hyprlax"; + tag = "v${version}"; + hash = "sha256-RIeMsQt6MxSTI7TunIxk7wd08sYmr3EvjAQifr+M4e8="; + }; + + nativeBuildInputs = [ + pkg-config + wayland-scanner + ]; + + buildInputs = [ + wayland + wayland-protocols + libGL + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = { + description = "Dynamic parallax wallpaper engine with multi-compositor support for Linux"; + longDescription = '' + hyprlax is a GPU-accelerated Wayland wallpaper daemon with parallax effects. + + Features: + - Buttery smooth GPU-accelerated animations with configurable FPS + - Multi-layer parallax with depth-of-field blur effects + - Multi-compositor support (Hyprland, Sway, River, Niri, generic Wayland) + - Customizable per-layer easing functions, delays, and animation parameters + - Dynamic layer management via IPC (add, remove, modify layers at runtime) + - Lightweight native client using compositor-specific protocols + - Seamless animation interrupts and chaining + ''; + homepage = "https://github.com/sandwichfarm/hyprlax"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers._6543 ]; + mainProgram = "hyprlax"; + }; +} diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix index af44655ae650..6e2ec524b221 100644 --- a/pkgs/by-name/hy/hyprpanel/package.nix +++ b/pkgs/by-name/hy/hyprpanel/package.nix @@ -121,7 +121,7 @@ ags.bundle { description = "Bar/Panel for Hyprland with extensive customizability"; homepage = "https://github.com/Jas-SinghFSU/HyprPanel"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; mainProgram = "hyprpanel"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 6b305826956f..12ad67d1497b 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, pkg-config, wrapGAppsHook4, - gtk4, gtk4-layer-shell, hyprland, gcc, pixman, + libadwaita, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.7.2"; + version = "4.8.1"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-6WC7vcPdtKR4iw5VHF88i/NQ+EBfvGxex8AvJONnG5w="; + hash = "sha256-NsFOXepWzgbopnoqwg8EekDLbj01jr8vjaEz/F3QFKU="; }; - cargoHash = "sha256-g23W5cgGxWNyJ4uew2x12vgF5Bvaid1+phV2fxyHbas="; + cargoHash = "sha256-/4mC1cgQKOSOME8WT61hggyHPALj0knVPtGZTa7lO1w="; nativeBuildInputs = [ wrapGAppsHook4 @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ - gtk4 + libadwaita gtk4-layer-shell ]; diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix index 6fb5c64d206a..b4c7f61f4473 100644 --- a/pkgs/by-name/hy/hyprwire/package.nix +++ b/pkgs/by-name/hy/hyprwire/package.nix @@ -11,13 +11,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprwire"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwire"; tag = "v${finalAttrs.version}"; - hash = "sha256-EoLyrxFJVr7igDhhVNRk2rRpEEOJllRWvYg5XZ3J5y0="; + hash = "sha256-9UcCdwe7vPgEcJJ64JseBQL0ZJZoxp/2iFuvfRI+9zk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 83b9fa9aa0cb..a04b37442a18 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; mainProgram = "i2pd"; }; diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index 0e36d6600a36..345fd4c22b9e 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -93,7 +93,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "i3status-rs"; maintainers = with maintainers; [ backuitist - globin ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/if/ifstate/package.nix b/pkgs/by-name/if/ifstate/package.nix index e030cca79e49..467b0485346b 100644 --- a/pkgs/by-name/if/ifstate/package.nix +++ b/pkgs/by-name/if/ifstate/package.nix @@ -13,13 +13,13 @@ }: let - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "liske"; repo = "ifstate"; tag = version; - hash = "sha256-p96wyvKDTckdUnPpZB2LS/c/d2OJA7iE+iH2QtvpVy4="; + hash = "sha256-gDeMVnseOLBGpyyjE/L60ujp0LZGf3uzlKfPiQB4VHA="; }; docs = stdenv.mkDerivation { pname = "ifstate-docs"; diff --git a/pkgs/by-name/im/immichframe/deps.json b/pkgs/by-name/im/immichframe/deps.json new file mode 100644 index 000000000000..abf5e32343d8 --- /dev/null +++ b/pkgs/by-name/im/immichframe/deps.json @@ -0,0 +1,467 @@ +[ + { + "pname": "AwesomeAssertions", + "version": "9.2.0", + "hash": "sha256-s5j46b6KchKwjQgiXvCYUZLk5Xtk4sb1wSh25f8ShFc=" + }, + { + "pname": "BloomFilter.NetCore", + "version": "2.5.3", + "hash": "sha256-UfH3JZgUh8zj34+E1DLZdKo9Dyqb/Ek8qmg4kx5N818=" + }, + { + "pname": "Castle.Core", + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" + }, + { + "pname": "Ical.Net", + "version": "4.3.1", + "hash": "sha256-jpohvCiUBe61A3O+BJwCqsPW+3jUt4cKeCqZb/0cw0M=" + }, + { + "pname": "Microsoft.ApplicationInsights", + "version": "2.23.0", + "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0=" + }, + { + "pname": "Microsoft.AspNetCore.Mvc.Testing", + "version": "8.0.20", + "hash": "sha256-jSWZfbewG7LqrqVQ4wmwj4K6OPGslm0wt4D5wK2TlFc=" + }, + { + "pname": "Microsoft.AspNetCore.SpaProxy", + "version": "8.0.20", + "hash": "sha256-kjvVZQBbE6fjKdbZsg+BNCRHh3d5fvxNNFaCF5fxQSI=" + }, + { + "pname": "Microsoft.AspNetCore.TestHost", + "version": "8.0.20", + "hash": "sha256-M/MTiN0nNQ8eKQn9r8TnIXYWxOYgBHNG/PZtvnInmDw=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.14.1", + "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Client", + "version": "8.0.20", + "hash": "sha256-BcgOnv5xXl42ZocyzNrgSiUA6DbGoseTCV8RDi/n8Eo=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Server", + "version": "6.0.5", + "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4=" + }, + { + "pname": "Microsoft.Extensions.Caching.Abstractions", + "version": "9.0.5", + "hash": "sha256-TUsEWQLao2UCQi/Lqqlc5wnjMCI52tJ1A6NlODdRLOU=" + }, + { + "pname": "Microsoft.Extensions.Caching.Memory", + "version": "9.0.5", + "hash": "sha256-tCNn5RSGZ+J3gd68cDGaHofB3ZTcvOlLXeY/4TG5INU=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "6.0.0", + "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "6.0.0", + "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.0", + "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + }, + { + "pname": "Microsoft.Extensions.Configuration.CommandLine", + "version": "8.0.0", + "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg=" + }, + { + "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", + "version": "8.0.0", + "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "8.0.1", + "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "8.0.1", + "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" + }, + { + "pname": "Microsoft.Extensions.Configuration.UserSecrets", + "version": "8.0.1", + "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.0", + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.5", + "hash": "sha256-JSGmzV9CdZaRIBDbnUXCMlrIk2oVnrQSCL79xoNmjeY=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "8.0.2", + "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "8.0.0", + "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "8.0.0", + "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "8.0.0", + "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + }, + { + "pname": "Microsoft.Extensions.Hosting", + "version": "8.0.1", + "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + }, + { + "pname": "Microsoft.Extensions.Http", + "version": "8.0.1", + "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.1", + "hash": "sha256-v3FWpuKXlBIW5NwqQx0Ffb6y58RlevIyO/byqeLphJ8=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.5", + "hash": "sha256-ILcK06TEbVwxUZ3PCpGkjg69H6PGwTXnN512JJ8F9KI=" + }, + { + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "8.0.1", + "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" + }, + { + "pname": "Microsoft.Extensions.Logging.Console", + "version": "8.0.1", + "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Debug", + "version": "8.0.1", + "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" + }, + { + "pname": "Microsoft.Extensions.Logging.EventLog", + "version": "8.0.1", + "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" + }, + { + "pname": "Microsoft.Extensions.Logging.EventSource", + "version": "8.0.1", + "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "6.0.0", + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.5", + "hash": "sha256-iz/ox4wpQBX0Qk97qRYlmmJPuuoV2urN03uGxAkp/SM=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "6.0.0", + "hash": "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "8.0.0", + "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "6.0.0", + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.5", + "hash": "sha256-3ctJMOwnEsBSNqcrh77IItX2wtOmjM/b8OTXJUZ/P0o=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.14.1", + "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A=" + }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.23", + "hash": "sha256-YD2oxM/tlNpK5xUeHF85xdqcpBzHioUSyRjpN2A7KcY=" + }, + { + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.9.0", + "hash": "sha256-JT91ThKLEyoRS/8ZJqZwlSTT7ofC2QhNqPFI3pYmMaw=" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.9.0", + "hash": "sha256-oscZOEKw7gM6eRdDrOS3x+CwqIvXWRmfmi0ugCxBRw0=" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.9.0", + "hash": "sha256-CadXLWD093sUDaWhnppzD9LvpxSRqqt93ZEOFiIAPyw=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.9.0", + "hash": "sha256-6nzjoYbJOh7v/GB7d+TDuM0l/xglCshFX6KWjg7+cFI=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.9.0", + "hash": "sha256-/bileP4b+9RZp8yjgS6eynXwc2mohyyzf6p/0LZJd8I=" + }, + { + "pname": "Microsoft.TestPlatform.AdapterUtilities", + "version": "17.13.0", + "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.13.0", + "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.14.1", + "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.14.1", + "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" + }, + { + "pname": "Moq", + "version": "4.20.72", + "hash": "sha256-+uAc/6xtzij9YnmZrhZwc+4vUgx6cppZsWQli3CGQ8o=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, + { + "pname": "NodaTime", + "version": "3.2.0", + "hash": "sha256-kt59MWEzmMFBgpw5tOPlcYwZKe74WkA9N5ggrLS3tUM=" + }, + { + "pname": "NSwag.ApiDescription.Client", + "version": "13.20.0", + "hash": "sha256-r/BtE46yFdM9MuoaVYNhO7vvdBICDsM8ROXZldxFIeY=" + }, + { + "pname": "NSwag.MSBuild", + "version": "13.20.0", + "hash": "sha256-HarUF6peOsd12saco8+Na4TnOEh+Gl2MJelSfnBVRhQ=" + }, + { + "pname": "NUnit", + "version": "4.4.0", + "hash": "sha256-5geF5QOF+X/WkuCEgkPVKH4AdKx4U0olpU07S8+G3nU=" + }, + { + "pname": "NUnit.Analyzers", + "version": "4.10.0", + "hash": "sha256-wkThcI2ratJoCnstOIj/jB5muGQbdDPFbRK1r7PHEBU=" + }, + { + "pname": "NUnit3TestAdapter", + "version": "5.2.0", + "hash": "sha256-ybTutL4VkX/fq61mS+O3Ruh+adic4fpv+MKgQ0IZvGg=" + }, + { + "pname": "OpenWeatherMap.API", + "version": "2.1.2", + "hash": "sha256-rosFFZzqPKNPuItlxGjeeCv+jqDzVvyiKy4vxmUFP5A=" + }, + { + "pname": "Swashbuckle.AspNetCore", + "version": "8.1.4", + "hash": "sha256-gZVM5/6HMBAuuQI2uXdoAUJOG8BkGuh/3ZuWlGME8vk=" + }, + { + "pname": "Swashbuckle.AspNetCore.Swagger", + "version": "8.1.4", + "hash": "sha256-6iqC/F581my20C+/3ORTM6uVUj+M095cRQyCIAo9AyA=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerGen", + "version": "8.1.4", + "hash": "sha256-m0ixgc45HCX2xrvrnhy3WYU/r/basjat535n4rN+vOY=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerUI", + "version": "8.1.4", + "hash": "sha256-zkVzBxkxGh5WyhFEOiZknez9GBeBKXTH2ySf2/BnSV4=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "5.0.0", + "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.5", + "hash": "sha256-fB8970CWgKWI1UwAaDa9D2yaMUiQ74ULGU7GMsr2u/o=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "6.0.0", + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "ThumbHash", + "version": "2.1.1", + "hash": "sha256-pLlNMjUvCHZ2cJi2nco1ikFq/plIklA3x8Cgcag3x44=" + }, + { + "pname": "UnitsNet", + "version": "5.29.0", + "hash": "sha256-LdHK42YM1X3Hq3VWWh9slhgEpUsQa2kM335bAitpT+A=" + }, + { + "pname": "YamlDotNet", + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" + } +] diff --git a/pkgs/by-name/im/immichframe/package.nix b/pkgs/by-name/im/immichframe/package.nix new file mode 100644 index 000000000000..dbc88fa3b41e --- /dev/null +++ b/pkgs/by-name/im/immichframe/package.nix @@ -0,0 +1,86 @@ +{ + buildDotnetModule, + buildNpmPackage, + dotnet-sdk, + fetchFromGitHub, + fetchpatch, + lib, + nixosTests, + writeShellApplication, +}: + +let + version = "1.0.29.0"; + src = fetchFromGitHub { + owner = "immichFrame"; + repo = "immichFrame"; + rev = "v${version}"; + hash = "sha256-YFh+/QWYYtQzBVJUyUuhhKqi9/5waWVX+lw/tov++ws="; + }; + + publishApi = buildDotnetModule { + pname = "immichframe"; + inherit version src; + projectFile = "ImmichFrame.WebApi/ImmichFrame.WebApi.csproj"; + nugetDeps = ./deps.json; + dotnet-runtime = dotnet-sdk.aspnetcore; + + patches = [ + # This not-yet-released commit has landed upstream. It adds a + # `IMMICHFRAME_CONFIG_PATH` environment variable for a "configurable" + # config path. + (fetchpatch { + name = "Configurable config path"; + url = "https://github.com/immichFrame/ImmichFrame/commit/f6680f23bcf107ce27372dfb37809c0f92ebb2f2.patch"; + hash = "sha256-dQnspQEKixQgBpCvNxrYL51z5wg5BhdN0uTuaXgKQZU="; + }) + # This patch adds an `ApiKeyFile` option, which makes it possible to + # configure ImmichFrame without leaking secrets into your configuration. + # See [upstream PR](https://github.com/immichFrame/ImmichFrame/pull/511) + (fetchpatch { + name = "Add a `ApiKeyFile` option"; + url = "https://github.com/immichFrame/ImmichFrame/commit/f5bb164170460b1020bfe6bce8e8abb3315e32e3.diff"; + hash = "sha256-F3BVIxcu8Hm6wbWmzVnfgm6XvqdBw4IiS61CDQiMRVg="; + }) + ]; + + meta.mainProgram = "ImmichFrame.WebApi"; + }; + + frontend = buildNpmPackage { + pname = "immichframe-frontend"; + inherit version src; + + sourceRoot = "${src.name}/immichFrame.Web"; + + npmBuildScript = "build"; + npmDepsHash = "sha256-eOv3DlmHaI6hVCYTBzCtLWKD72/RM/KjCUDVUgb9jcg="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r build/ $out/wwwroot + + runHook postInstall + ''; + }; +in +writeShellApplication { + name = "ImmichFrame"; + + text = '' + cd ${frontend} + exec ${lib.getExe publishApi} "$@" + ''; + + passthru.tests = { inherit (nixosTests) immichframe; }; + + meta = { + description = "Display your photos from Immich as a digital photo frame"; + homepage = "https://immichframe.dev"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ jfly ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index d49b97a6b256..da2cc5032946 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.71.1"; + version = "1.71.2"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-HS6OgPi6gF1LB7BgFeLL3Wpvwu7sv9YoR3VBytLrd0Y="; + hash = "sha256-DnS6C2Fiah1jaInX2xS3R0UKrHa0IAagKOPB0QBCR5Y="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 9b7b070497a2..edcfe47691ab 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inko"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "inko-lang"; repo = "inko"; tag = "v${finalAttrs.version}"; - hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY="; + hash = "sha256-ZHVOwYvNRL2ObZt2PvayoqvS64MumN4oXQOgeCWbEUM="; }; - cargoHash = "sha256-IOMhwcZHB5jVYDM65zifxCjVHWl1EBbxNA3WVmarWcs="; + cargoHash = "sha256-BHrbqPMQnhw8pjN8e0/qW1rPe/fMhs2iUbRVPt5ATrg="; buildInputs = [ libffi diff --git a/pkgs/by-name/in/inko/test.nix b/pkgs/by-name/in/inko/test.nix index 4b6d637de3ff..3ed311a0f826 100644 --- a/pkgs/by-name/in/inko/test.nix +++ b/pkgs/by-name/in/inko/test.nix @@ -7,26 +7,30 @@ let source = + # https://docs.inko-lang.org/manual/v0.19.1/getting-started/hello-concurrency/#channels writeText "hello.inko" # inko '' import std.process (sleep) - import std.stdio (STDOUT) + import std.stdio (Stdout) + import std.sync (Channel) import std.time (Duration) - class async Printer { - fn async print(message: String, channel: Channel[Nil]) { - let _ = STDOUT.new.print(message) + type async Printer { + fn async print(message: String, channel: uni Channel[Nil]) { + let _ = Stdout.new.print(message) channel.send(nil) } } - class async Main { + type async Main { fn async main { - let channel = Channel.new(size: 2) + let channel = Channel.new - Printer().print('Hello', channel) - Printer().print('world', channel) + Printer().print('Hello', recover channel.clone) + Printer().print('world', recover channel.clone) + + sleep(Duration.from_millis(500)) channel.receive channel.receive diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index f43f4beb1a7f..d5dfc86b4ed6 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-nnHRdqX5q9WSu8d/jwTgelncCVs1UnV8Z0aae42KUls="; + hash = "sha256-bjaralA94aHmtobmCUx3vNbJWzZxZYQJT/J/MCopNi4="; }; - cargoHash = "sha256-yfZzkVALrD/dgANS4O/JCJPgepzMmqYMQ087Fmtlw68="; + cargoHash = "sha256-QGBZJtky5FD6VcRNmks7hAs+uZWaRuzMTJyjybX2/BU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 1980e8707107..c2af1cea3d37 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -56,6 +56,7 @@ let "pgsql" "regex_pcre2" "regex_re2" + "regex_tre" "sqlite3" "ssl_gnutls" ] @@ -82,6 +83,7 @@ in gnutls, libmaxminddb, openssl, + tre, yyjson, # For a full list of module names, see https://docs.inspircd.org/packaging/ extraModules ? compatibleModules lib stdenv, @@ -117,6 +119,7 @@ let sslrehashsignal = [ ]; # depends on used libc++ regex_stdlib = [ ]; + regex_tre = [ tre ]; # GPLv2 incompatible geo_maxmind = [ libmaxminddb ]; ssl_openssl = [ openssl ]; @@ -148,13 +151,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "inspircd"; repo = "inspircd"; rev = "v${version}"; - sha256 = "sha256-fMfsNbkp9M8KiuhwOEFmPjowZ4JLP4IpX6LRO9aLHzY="; + sha256 = "sha256-DoXf0F7tjfQZRFMrVECrlRlJLt7PymjwHSg9+4RLH00="; }; outputs = [ diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix index 70dd7b8e3dfe..269be12147f6 100644 --- a/pkgs/by-name/in/intermodal/package.nix +++ b/pkgs/by-name/in/intermodal/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/intermodal/releases/tag/v${version}"; license = lib.licenses.cc0; maintainers = with lib.maintainers; [ - Br1ght0ne xrelkd ]; mainProgram = "imdl"; diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix index b7954a8ddaa4..03f1c5ad7fe5 100644 --- a/pkgs/by-name/io/io/package.nix +++ b/pkgs/by-name/io/io/package.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 2.8)' 'cmake_minimum_required(VERSION 3.10)' + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix index 3101df017cd3..6639a95c34b2 100644 --- a/pkgs/by-name/io/ioc-scan/package.nix +++ b/pkgs/by-name/io/ioc-scan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ioc-scan"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "cisagov"; repo = "ioc-scanner"; tag = "v${version}"; - hash = "sha256-Mo3J744WwWPoTdWeAKFLVD3rh/ZKOHbnfinMeC2Qqfo="; + hash = "sha256-oqXK98Im6OVItjSF8NCrGroE3w3k7QFzqpC2EEpa7N0="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix index a228153ae4ef..dedfc94dce91 100644 --- a/pkgs/by-name/io/ioping/package.nix +++ b/pkgs/by-name/io/ioping/package.nix @@ -2,28 +2,19 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, }: stdenv.mkDerivation rec { pname = "ioping"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "koct9i"; repo = "ioping"; rev = "v${version}"; - sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid"; + hash = "sha256-9lJEjns8ttjgI52ZXeWgL77GMd7o7IvefBJ5UH9y9ks="; }; - patches = [ - # add netdata support: https://github.com/koct9i/ioping/pull/41 - (fetchpatch { - url = "https://github.com/koct9i/ioping/commit/e7b818457ddb952cbcc13ae732ba0328f6eb73b3.patch"; - sha256 = "122ivp4rqsnjszjfn33z8li6glcjhy7689bgipi8cgs5q55j99gf"; - }) - ]; - makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 1c0e2abfbcdc..3d4c2aa9b684 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.3.5"; + version = "33.3.6"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-DLLUM2ogC5kFFyOcwd1kkUgJEJEFO5VgSdfrRTKQKM4="; + hash = "sha256-/Bex4N+3xnYwteO85UaqrIKL5qGnYgSJYO9ET/WEUjM="; }; - npmDepsHash = "sha256-avjEEJFr9918FzgE1Yxx9S6KRY0A940nlaKVcjkmepI="; + npmDepsHash = "sha256-6TTcXFf9z3ebL4l+++0DS26BJVnwzIi7hU2R1H0DF44="; nativeBuildInputs = [ remarshal @@ -121,7 +121,7 @@ buildNpmPackage rec { runHook preBuild # pipe to cat to disable progress bar - npm run build --no-update-notifier --targets ttf::$pname -- --jCmd=$NIX_BUILD_CORES --verbosity=9 | cat + npm run build --no-update-notifier --targets ttf::"$pname" -- --jCmd=$NIX_BUILD_CORES --verbosity=9 | cat runHook postBuild ''; diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index fd2e5d893031..e1403cf6d4bf 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz - globin ]; }; } diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index a29f4bb6d704..f2eb381cec8d 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-11-26"; + version = "1.21.1-unstable-2025-12-03"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "d73981aece2544ee05685dccaf5a71b533fabb44"; - hash = "sha256-xhq8VRXdC6wPlViTHxI3fPcgE8gYvzcZTC2zN1b0DXo="; + rev = "64f936d5dfbce7e1d6dd719848caaa0a56125a95"; + hash = "sha256-nnqBRQ1A4o9OipcLQ3TUWrjNKakesjTJbB0nzgRzrWE="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix deleted file mode 100644 index 6f8774120eba..000000000000 --- a/pkgs/by-name/ir/iroh/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "iroh"; - version = "0.93.2"; - - src = fetchFromGitHub { - owner = "n0-computer"; - repo = "iroh"; - rev = "v${version}"; - hash = "sha256-IYuOo4dfTC7IfMkwFyjqFmOYjx87i84+ydyNxnSAfk4="; - }; - - cargoHash = "sha256-aR78AKfXRAePnOVO/Krx1WGcQgOIz3d+GDwfAoM10UQ="; - - # Some tests require network access which is not available in nix build sandbox. - doCheck = false; - - meta = with lib; { - description = "Efficient IPFS for the whole world right now"; - homepage = "https://iroh.computer"; - license = with licenses; [ - asl20 - mit - ]; - maintainers = with maintainers; [ cameronfyfe ]; - mainProgram = "iroh"; - }; -} diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index b9d5343b0031..a7378039daf6 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -41,14 +41,14 @@ in py.pkgs.buildPythonPackage rec { pname = "irrd"; - version = "4.5.0b1"; + version = "4.5.0b2"; pyproject = true; src = fetchFromGitHub { owner = "irrdnet"; repo = "irrd"; rev = "v${version}"; - hash = "sha256-Hr/PbC4N/yrYeQ7bTfqIchDFmaL3c4afxV1XS7FR1F8="; + hash = "sha256-MMacxjF0LLSdInSwXwpHJUTdUQJ6sl4yu83vWR/A4Jc="; }; postPatch = '' diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 73323b9e8595..d8809050d70d 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-NLARp5Gw04UosyLw3TkEmtvSLKa+tYp4s60UKvcJOgw="; + hash = "sha256-Klew+aFwF4KmOud6GLqZ+H7HyydFGFa7oX79r7/ylGs="; }; - vendorHash = "sha256-ge9aR3ZYOJaYp0D1UWzzg40nXlwM/Sl1Ep+u1CmdSV8="; + vendorHash = "sha256-Cv7wG8ws/wuMOT1JQFNemfNYxcJrcN0H+srQC2xNbMA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/iz/izrss/package.nix b/pkgs/by-name/iz/izrss/package.nix index 3c7a25c7850d..08e213adbc89 100644 --- a/pkgs/by-name/iz/izrss/package.nix +++ b/pkgs/by-name/iz/izrss/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "izrss"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "isabelroses"; repo = "izrss"; tag = "v${finalAttrs.version}"; - hash = "sha256-t+RtdKrYI0MNGSR1ABvClKv+hUJ4Tpg7yKS2qbm7BKc="; + hash = "sha256-cBkq+Xq6FxizftYZ1YelYdubWNakLbkhGE55hkOr4Qo="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { "-X main.version=${finalAttrs.version}" ]; - vendorHash = "sha256-2L/EUoPbz6AZqv84XPhiZhImOL4wyBOzx6Od4+nTJeY="; + vendorHash = "sha256-hiqheaGCtybrK5DZYz2GsYvTlUZDGu04wDjQqfE7O3k="; meta = { description = "RSS feed reader for the terminal written in Go"; diff --git a/pkgs/by-name/ja/jacoco/package.nix b/pkgs/by-name/ja/jacoco/package.nix index 4779d1b3da21..9069add297d8 100644 --- a/pkgs/by-name/ja/jacoco/package.nix +++ b/pkgs/by-name/ja/jacoco/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "jacoco"; - version = "0.8.12"; + version = "0.8.14"; src = fetchzip { url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip"; stripRoot = false; - sha256 = "sha256-7bN68fcUycehJDJeBAyCloz8rb3SXgjwmC9zpob8YdI="; + sha256 = "sha256-ysqPAxZK/mcnGiqqqTzfCOCyAcvMMvymFrSme6rFCJE="; }; outputs = [ diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 364fdfaa761b..ec34d7f2418c 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "020"; + patch = "021"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-4ni5psPUfoeupka8UryhWorCK9vptWZRPPDaRXAtN7M="; + sha256 = "sha256-0hli9489cBtLzEcwN87sdh54hbkqtq3hCxqN9XxTX2U="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index b8b1f4ab1759..69ffad4c85e7 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "417baa847977539d641dfb83c9960c2b6b10c1d7"; - hash = "sha256-uBregjxM/LDkAyYMLiXLVGSa83DStFxz352pFORqVdY="; + rev = "4ef9c544eef62ad882f66594ffec625073212735"; + hash = "sha256-Sw4yR8KIQnYdc7anh544QX3s5+5Pk1LlXjcvUICe378="; }; installPhase = '' diff --git a/pkgs/by-name/jb/jboss/package.nix b/pkgs/by-name/jb/jboss/package.nix index bb51b2737537..7da5e8edaeb9 100644 --- a/pkgs/by-name/jb/jboss/package.nix +++ b/pkgs/by-name/jb/jboss/package.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "Open Source J2EE application server"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; - maintainers = [ maintainers.sander ]; platforms = platforms.unix; knownVulnerabilities = [ "CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation" diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 25276ee178ae..30d98424d560 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "jellyfin-tui"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${version}"; - hash = "sha256-UwWL5YCBUHG6+r41E0mMaNKl+o2/YxhMCIFaQVR8X7A="; + hash = "sha256-AzeIoPdFfuzDrSPcAWqYq9sTHpLR222cz7BMHgVpmNA="; }; - cargoHash = "sha256-+oqC83gObCulyGbAx0EXPqnpyFBA4vtJSW6/MNide+U="; + cargoHash = "sha256-a08yTZAzBSldSJ+TulU10aF+wLYCAxCA4WRMNfZOWFw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index f8e534041458..5cd87aebdb10 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.528.1"; + version = "2.528.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-1jDcomX3Wo1YHxJ6kjTxZ51LCACo83DQOtShVM63KVs="; + hash = "sha256-YiWtzsAQ6gdcLWmP69vXLfduIV3WtsocV5u07Osq1cc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -81,7 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ earldouglas - nequissimus ]; changelog = "https://www.jenkins.io/changelog-stable/#v${finalAttrs.version}"; mainProgram = "jenkins-cli"; diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 683875115f42..6d101a268506 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -211,6 +211,15 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # Necessary for builtin Backup plugin + postFixup = + lib.optionalString stdenv.hostPlatform.isLinux '' + chmod a+x $out/share/joplin-desktop/resources/build/7zip/7za + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + chmod a+x $out/Applications/Joplin.app/Contents/Resources/build/7zip/7za + ''; + desktopItems = [ (makeDesktopItem { name = "joplin"; diff --git a/pkgs/by-name/js/jsdoc/package.nix b/pkgs/by-name/js/jsdoc/package.nix new file mode 100644 index 000000000000..5a34b37f4b80 --- /dev/null +++ b/pkgs/by-name/js/jsdoc/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "jsdoc"; + version = "5.0.0-dev.19"; + + src = fetchFromGitHub { + owner = "jsdoc"; + repo = "jsdoc"; + tag = "jsdoc@${finalAttrs.version}"; + hash = "sha256-dd68veLr78YRw06o/KzlhHtmSznnu7XHK6gTu6V4sJU="; + }; + + npmWorkspace = "packages/jsdoc"; + + npmDepsHash = "sha256-29xgiKNGwVNv+l3ou3RNamBNp0ykbDlUCsnlo0CEcSI="; + + dontNpmBuild = true; + + postBuild = '' + npm run test + ''; + + postInstall = '' + mkdir -p $out/lib/node_modules/jsdoc/packages + mv packages/* $out/lib/node_modules/jsdoc/packages + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--use-github-releases" + "--version=unstable" + "--version-regex" + "jsdoc@(.*)" + ]; + }; + + meta = { + changelog = "https://github.com/jsdoc/jsdoc/releases/jsdoc@${finalAttrs.version}"; + description = "API documentation generator for JavaScript"; + homepage = "https://jsdoc.app"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/js/jsduck/Gemfile b/pkgs/by-name/js/jsduck/Gemfile deleted file mode 100644 index 483fc40ff799..000000000000 --- a/pkgs/by-name/js/jsduck/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "jsduck" diff --git a/pkgs/by-name/js/jsduck/Gemfile.lock b/pkgs/by-name/js/jsduck/Gemfile.lock deleted file mode 100644 index d8331181652b..000000000000 --- a/pkgs/by-name/js/jsduck/Gemfile.lock +++ /dev/null @@ -1,23 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - dimensions (1.2.0) - jsduck (5.3.4) - dimensions (~> 1.2.0) - json (~> 1.8.0) - parallel (~> 0.7.1) - rdiscount (~> 2.1.6) - rkelly-remix (~> 0.0.4) - json (1.8.6) - parallel (0.7.1) - rdiscount (2.1.8) - rkelly-remix (0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - jsduck - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/by-name/js/jsduck/gemset.nix b/pkgs/by-name/js/jsduck/gemset.nix deleted file mode 100644 index 25a0fdf7289f..000000000000 --- a/pkgs/by-name/js/jsduck/gemset.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - dimensions = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0"; - type = "gem"; - }; - version = "1.2.0"; - }; - jsduck = { - dependencies = [ - "dimensions" - "json" - "parallel" - "rdiscount" - "rkelly-remix" - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr"; - type = "gem"; - }; - version = "5.3.4"; - }; - json = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - parallel = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq"; - type = "gem"; - }; - version = "0.7.1"; - }; - rdiscount = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; - type = "gem"; - }; - version = "2.1.8"; - }; - rkelly-remix = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; - type = "gem"; - }; - version = "0.0.7"; - }; -} diff --git a/pkgs/by-name/js/jsduck/package.nix b/pkgs/by-name/js/jsduck/package.nix deleted file mode 100644 index ccd1538e4f77..000000000000 --- a/pkgs/by-name/js/jsduck/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - stdenv, - lib, - bundlerEnv, - makeWrapper, - bundlerUpdateScript, -}: -let - rubyEnv = bundlerEnv { - name = "jsduck"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; -in -stdenv.mkDerivation { - pname = "jsduck"; - version = (import ./gemset.nix).jsduck.version; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rubyEnv ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${rubyEnv}/bin/jsduck $out/bin/jsduck - ''; - - passthru.updateScript = bundlerUpdateScript "jsduck"; - - meta = with lib; { - description = "Simple JavaScript Duckumentation generator"; - mainProgram = "jsduck"; - homepage = "https://github.com/senchalabs/jsduck"; - license = with licenses; gpl3; - maintainers = with maintainers; [ - periklis - nicknovitski - ]; - platforms = platforms.unix; - # rdiscount fails to compile with: - # mktags.c:44:1: error: return type defaults to ‘int’ [-Wimplicit-int] - broken = true; - }; -} diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix index b441646e7283..30972f40419e 100644 --- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix +++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "json-schema-catalog-rs"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "roberth"; repo = "json-schema-catalog-rs"; tag = finalAttrs.version; - hash = "sha256-AEtE57WYmuTaU1hQUw2NyA+hj9odIktZVQ+mDE2+Sdc="; + hash = "sha256-KmUpnpVBfVhdHLQVqcVoNCM6KODfIeTUNagOR69ntQY="; }; - cargoHash = "sha256-fW2sODIFRXcDfzPnmYW0sH/dLe8sbRjQLtLWDlAJPxQ="; + cargoHash = "sha256-ydygZWAcKNMRw2v6ci2x8b7ca3T5dEGYukEwHnJb7jo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 698a3533364b..a1482a5d5826 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.37.2"; + version = "0.37.4"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-d/l43flElIooDs/daz7kNVumY7WophO3RwnxMsUGXzc="; + hash = "sha256-qmxl4DzctXnDGeqZukMiurFoLt982ngDIo0Cum4kkcQ="; }; - cargoHash = "sha256-8fiAzUsYvWNjNhurvh6U2BXiQsBpTzsTo5DstK2MSB4="; + cargoHash = "sha256-t2lRBVPk9bkvRsCxMNi30F3dkwr6angEGfD34UuH+EY="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix index b6332b2a57a2..48b18bfc38ed 100644 --- a/pkgs/by-name/ju/juce/package.nix +++ b/pkgs/by-name/ju/juce/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "8.0.10"; + version = "8.0.11"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; tag = finalAttrs.version; - hash = "sha256-YSNVQ337/IAlz3mFNgJisIY5D9wPz6sFboMNwsjcGBo="; + hash = "sha256-sUxPFxQ/Q1ESlp6tdGI8hGkc3szYkFwBO8xARg2JiR4="; }; patches = [ diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 62c50c0bb234..5216fd971c1a 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro="; + hash = "sha256-HGMzNXm6vWKf/RHPwB/soDqxAvCOW1J6BPs0tsrEuTI="; }; - cargoHash = "sha256-9VCAmtY029+CFNFcYLdA/VyT5CIvJnuA3iwPOKZpYV0="; + cargoHash = "sha256-jai0FNuCUcgN+ZmmYgbFrMK1Z1vcv21wALkEb74h7H0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index abd4e8659bcf..635769448d2f 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.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-4Oo5WYDlnZmrjYq5sA3IhkxXZV1eNOAbydMeZpL2Pa4="; + hash = "sha256-U9wrm/XHydO9BzVN0p1Gx6mz34k2rBknYRmqYkD+vR8="; }; - vendorHash = "sha256-Tzs7PYOulszUFK4PLHPzxxmkpHVo2+h/hG83aHG8Bm0="; + vendorHash = "sha256-rNbnJmyh+97384s8Pse2ljTRPAtrl8jksbRwNxqqQUU="; ldflags = [ "-s" diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 871c4d6a6f48..e94e4ddf1fc8 100644 --- a/pkgs/by-name/ka/kafkactl/package.nix +++ b/pkgs/by-name/ka/kafkactl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.15.0"; + version = "5.16.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = "kafkactl"; tag = "v${version}"; - hash = "sha256-4Kj5RqnTVfMsjEutxJ+21kT7s4UAd8JSKTuPXQtAnxo="; + hash = "sha256-99VPjcO2LJFXiffzPV75UcLDX7N7P0RgdEEcV7seomY="; }; - vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I="; + vendorHash = "sha256-OXB+6911gNLCo+6WMnyZNGAWcTkRj2NkzaoUh9j79wI="; doCheck = false; diff --git a/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch b/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch new file mode 100644 index 000000000000..fcba1034944a --- /dev/null +++ b/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch @@ -0,0 +1,29 @@ +From df4f62ed4c4e54d528950f9204623ec3054d3ff9 Mon Sep 17 00:00:00 2001 +From: eljamm +Date: Thu, 4 Dec 2025 10:29:49 +0100 +Subject: [PATCH] Fix compatibility with qt 6.10 + +See: https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes +From: https://invent.kde.org/network/kaidan/-/commit/26942b401070 +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 027530bc..ee57c6f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,10 @@ if (NOT ANDROID) + find_package(KF6WindowSystem ${KF_MIN_VERSION} CONFIG REQUIRED) + endif() + ++if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0" AND NOT WIN32 AND NOT APPLE) ++ find_package(Qt6GuiPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE) ++endif() ++ + find_package(KF6KirigamiAddons 1.4.0 REQUIRED) + find_package(QXmppQt6 1.11.0 REQUIRED COMPONENTS Omemo) + +-- +2.50.1 + diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index c75693ecf0f6..e6a83f357b41 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -1,64 +1,79 @@ { - stdenv, lib, + stdenv, fetchFromGitLab, + nix-update-script, + + # build cmake, extra-cmake-modules, - pkg-config, kdePackages, - kdsingleapplication, - zxing-cpp, - qxmpp, + pkg-config, + writableTmpDirAsHomeHook, + + # runtime gst_all_1, - nix-update-script, + kdsingleapplication, + qxmpp, + zxing-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "kaidan"; - version = "0.13.0"; + version = "0.13.0-unstable-2025-12-09"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = "kaidan"; - tag = "v${finalAttrs.version}"; - hash = "sha256-4+jW3fuUi1OpwbcGccxvrPro/fiW9yBOlhc2KUbUExc="; + rev = "d160f34ce1fecb39f4c71530cf2d4ba57bfbd6f4"; + hash = "sha256-/Nt6XjauaVKdLSZglk3qfd0wxW/VpwzMnVwuF/jGP0s="; }; + patches = [ + ./0001-Fix-compatibility-with-qt-6.10.patch + ]; + nativeBuildInputs = [ cmake extra-cmake-modules - pkg-config kdePackages.wrapQtAppsHook + pkg-config + writableTmpDirAsHomeHook ]; buildInputs = [ + (gst_all_1.gst-plugins-good.override { qt6Support = true; }) + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gstreamer kdePackages.kio kdePackages.kirigami kdePackages.kirigami-addons kdePackages.knotifications - kdePackages.kquickimageedit + kdePackages.kquickimageeditor kdePackages.prison + kdePackages.qqc2-desktop-style kdePackages.qtbase kdePackages.qtkeychain - kdePackages.qttools - kdePackages.qtmultimedia kdePackages.qtlocation - kdePackages.qqc2-desktop-style + kdePackages.qtmultimedia + kdePackages.qttools kdePackages.sonnet kdsingleapplication - zxing-cpp qxmpp - gst_all_1.gstreamer - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { qt6Support = true; }) + zxing-cpp ]; + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + ]; + postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "User-friendly and modern chat app, using XMPP"; diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index b8e733d681a1..79795fc7024d 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-tree-sitter-unwrapped"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "kak-tree-sitter"; rev = "kak-tree-sitter-v${version}"; - hash = "sha256-vFhNxixXsezK3Qm9d5hEiIttSjcuqHfgCHYrEOeKWvs="; + hash = "sha256-9QeTHmDTw1Qxnl+AnqCZgxlCCycq5qYF0aM/6fu8qwM="; }; - cargoHash = "sha256-tO6i19UuistT4yUc0YzZOh+8M5kXq5l1NUTBUOA3YT8="; + cargoHash = "sha256-lZNM5HqICP6JfaMiBjACcUNRTTTIRhq2ou8cOLU0yOU="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index c016f9b0488a..9d9d75abfb55 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "18.2.0"; + version = "19.0.0"; src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${version}"; - hash = "sha256-71XnCHAXOcrXu0xizwdwJPkhnmfEjmVP++6mxmTcnM4="; + hash = "sha256-N1J8HBhOLZmR51y1Z85rl0oxA1UrjBfbPb5hiZ1Q0aY="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-cr/fvV2JjjfLdsT0Ej2aNoNKDLqmJsOOREcwxWpjfE0="; + cargoHash = "sha256-AaqA+MvpmvPUOLI0usuf9rxr7TcoMSO9mOsg3OCHljw="; meta = { description = "Kakoune Language Server Protocol Client"; diff --git a/pkgs/by-name/ka/karate/package.nix b/pkgs/by-name/ka/karate/package.nix index 782ef91e23cf..405f869dc7c3 100644 --- a/pkgs/by-name/ka/karate/package.nix +++ b/pkgs/by-name/ka/karate/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-Dk7rd9exdTSvauqcAldT3N597TeF+MNoLTx4OmOGcxE="; + sha256 = "sha256-zPR0DGShVMTCRX1vD9GajzeQLCnTKqxOIwEuCoeGFL4="; }; dontUnpack = true; diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index 13c8b6c8a5e2..0edaa64a417d 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "5.0"; + version = "5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "siemens"; repo = "kas"; tag = version; - hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q="; + hash = "sha256-SQeoRm2bjcQmhfMUJCSxgKu7/qcIEv9ItWcLWkkNwAs="; }; patches = [ ./pass-terminfo-env.patch ]; diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json index fb256a6b6a97..f6050f9912b9 100644 --- a/pkgs/by-name/ka/kazumi/git-hashes.json +++ b/pkgs/by-name/ka/kazumi/git-hashes.json @@ -1,12 +1,12 @@ { "desktop_webview_window": "sha256-FSI/R9HvAJWQttY8oaAmBYygUliv/bw3hmwty7PRUjE=", - "media_kit": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_android_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_ios_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_linux": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_macos_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_libs_windows_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", - "media_kit_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_android_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_ios_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_linux": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_macos_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_libs_windows_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", "webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU=" } diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 9ac635e0ae62..8b4b09c5d3d9 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-NGJp4F2b6SCy83p9IHekAH1jB8BDQZwMKU8BKS/hyq0="; + hash = "sha256-PrXgYp0WAbR/b6nSmcQDfJXkuYqtWD7QB1RIiVRFFY0="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 67076991abe3..5feadbea6d01 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -969,8 +969,8 @@ "dependency": "direct main", "description": { "path": "media_kit", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -980,8 +980,8 @@ "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -991,8 +991,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1002,8 +1002,8 @@ "dependency": "direct overridden", "description": { "path": "libs/linux/media_kit_libs_linux", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1013,8 +1013,8 @@ "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1024,8 +1024,8 @@ "dependency": "direct main", "description": { "path": "libs/universal/media_kit_libs_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1035,8 +1035,8 @@ "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1046,8 +1046,8 @@ "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", - "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -2203,6 +2203,6 @@ }, "sdks": { "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.38.3" + "flutter": ">=3.38.4" } } diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index ba108e38f3d9..fa457ed5113e 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kcl"; - version = "0.11.4"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-fFT8sUxx1E6WdyiJ8DyTagGkVEQ7YZ2CCGL5tVxkAEI="; + hash = "sha256-dwJkV5/MCUhjralKtnlmqSrb2C0kMZ1eO+6nTnenWZw="; }; - vendorHash = "sha256-ohfNy3vOyJJuniQKEVFiDftffdHlEJejQ72TJEwNhIM="; + vendorHash = "sha256-1O1oTJCdGwA0TgI8dScZq7+yfumbzyi8rD4VJkFgn5E="; subPackages = [ "cmd/kcl" ]; diff --git a/pkgs/by-name/kc/kcov/package.nix b/pkgs/by-name/kc/kcov/package.nix index cab93025030b..221bf6fed279 100644 --- a/pkgs/by-name/kc/kcov/package.nix +++ b/pkgs/by-name/kc/kcov/package.nix @@ -87,7 +87,6 @@ let maintainers = with maintainers; [ gal_bolle - ekleog ]; platforms = platforms.linux; }; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/by-name/kd/kde-rounded-corners/package.nix similarity index 85% rename from pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix rename to pkgs/by-name/kd/kde-rounded-corners/package.nix index f90fa9a68697..51849df7a489 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/by-name/kd/kde-rounded-corners/package.nix @@ -3,11 +3,7 @@ fetchFromGitHub, fetchpatch2, cmake, - extra-cmake-modules, - wrapQtAppsHook, - qtbase, - kwin, - kcmutils, + kdePackages, libepoxy, libxcb, lib, @@ -33,15 +29,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook ]; buildInputs = [ - kcmutils - kwin + kdePackages.kcmutils + kdePackages.kwin libepoxy libxcb - qtbase + kdePackages.qtbase ]; meta = with lib; { diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index 6c94a4dce3bf..6db4e03ef204 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "5.1.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; tag = finalAttrs.version; - hash = "sha256-y1EVF3IwGzDy32ywo9LSzkQNki/HuKC40DySIme8nTc="; + hash = "sha256-YKfKgsrjDrskLEoYCSRMYco7+7E/sgXFAMEwwm7rs7w="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/by-name/ke/keymapviz/package.nix b/pkgs/by-name/ke/keymapviz/package.nix index e0403aaf1e55..83fd244cdcb9 100644 --- a/pkgs/by-name/ke/keymapviz/package.nix +++ b/pkgs/by-name/ke/keymapviz/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { description = "Qmk keymap.c visualizer"; homepage = "https://github.com/yskoht/keymapviz"; license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; mainProgram = "keymapviz"; }; } diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index 2ca0858819ec..fbd8fb683b24 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, glibcLocales, installShellFiles, python3Packages, @@ -20,6 +21,15 @@ python3Packages.buildPythonApplication rec { hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8="; }; + patches = [ + # https://github.com/pimutils/khal/pull/1418/ + (fetchpatch { + name = "fix_calendar_popup"; + url = "https://github.com/pimutils/khal/commit/3fadf020bb65c9c95bba46b5d3695c2565cceacd.patch"; + hash = "sha256-KhqP0RLLOXm1d/4rCVAb5f7v0q7N0/U2iM23+TcnJhY="; + }) + ]; + build-system = with python3Packages; [ setuptools setuptools-scm diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 77256147da2c..09bf158893bc 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -26,7 +26,7 @@ sphinx, autoreconfHook, nixosTests, - knot-resolver, + knot-resolver_5, knot-dns, runCommandLocal, }: @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit knot-resolver; + inherit knot-resolver_5; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) knot kea; diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix new file mode 100644 index 000000000000..851dec44dfa1 --- /dev/null +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -0,0 +1,56 @@ +{ + knot-resolver_6, + writeText, + python3Packages, +}: + +python3Packages.buildPythonPackage { + pname = "knot-resolver-manager_6"; + inherit (knot-resolver_6) version src; + pyproject = true; + + patches = [ + # Rewrap the two supervisor's binaries, so that they obtain access to python modules + # defined in the manager. Those are then used as extensions of supervisord. + # Manager needs this fixed bin/supervisord on its $PATH. + ./rewrap-supervisor.patch + ]; + + # Propagate meson config from the C part to the python part. + # But the install-time etc differs from a sensible run-time etc. + postPatch = '' + substitute '${knot-resolver_6.config_py}'/knot_resolver/constants.py ./python/knot_resolver/constants.py \ + --replace-fail '${knot-resolver_6.out}/etc' '/etc' + ''; + + build-system = with python3Packages; [ + poetry-core + setuptools + ]; + + # Deps can be seen in ${src}/pyproject.toml + propagatedBuildInputs = with python3Packages; [ + aiohttp + jinja2 + pyyaml + prometheus-client + supervisor + typing-extensions + ]; + + doCheck = false; # FIXME + checkInputs = with python3Packages; [ + python3Packages.augeas + dnspython + lief + pytestCheckHook + pytest-asyncio + pyroute2 + pyparsing + toml + ]; + + meta = knot-resolver_6.meta // { + mainProgram = "knot-resolver"; + }; +} diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/rewrap-supervisor.patch b/pkgs/by-name/kn/knot-resolver-manager_6/rewrap-supervisor.patch new file mode 100644 index 000000000000..5569059cefec --- /dev/null +++ b/pkgs/by-name/kn/knot-resolver-manager_6/rewrap-supervisor.patch @@ -0,0 +1,14 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 22d6ca5b0d..15acfb3c6c 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -71,6 +71,9 @@ + [tool.poetry.scripts] + kresctl = 'knot_resolver.client.main:main' + knot-resolver = 'knot_resolver.manager.main:main' ++supervisord = 'supervisor.supervisord:main' ++supervisorctl = 'supervisor.supervisorctl:main' ++ + + [tool.poe.tasks] + # tasks runed through scripts located in 'scripts/poe-tasks/' diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix similarity index 92% rename from pkgs/servers/dns/knot-resolver/default.nix rename to pkgs/by-name/kn/knot-resolver_5/package.nix index a589b7fb93bb..20d8e1c5494f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/by-name/kn/knot-resolver_5/package.nix @@ -15,7 +15,7 @@ gnutls, lmdb, jemalloc, - systemd, + systemdMinimal, libcap_ng, dns-root-data, nghttp2, # optionals, in principle @@ -33,12 +33,12 @@ let inherit (lib) optional optionals optionalString; lua = luajitPackages; - unwrapped = stdenv.mkDerivation rec { - pname = "knot-resolver"; + unwrapped = stdenv.mkDerivation (finalAttrs: { + pname = "knot-resolver_5"; version = "5.7.6"; src = fetchurl { - url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; + url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz"; sha256 = "500ccd3a560300e547b8dc5aaff322f7c8e2e7d6f0d7ef5f36e59cb60504d674"; }; @@ -69,7 +69,7 @@ let done '' # some tests have issues with network sandboxing, apparently - + optionalString doInstallCheck '' + + optionalString finalAttrs.doInstallCheck '' echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \ tests/config/doh2.test.lua modules/http/http_doh.test.lua @@ -96,7 +96,7 @@ let ## the rest are optional dependencies ++ optionals stdenv.hostPlatform.isLinux [ # lib - systemd + systemdMinimal libcap_ng ] ++ [ @@ -116,8 +116,8 @@ let "-Dmalloc=jemalloc" "--default-library=static" # not used by anyone ] - ++ optional doInstallCheck "-Dunit_tests=enabled" - ++ optional doInstallCheck "-Dconfig_tests=enabled" + ++ optional finalAttrs.doInstallCheck "-Dunit_tests=enabled" + ++ optional finalAttrs.doInstallCheck "-Dconfig_tests=enabled" ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. ; @@ -153,7 +153,7 @@ let ]; mainProgram = "kresd"; }; - }; + }); wrapped-full = runCommand unwrapped.name diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix new file mode 100644 index 000000000000..21fa65aab9fa --- /dev/null +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -0,0 +1,189 @@ +{ + lib, + stdenv, + fetchurl, + # native deps. + runCommand, + pkg-config, + meson, + ninja, + makeWrapper, + # build+runtime deps. + knot-dns, + luajitPackages, + libuv, + gnutls, + lmdb, + jemalloc, + systemdMinimal, + libcap_ng, + dns-root-data, + nghttp2, # optionals, in principle + fstrm, + protobufc, # more optionals + # test-only deps. + cmocka, + which, + cacert, + extraFeatures ? false, # catch-all if defaults aren't enough +}: +let + result = if extraFeatures then wrapped-full else unwrapped; + + inherit (lib) optional optionals optionalString; + lua = luajitPackages; + + unwrapped = stdenv.mkDerivation (finalAttrs: { + pname = "knot-resolver_6"; + version = "6.0.17"; + + src = fetchurl { + url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz"; + hash = "sha256-E9RJbvh66y+9OwBX4iEdRYUgUkHlCaDNQ0Hb5ejLXBw="; + }; + + outputs = [ + "out" + "dev" + "config_py" + ]; + + # Path fixups for the NixOS service. + # systemd Exec* options are difficult to override in NixOS *if present*, so we drop them. + postPatch = '' + patch meson.build < daemon/lua/trust_anchors.test/bootstrap.test.lua + sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \ + tests/config/doh2.test.lua modules/http/http_doh.test.lua + ''; + + preConfigure = '' + patchShebangs scripts/ + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements + buildInputs = [ + knot-dns + lua.lua + libuv + gnutls + lmdb + ] + ## the rest are optional dependencies + ++ optionals stdenv.hostPlatform.isLinux [ + # lib + systemdMinimal + libcap_ng + ] + ++ [ + jemalloc + nghttp2 + ] + ++ [ + fstrm + protobufc + ] # dnstap support + ; + + mesonFlags = [ + "-Dkeyfile_default=${dns-root-data}/root.ds" + "-Droot_hints=${dns-root-data}/root.hints" + "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/ + "-Dmalloc=jemalloc" + "--default-library=static" # not used by anyone + ] + ++ optional finalAttrs.doInstallCheck "-Dunit_tests=enabled" + ++ optional finalAttrs.doInstallCheck "-Dconfig_tests=enabled" + ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service + #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. + ; + + postInstall = '' + cp -r ./python "$config_py" + rm "$out"/lib/libkres.a + '' + + optionalString stdenv.hostPlatform.isLinux '' + rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help + ''; + + doInstallCheck = with stdenv; hostPlatform == buildPlatform; + nativeInstallCheckInputs = [ + cmocka + which + cacert + lua.cqueues + lua.basexx + lua.http + ]; + installCheckPhase = '' + meson test --print-errorlogs --no-suite snowflake + ''; + + meta = with lib; { + description = "Caching validating DNS resolver, from .cz domain registry"; + homepage = "https://knot-resolver.cz"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ + maintainers.vcunat # upstream developer + ]; + teams = [ teams.flyingcircus ]; + mainProgram = "kresd"; + }; + }); + + wrapped-full = + runCommand unwrapped.name + { + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with luajitPackages; [ + # For http module, prefill module, trust anchor bootstrap. + # It brings lots of deps; some are useful elsewhere (e.g. cqueues). + http + # used by policy.slice_randomize_psl() + psl + ]; + preferLocalBuild = true; + allowSubstitutes = false; + inherit (unwrapped) meta; + } + ( + '' + mkdir -p "$out"/bin + makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \ + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" + + ln -sr '${unwrapped}/bin/kres-cache-gc' "$out"/bin/ + ln -sr '${unwrapped}/share' "$out"/ + ln -sr '${unwrapped}/lib' "$out"/ # useful in NixOS service + ln -sr "$out"/{bin,sbin} + '' + + lib.optionalString unwrapped.doInstallCheck '' + echo "Checking that 'http' module loads, i.e. lua search paths work:" + echo "modules.load('http')" > test-http.lua + echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua + '' + ); + +in +result diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 4402b8e64168..393572b2a281 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -39,13 +39,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.102.2"; + version = "1.103"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-0mZa5g6YK5dImoTOXIMyoc8zQkHh4ytOdH1cDOzUjZU="; + hash = "sha256-lvrsgycFLqIGypB7lZvi9bDBtiKNAte4tLnEnRiPnZU="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index b6a34452060e..ec6dad3d07d0 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -4,6 +4,7 @@ desktop-file-utils, gettext, glib, + glib-networking, gobject-introspection, blueprint-compiler, gtk4, @@ -23,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.94.0"; + version = "1.96.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-oSeUJ1uODLlUcX6avUoVvkt+3LwSu4DpDEQRooHFjys="; + hash = "sha256-ReWAHvB5SkSjYnLex9QML8VVwCVKeEkk1tQ2AY/SM7Y="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + glib-networking gtk4 libadwaita libglycin diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix index 842c671f5248..ac2eacf16ce3 100644 --- a/pkgs/by-name/ko/kondo/package.nix +++ b/pkgs/by-name/ko/kondo/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec { description = "Save disk space by cleaning unneeded files from software projects"; homepage = "https://github.com/tbillington/kondo"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "kondo"; }; } diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 621dc5cde92e..1b386889c79a 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.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-UtyOMXX6Q0fhlnSMmI5d+0BHGvoWkPZbcm9B6vWG05Y="; + hash = "sha256-5oNam99Mij78snSO6jiGPYzeD68sXEBKM2dGQtTUrww="; }; in buildNpmPackage { diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix index 89e297077923..f6f26082ed38 100644 --- a/pkgs/by-name/ko/kopia/package.nix +++ b/pkgs/by-name/ko/kopia/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.22.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-UtyOMXX6Q0fhlnSMmI5d+0BHGvoWkPZbcm9B6vWG05Y="; + hash = "sha256-5oNam99Mij78snSO6jiGPYzeD68sXEBKM2dGQtTUrww="; }; - vendorHash = "sha256-zjUkVU9I+Dp21QcOZPT30Ki570vQJPyK4UYSy8PEiZI="; + vendorHash = "sha256-szlCiZOLU0KVWb2YX3Wmicrumn+fNm2AWdPxaJZZT90="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ko/korrect/package.nix b/pkgs/by-name/ko/korrect/package.nix index 5b8e4004afe9..270825731b78 100644 --- a/pkgs/by-name/ko/korrect/package.nix +++ b/pkgs/by-name/ko/korrect/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ --bash <($out/bin/${finalAttrs.meta.mainProgram} completions bash) \ --fish <($out/bin/${finalAttrs.meta.mainProgram} completions fish) \ - --zsh <($out/bin/${finalAttrs.meta.mainProgram} completions zsh) + --zsh <($out/bin/${finalAttrs.meta.mainProgram} completions zsh) \ + --nushell <($out/bin/${finalAttrs.meta.mainProgram} completions nushell) ''; meta = { diff --git a/pkgs/by-name/kr/krusader/package.nix b/pkgs/by-name/kr/krusader/package.nix index a7fe7112ad47..e4c982772ade 100644 --- a/pkgs/by-name/kr/krusader/package.nix +++ b/pkgs/by-name/kr/krusader/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://www.krusader.org"; description = "Norton/Total Commander clone for KDE"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ sander ]; mainProgram = "krusader"; }; } diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index fbf0d59eba9c..a7612d54d1d7 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-y5eqkTt9CnEPOyFERWhBPqrgnMGaVuWN2FoDV0pDjdI="; + hash = "sha256-ZGi7zsIphiXNLfVc6u+ZSGsgWWcMaBpyt1BpwS2WRCU="; }; - vendorHash = "sha256-TBaMbIwR/7MzPn8rYgjqeMLma3arwr5W9HiTztd8z9E="; + vendorHash = "sha256-0vpPBQ1ty4FZMj3bgB56Gu5pNdo7SyhxvGQOHos6m9s="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 7bb52508115d..323d8da5de8b 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-X2OJZMuj+GxoApaHJSIBbanYXebnU7w+Gq1fHDvpxbw="; + hash = "sha256-al/byEO5wNhoVnfHHJFQMnx7EtoF3+P7MtS/x82Z8w0="; }; vendorHash = "sha256-4thcMvdS2oxBai+3aOUPXd5T6f2DcW0Mm1d3y/DMGFc="; diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix index b57c1a822ad9..afd0417a1a1c 100644 --- a/pkgs/by-name/ku/kubergrunt/package.nix +++ b/pkgs/by-name/ku/kubergrunt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-yrAFm4dvujwxRVjMDlTAOjBpftxdv6kuQIIcbiVnFgU="; + sha256 = "sha256-aze/Cq5hFTRRGE1F3LLcZpWPTjpBlc2RHVkoBiP4RaU="; }; - vendorHash = "sha256-zpYc8DurFG6Hqmf8YDSapFbHIvE1HGs5yajrLWtewO4="; + vendorHash = "sha256-CNvYn/d26V0fqmPh2BbkzMgv3jWwWpGtOqowrND+igk="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index 794ca1fdfad0..629fb1d63ee2 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.45"; + version = "3.0.46"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${version}"; - hash = "sha256-ydTCphcqHY0RM2RYlqp5tFlNqL9QP3LCSSca7b+MM7E="; + hash = "sha256-Be0mlPd6+KFipISu8ctoHYs1I8P80h5XNpC4YPU+pZA="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-4c4AyvSJqIYLou0e9Hr7u/0FWdwKOyFzkY/R8BheWL0="; + vendorHash = "sha256-HyhGdrV5kLtWh6bAvCwZ0ES5QYfELoawdAvIt241tGY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index 1a4a773178bd..d306331155aa 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.10.0"; + version = "52.10.3"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-7T23cdPIE7X5Hx03sY93z/qrqRMGUTMObWvwdH6Hj5U="; + hash = "sha256-n7AYUms6fn25UinLd5xFG2DfcpJU0/pR4JF3i1VY1hM="; }; vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4="; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index 316da1bd6c8d..b38b10f58d1d 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-zc2oOwsWjPstEXrSDvuWyYL8RnsIxSaKO0RcwcgacoI="; + hash = "sha256-e2YjtshgBRx9rf0Z7VUXa767UMyWc8OnIV1yjYC0erw="; }; checkFlags = [ "--skip=workers::kube::store::tests::kubeconfigからstateを生成" ]; - cargoHash = "sha256-KnBQOpxubHXrN5w6mdO+ZWfpXezJH9PkxaYaSi0AI2k="; + cargoHash = "sha256-0D7AfhmImaNUnpN6sEY4T0io4EMXP0HPwgh30VDRQm0="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/ku/kupfer/package.nix b/pkgs/by-name/ku/kupfer/package.nix index 9de95c5fa487..421b98a8f921 100644 --- a/pkgs/by-name/ku/kupfer/package.nix +++ b/pkgs/by-name/ku/kupfer/package.nix @@ -20,13 +20,13 @@ with python3Packages; buildPythonApplication rec { pname = "kupfer"; - version = "328"; + version = "329"; format = "other"; src = fetchurl { url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"; - sha256 = "sha256-1oPvcho54uXCvov4eTZTjObL0EecimfxVOxl+bOU6do="; + sha256 = "sha256-9kX30EYYkb7s/T5VfpyqZQ5F1wpvtWfTT790LZmVqq0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index fc7ef4b320a8..f84bab14ea46 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-DbwqcHBmKAzq3xzUVGOdXjF8uaUWkEKRlz9m7tfyIdY="; + hash = "sha256-HcBRipJGSHPms2qL63vIVVmiq+k1mL8dJo5kW7W6ykE="; }; - vendorHash = "sha256-e4hSfmnROnfLRNvmfN0VFoIR0zVaqBhd0/c4lIyScvY="; + vendorHash = "sha256-lG+odKD1TGQ7GTh/y9ogREtY59T8fvN/6FyKsdgsU0M="; subPackages = [ "." ]; diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix similarity index 56% rename from pkgs/data/icons/la-capitaine-icon-theme/default.nix rename to pkgs/by-name/la/la-capitaine-icon-theme/package.nix index bf0df6858f0c..e3dd010f7098 100644 --- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix @@ -2,26 +2,26 @@ lib, stdenvNoCC, fetchFromGitHub, - breeze-icons, - elementary-icon-theme, gnome-icon-theme, hicolor-icon-theme, + pantheon, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "la-capitaine-icon-theme"; version = "0.6.2"; src = fetchFromGitHub { owner = "keeferrourke"; repo = "la-capitaine-icon-theme"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+n+GN5sCcWTyAigtgyudliOTulP7ECoOCYdm01trokU="; }; propagatedBuildInputs = [ - breeze-icons - elementary-icon-theme + libsForQt5.breeze-icons + pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme ]; @@ -37,21 +37,21 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/icons/$pname - cp -a * $out/share/icons/$pname - rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md} - cp "$out/share/icons/$pname/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/$pname/apps/scalable/" + mkdir -p $out/share/icons/la-capitaine-icon-theme + cp -a * $out/share/icons/la-capitaine-icon-theme + rm $out/share/icons/la-capitaine-icon-theme/{configure,COPYING,LICENSE,*.md} + cp "$out/share/icons/la-capitaine-icon-theme/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/la-capitaine-icon-theme/apps/scalable/" runHook postInstall ''; - meta = with lib; { + meta = { description = "Icon theme inspired by macOS and Google's Material Design"; homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index a60e23983158..3bbb4abb2fe8 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-11-27"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "c790de24ddc7575a4ed2ea754d27afb6cde0ac22"; - hash = "sha256-DZ4qj4polUH2xQvopY6ia/GyRe+L8WCGJPEryQAn/4E="; + rev = "9b4d9966da96b7f6421b59eb0adfe90d484ee920"; + hash = "sha256-dqTxW1ENc3k9pk8z2BFPsVJVren9ZkFovKKhNAcs1eo="; }; postPatch = '' diff --git a/pkgs/by-name/la/languagetool/package.nix b/pkgs/by-name/la/languagetool/package.nix index 1efeed22615a..a9f97b25d964 100644 --- a/pkgs/by-name/la/languagetool/package.nix +++ b/pkgs/by-name/la/languagetool/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://languagetool.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ edwtjo ]; platforms = jre.meta.platforms; description = "Proofreading program for English, French German, Polish, and more"; }; diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index 54fb96c135e3..84972f30960c 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -44,7 +44,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ das-g - Br1ght0ne ]; mainProgram = "lazydocker"; }; diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 8074bf20281d..1e24d3dc7c0d 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${version}"; - hash = "sha256-oTj+9zDmbXD4rlFZ++hcd1WSfskSNI7ojI9gN8UcpT8="; + hash = "sha256-DC0wVkFI7Te3QSE8Y0WU/ysanfukTkGa3N43hmKHXW8="; }; vendorHash = null; @@ -42,7 +42,6 @@ buildGoModule rec { changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne equirosa khaneliman starsep diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 38d2ec6c1814..a5493eafe927 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -8,7 +8,7 @@ let pname = "lefthook"; - version = "1.13.6"; + version = "2.0.7"; in buildGoModule { inherit pname version; @@ -17,10 +17,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-R9Cj2mXgAZFZMvEFF7ky1bAhy6L6Z4fcYPHY0CGVBr0="; + hash = "sha256-i+3D5nepZDfFQ1zl1ykefRFA0V5tiUEiqLO9BF+UyFc="; }; - vendorHash = "sha256-Md2VTvcbSMQ8ce96wyoS4Uw90MERGEeHSZc9iL0pRNs="; + vendorHash = "sha256-IUq2Qa26p7OP7Y78Cio3EvhMWD2VAN50wlBbk7AxZyo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix index 79ab202b0b95..178ddb6c29cf 100644 --- a/pkgs/by-name/le/lemmeknow/package.nix +++ b/pkgs/by-name/le/lemmeknow/package.nix @@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/swanandx/lemmeknow"; changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - Br1ght0ne - ]; + maintainers = [ ]; mainProgram = "lemmeknow"; }; } diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix index 89092dd68145..1b8aee44ddbc 100644 --- a/pkgs/by-name/le/letterpress/package.nix +++ b/pkgs/by-name/le/letterpress/package.nix @@ -73,7 +73,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://apps.gnome.org/Letterpress/"; changelog = "https://gitlab.gnome.org/World/Letterpress/-/releases/${version}"; license = licenses.gpl3Plus; - maintainers = [ maintainers.dawidd6 ]; + maintainers = [ ]; teams = [ teams.gnome-circle ]; platforms = platforms.linux; mainProgram = "letterpress"; diff --git a/pkgs/by-name/lh/lha/package.nix b/pkgs/by-name/lh/lha/package.nix index 9d8903980d91..9fea6e1beefe 100644 --- a/pkgs/by-name/lh/lha/package.nix +++ b/pkgs/by-name/lh/lha/package.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jca02266/lha"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - sander momeemt ]; # Some of the original LHa code has been rewritten and the current author diff --git a/pkgs/by-name/lh/lhasa/package.nix b/pkgs/by-name/lh/lhasa/package.nix index 418c2cb35c39..6f36ddacc154 100644 --- a/pkgs/by-name/lh/lhasa/package.nix +++ b/pkgs/by-name/lh/lhasa/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = [ maintainers.sander ]; mainProgram = "lha"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json index 8ec296557d0c..c557977a0a47 100644 --- a/pkgs/by-name/li/libation/deps.json +++ b/pkgs/by-name/li/libation/deps.json @@ -1,23 +1,33 @@ [ { "pname": "AAXClean", - "version": "2.0.2.1", - "hash": "sha256-9tCux7qkyTjJqGdll499k1/S3CiTCsp6VvFuGyJXo/g=" + "version": "2.1.0.1", + "hash": "sha256-dQJKHzET1QXKwxXqEb6X/B+vN6f8tF5jchxSGxUVeTs=" }, { "pname": "AAXClean.Codecs", - "version": "2.0.2.2", - "hash": "sha256-CT/3DzEnRHoPVQs6gPu1N9z7M6u7txKCH1+fuwng320=" + "version": "2.1.0.1", + "hash": "sha256-P80CPVrJfQw+HKkgbfx6szgzpk/+PuD2k68r4+tNh/U=" }, { "pname": "AudibleApi", - "version": "9.4.5.1", - "hash": "sha256-EE2GpXsVakLqN5JiK8LvPG/lNTbQk6r/MW6MFZwEA+E=" + "version": "10.1.0.1", + "hash": "sha256-kPYkep6Q4B7z/KgKd5pRN0LCxiPhKI2RxShSVZUZpY0=" }, { "pname": "Avalonia", - "version": "11.3.3", - "hash": "sha256-UvENUQgoTUikjIMTL+oI93FNwr1gZfoGVtZdYzBzdts=" + "version": "11.1.0", + "hash": "sha256-HVcwSKc+f69vuRHJ9CT0QL46WFM/gggnY6Wn8IUQq+U=" + }, + { + "pname": "Avalonia", + "version": "11.3.8", + "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g=" + }, + { + "pname": "Avalonia", + "version": "11.3.9", + "hash": "sha256-bjSH8REHeK19bh8IacmyllDPaWND+TJdkhKGc8LVvjE=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -26,78 +36,78 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.31", - "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.3", - "hash": "sha256-zg35D8NygrU8mCAsLLoPmrzXZcV31NuHNtTaiZZhOxc=" + "version": "11.3.9", + "hash": "sha256-Kk3AmO7foyO5JdnGKfE9KwtVyGwe6SgUZnXCX/OuZjo=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.3", - "hash": "sha256-kDO6o2U2SRVMRE/60FOiLfWi90HxYhoUnAIcxX270ww=" + "version": "11.3.9", + "hash": "sha256-VpJNTCaug7rtEfO2z1fFkAPXW2Y/lQSUInt6cVZC6DA=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.3", - "hash": "sha256-/jYjxA5vJqU5IpJkgnlathprzdHB/ihdL35ZZBRESeU=" + "version": "11.3.9", + "hash": "sha256-ib4psuecjBXKow0UC6oXvcVNhizFKokadCVqmwyQtCc=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.3", - "hash": "sha256-rHBFnhZ+gAqPqqDfZxBxUr3wXIpgOc9hInwzDOgdk5E=" + "version": "11.3.9", + "hash": "sha256-psajJAfqzLpMVx3//nezH7TixDJepN3/y6GwNn8k+TM=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.3", - "hash": "sha256-kUSE90HoJz9NsYCphLUQgNkxb3xHhFIlqXa6lzuGi4c=" + "version": "11.3.9", + "hash": "sha256-+adR3ErHqoqTBAJ5hMiyP6efX/hCAcWWCowCqA0Bxrw=" }, { "pname": "Avalonia.Native", - "version": "11.3.3", - "hash": "sha256-QmvN5gUsgjk7ViacdXOwHULHid0TfAKJGW3cf9A8bwQ=" - }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.3.3", - "hash": "sha256-Clq/13CZRTFEJmVw41Tw0tJEtm0AYvBKJah7OdFbBSo=" + "version": "11.3.9", + "hash": "sha256-cQ9/MKZ03jaLqAGRDLCzws5OfP/mSOoPRr1OxXNGa3o=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.3", - "hash": "sha256-gHZA53IyRAdeIg7yRIN6Pzh0AbOGd5B9mckEWsPuK7A=" + "version": "11.3.9", + "hash": "sha256-HxHN91T0BbQMkcZwozuVOQwmywm1oayTLYvUozwt1J0=" }, { "pname": "Avalonia.Skia", - "version": "11.3.3", - "hash": "sha256-pUMqXnupxztsAP/n4U2pSgTga89gy7CBLg39y2j0EjA=" + "version": "11.3.9", + "hash": "sha256-KCL1LNUd2i+50vQpDgfI+aMkIBUWtxExyuc43QIK21o=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.3", - "hash": "sha256-tWNl3jvESx96lTd6i0lxo6Y8/Y6cS5ZQrPovIolNfAE=" + "version": "11.3.9", + "hash": "sha256-4HuNP/nSB7T+n9KZQgXNvbgudG3eITnDACj8Y2NV6OU=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.3", - "hash": "sha256-nUfIEeJZgiLuy681S16Qncri6fvCGF7tYk4dSf3JY4s=" + "version": "11.3.9", + "hash": "sha256-0MyHPZbkp0DduFwoOMScAOKpqQ/Zs6DOUfexVLKzSco=" }, { "pname": "Avalonia.Win32", - "version": "11.3.3", - "hash": "sha256-jlQXEdbZjfRsu2MjYzHGUAyn+uvdACXCvm63HjUKqfQ=" + "version": "11.3.9", + "hash": "sha256-OwWQymPLmN362vMD6kZk8dBD/+lSpvGqIW0T/AquYig=" }, { "pname": "Avalonia.X11", - "version": "11.3.3", - "hash": "sha256-7A+uzB7g21P+RnKO4bKOJVY35qPz5Xna8n8VGG7RoMw=" + "version": "11.3.9", + "hash": "sha256-B8P+m2VyPwXCyVWGAKewZCqO8fycgYWjWx830VbR79A=" }, { - "pname": "BouncyCastle.Cryptography", - "version": "2.4.0", - "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA=" + "pname": "ClosedXML", + "version": "0.105.0", + "hash": "sha256-CaLSjP6wiKyNbelbJGj9/fsJlYq3arILFOtABKMRn4M=" + }, + { + "pname": "ClosedXML.Parser", + "version": "2.0.0", + "hash": "sha256-hdQBaNy5+lR4xSxu8mggvu3I4st2RRWQbtNxhVhLo38=" }, { "pname": "CommandLineParser", @@ -111,38 +121,38 @@ }, { "pname": "Dinah.Core", - "version": "9.0.0.1", - "hash": "sha256-tHuHWUgzj0ZmcXwnnkLPkWwRj0KWy9Y9gxae2cA/qJk=" - }, - { - "pname": "Dinah.Core", - "version": "9.0.3.1", - "hash": "sha256-RQQ27ECECPCTHnmdPZ6YjvGpCY9xRg39VOASMtJKJL0=" + "version": "10.0.0.1", + "hash": "sha256-xKcoEa/JeuDNoIOBks8g3PMIpHvio9ptN7iLlIbCnhU=" }, { "pname": "Dinah.EntityFrameworkCore", - "version": "9.0.0.1", - "hash": "sha256-OFLJW8MJpMq2iGb8I7R9SSPzZYQhmoW/e0h6mRuLbuc=" + "version": "10.0.0.1", + "hash": "sha256-Y0dbs7GiaPZ+YcVFuiXUuHeIR664+Bctus4Zq7iTQkE=" + }, + { + "pname": "DocumentFormat.OpenXml", + "version": "3.1.1", + "hash": "sha256-Ae/OjAGkFU6QlS78eh6qrRJZ9lPRqayOdV/Ao1O178w=" + }, + { + "pname": "DocumentFormat.OpenXml.Framework", + "version": "3.1.1", + "hash": "sha256-nmmxTIrtTmROSWkufbfqljGVyl0junW9d1bcAKDr8Mo=" }, { "pname": "DynamicData", - "version": "8.4.1", - "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" + "version": "9.4.1", + "hash": "sha256-CX4NQj2LTk/8f4xDE5rUVBsqcY74H/1qUHFTrVX+9/0=" }, { - "pname": "Enums.NET", - "version": "5.0.0", - "hash": "sha256-8cRZVOuu38cso7mNAEifxnN+v0W3T7xB+uR4SBvTkwc=" - }, - { - "pname": "ExtendedNumerics.BigDecimal", - "version": "2025.1001.2.129", - "hash": "sha256-LAlD9SWsKfXxMu0XTqxPBvWuN6MrBnETrWs8BVNDsVk=" + "pname": "ExcelNumberFormat", + "version": "1.1.0", + "hash": "sha256-xIrzBWCY2PEjIltpwW2BT1j/KJKOH2qPtvumX+NTZvE=" }, { "pname": "Google.Protobuf", - "version": "3.32.0", - "hash": "sha256-ljHGi+RkkujLV3RCE50nj9BkqdhVZjbrnBzcDhx80gA=" + "version": "3.33.1", + "hash": "sha256-GKjiqDgV21LbVguaEJ//SSNuDI7zu7n0otEbYoJZUx8=" }, { "pname": "HarfBuzzSharp", @@ -171,13 +181,8 @@ }, { "pname": "HtmlAgilityPack", - "version": "1.11.71", - "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE=" - }, - { - "pname": "HtmlAgilityPack", - "version": "1.12.2", - "hash": "sha256-SbzDudru9uTMuMjSTxnKyoT0KbAkd8SVNH9VOfCiR50=" + "version": "1.12.4", + "hash": "sha256-58ohjvtRXFwfY46Hny9GWL2r6KwZzkJWHFXwIWjkaHU=" }, { "pname": "Humanizer.Core", @@ -186,13 +191,8 @@ }, { "pname": "LuceneNet303r2", - "version": "3.0.3.9", - "hash": "sha256-8k9JZMikpSsVKFMSg9CK19YbJFJ9ifpYCKaEtC+f7mY=" - }, - { - "pname": "MathNet.Numerics.Signed", - "version": "5.0.0", - "hash": "sha256-76y1jaL+abqoyP3K4n9phF1S1hTpylkw//vTHukROUc=" + "version": "3.0.3.11", + "hash": "sha256-Nb0lWXx2oRaKz3fTJ+Y5VUKFDsXQjIWSOqvEiE6orq4=" }, { "pname": "MicroCom.Runtime", @@ -200,165 +200,145 @@ "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "7.0.0", - "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + "pname": "Microsoft.Build", + "version": "17.7.2", + "hash": "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM=" }, { "pname": "Microsoft.Build.Framework", - "version": "16.10.0", - "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0=" + "version": "17.14.28", + "hash": "sha256-7RzEyIipumafwLW1xN1q23114NafG6PT0+RADElNsiM=" }, { "pname": "Microsoft.Build.Framework", - "version": "17.8.3", - "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34=" + "version": "17.7.2", + "hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=" }, { - "pname": "Microsoft.Build.Locator", - "version": "1.7.8", - "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs=" + "pname": "Microsoft.Build.Tasks.Core", + "version": "17.14.28", + "hash": "sha256-M9zRXYijH2HtLlRXbrUK1a1LQ9zkT+DC9ZmMiiVZwv0=" + }, + { + "pname": "Microsoft.Build.Tasks.Core", + "version": "17.7.2", + "hash": "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU=" }, { "pname": "Microsoft.Build.Tasks.Git", "version": "8.0.0", "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" }, + { + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.14.28", + "hash": "sha256-VFfO+UpyTpw2X/qiCCOCYzvMLuu7B+XVSSpJZQLkPzU=" + }, + { + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.7.2", + "hash": "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A=" + }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.4", - "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.8.0", - "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" + "version": "4.14.0", + "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.8.0", - "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" + "version": "4.14.0", + "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "4.8.0", - "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE=" + "version": "4.14.0", + "hash": "sha256-aNbV1a0yYBs0fpQawG6LXcbyoE8en+YFSpV5vcYE4J4=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "4.8.0", - "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM=" + "version": "4.14.0", + "hash": "sha256-0YfeaJe01WBUm9avy4a8FacQJXA1NkpnDpiXu4yz88I=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild", - "version": "4.8.0", - "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" + "version": "4.14.0", + "hash": "sha256-5SJfpRqzqCK0UbkmAaJpA/r1XJb0YAriMMeQHYC4d+o=" }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "9.0.8", - "hash": "sha256-y9HnRrftjgRRuFF/N75BHNhFcmb3Nj0+sDk3mwYmyxU=" + "version": "10.0.0", + "hash": "sha256-04jYg9EbrQc+LH6wKh3ASCCNau6wZ5Gq0tDYd8oIHAs=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "9.0.0", - "hash": "sha256-pFO6T2UsnYuXqPZzG5SziG0v7fYkLd5GlQ2DWk21XCc=" - }, - { - "pname": "Microsoft.EntityFrameworkCore", - "version": "9.0.8", - "hash": "sha256-QJNiGeyZh2AHpm6CumccWYImYXHHoi3pSVBMk0Z0oto=" + "version": "10.0.0", + "hash": "sha256-xfgrlxhtOkQwF5Q7j8gSm41URJiH8IuJ/T/Dh88++hE=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "9.0.0", - "hash": "sha256-8SPpC6uTLl3TryFCTb2qqqLW4AsF/mTkOQteZ76dcfU=" - }, - { - "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "9.0.8", - "hash": "sha256-+0Mx7e3aadcwnj17NI1bqcv+Ik6jJwFZhPBO0vm9d0Q=" + "version": "10.0.0", + "hash": "sha256-UDgZbRQcGPaKsE53EH6bvJiv+Q4KSxAbnsVhTVFGG4Q=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "9.0.0", - "hash": "sha256-TzAFoT3LEHcyD7sjoGMXOV7BVWNPSDIn+5+QQg4BYGs=" - }, - { - "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "9.0.8", - "hash": "sha256-Y3R32LoIqC0NIDvlHLpSfvcqmfDOmja03yYRLyRldSs=" + "version": "10.0.0", + "hash": "sha256-7Q0jYJO50cqGI+u6gLpootbB8GZvgsgtg0F9FZI1jig=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "9.0.8", - "hash": "sha256-ze9sA2ln90Cu83sYr5c7Mx/g7gt6wpQdGLf0u9bRh94=" + "version": "10.0.0", + "hash": "sha256-wHIw05vHNtiv3K4xS1u+crZTn+kr7UJXoKOYwTr4SxY=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "9.0.0", - "hash": "sha256-b7YR7J6mv7IN0+TQIIm6xKw4heEPol0dLDgxVHAUu7s=" - }, - { - "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "9.0.8", - "hash": "sha256-7V4UChYCgp6mOwCbdScE19N+SOO43vqFP276RZSjnZ0=" + "version": "10.0.0", + "hash": "sha256-vOP2CE5YA551BlpbOuIy6RuAiAEPEpCVS1cEE33/zN4=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "9.0.8", - "hash": "sha256-S1+04gZRmysziMQy3jLXY2Kd6q4ZT5DXCWLh9wE1zE0=" + "version": "10.0.0", + "hash": "sha256-tcBTibp0uApuqynWhxTintjkcC2oMfUQ8BJ2ORGWkKY=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "9.0.8", - "hash": "sha256-2TN1U1oZzk99hghB+hsqoLFUUbfLkE1O8dIDVNKZPkI=" + "version": "10.0.0", + "hash": "sha256-Y5cM2fSh6b75L3dRdF0odXz4gKIYip/JIO1rsdkeOGM=" }, { "pname": "Microsoft.EntityFrameworkCore.Tools", - "version": "9.0.8", - "hash": "sha256-pyyQ+YT1WE/Dwab33RWK96hDG+Ds0mvWCynnHWt81h8=" + "version": "10.0.0", + "hash": "sha256-gqqJc38tmM3u9bbyboTxgN0nhtIH5cwwdU4ICHDgAFg=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "9.0.8", - "hash": "sha256-Utc84ZN96qoVki9jTpkD0Ph6VhEfWCShWAQIhiCD9KQ=" + "version": "10.0.0", + "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.0", - "hash": "sha256-OZVOVGZOyv9uk5XGJrz6irBkPNjxnBxjfSyW30MnU0s=" - }, - { - "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.8", - "hash": "sha256-nZu6Qmwzcd5NJhgwjDIT18A1KttaFXMZ3E+f09Iq5Ng=" + "version": "10.0.0", + "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.0", - "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" + "version": "10.0.0", + "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg=" }, { - "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.8", - "hash": "sha256-GnD1Ar/yZfCZQw2k/2jKteLG1lF/Dk7S3tgMvn+SFqc=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "10.0.0", + "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.0", "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "9.0.8", - "hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" - }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", @@ -366,78 +346,63 @@ }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "9.0.0", - "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s=" - }, - { - "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "9.0.8", - "hash": "sha256-W7PnvqPcdJnJIPaEh1qRDh/WCVSz/KQy+GAMhMNhKE4=" + "version": "10.0.0", + "hash": "sha256-rN+3rqrHiTaBfHgP+E4dA8Qm2cFJPfbEcd93yKLsqlQ=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "9.0.0", - "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Json", - "version": "9.0.8", - "hash": "sha256-/QFT/SksJcsZ2Cjw0WkJzLnp+mT2m+38avEOgttrAaM=" + "version": "10.0.0", + "hash": "sha256-VCFukgsxiQ2MFGE6RDMFTGopBHbcZL2t0ER7ENaFXRY=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.8", - "hash": "sha256-fJOwbtlmP6mXGYqHRCqtb7e08h5mFza6Wmd1NbNq3ug=" + "version": "10.0.0", + "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "9.0.0", + "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.8", - "hash": "sha256-uFBeyx8WTgDX2z8paf6ZAQ45WexaWG8uzO5x+qGrPRU=" + "version": "10.0.0", + "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.2", - "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + "version": "10.0.0", + "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI=" }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "9.0.0", "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "9.0.8", - "hash": "sha256-Y07YpP2Kgs5liww09aV/vJjuJx3pmOz8PREt3xrEeOI=" - }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.0", - "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.8", - "hash": "sha256-9X3roHvoAFzlTwVSlkbksB9EosKjVHeXuR5Jm682Wvk=" + "version": "10.0.0", + "hash": "sha256-CHDs2HCN8QcfuYQpgNVszZ5dfXFe4yS9K2GoQXecc20=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.0", - "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.8", - "hash": "sha256-lVnOgpxjO5VaCgviGeQ0R8kAIiDN1nKqpbj8CrCDpic=" + "version": "10.0.0", + "hash": "sha256-2Rw/cwBO+/A3QY2IjN/c8Y0LhtC1qTBL7VdJiD1J2UQ=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.0", - "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc=" + "version": "10.0.0", + "hash": "sha256-ETfVTdsdBtp69EggLg/AARTQW4lLQYVdVldXIQrsjZA=" }, { - "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.8", - "hash": "sha256-1dmTABLD1Zo2vdZFsASTx8T8MRI8emN//KuNP3OiWKw=" + "pname": "Microsoft.Extensions.Logging", + "version": "10.0.0", + "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs=" }, { "pname": "Microsoft.Extensions.Logging", @@ -445,19 +410,29 @@ "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, { - "pname": "Microsoft.Extensions.Logging", - "version": "9.0.8", - "hash": "sha256-SEVCMpVwjcQtTSs4lirb89A36MxLQwwqdDFWbr1VvP8=" + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "10.0.0", + "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.8", - "hash": "sha256-vaUApbwsqKt7+AItgusbCKKdTyOg/5KCdSZjDZarw20=" + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.8", - "hash": "sha256-AbwIL8sSZ/qDBKbvabHp1tbExBFr73fYjuXJiV6On1U=" + "version": "10.0.0", + "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.0", + "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "10.0.0", + "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -465,29 +440,14 @@ "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" }, { - "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.8", - "hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc=" + "pname": "Microsoft.NET.StringTools", + "version": "17.14.28", + "hash": "sha256-UzREyvDxkiOQ4cEOQ5UCjkwXGrldIDCcbefECTPGjXI=" }, { - "pname": "Microsoft.IO.RecyclableMemoryStream", - "version": "3.0.1", - "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + "pname": "Microsoft.NET.StringTools", + "version": "17.7.2", + "hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=" }, { "pname": "Microsoft.SourceLink.Common", @@ -520,9 +480,19 @@ "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { - "pname": "NPOI", - "version": "2.7.4", - "hash": "sha256-HrKC49BTCxR2/jJRWgwuLsOTvq1KynRnBR2Xklsokcs=" + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, + { + "pname": "Npgsql", + "version": "10.0.0", + "hash": "sha256-UVKz9dH/rVCCbMyFdqA31RYpht1XgDRLIqUy0Dp9ACQ=" + }, + { + "pname": "Npgsql.EntityFrameworkCore.PostgreSQL", + "version": "10.0.0", + "hash": "sha256-XIJxnTMektQVP1qtslEIGbmBGrIQsvjQjCMRTs9UIbg=" }, { "pname": "Octokit", @@ -536,29 +506,34 @@ }, { "pname": "Polly", - "version": "8.6.2", - "hash": "sha256-JWPe3Une30ljf2z4aeshNSjz2CfIQZWw3IHiPvFgy6E=" + "version": "8.6.4", + "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I=" }, { "pname": "Polly.Core", - "version": "8.6.2", - "hash": "sha256-jX1i7tkQwaY74qgVarx6vLeLIg7zonQwisFvm6nWrHs=" + "version": "8.6.4", + "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I=" + }, + { + "pname": "RBush.Signed", + "version": "4.0.0", + "hash": "sha256-I8/D35ODjUcseJvI8NXXoPom7lsIBAJEiXtnIKm4Kok=" }, { "pname": "ReactiveUI", - "version": "20.1.1", - "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" + "version": "22.2.1", + "hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE=" + }, + { + "pname": "ReactiveUI.Avalonia", + "version": "11.3.8", + "hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo=" }, { "pname": "Serilog", "version": "2.8.0", "hash": "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To=" }, - { - "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" - }, { "pname": "Serilog", "version": "4.0.0", @@ -574,11 +549,6 @@ "version": "8.4.0", "hash": "sha256-2We6ZVAcFsEYVV7vVM+F1+4phHRqc7NeQZKbYDK0Gew=" }, - { - "pname": "Serilog.Settings.Configuration", - "version": "8.0.4", - "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ=" - }, { "pname": "Serilog.Settings.Configuration", "version": "9.0.0", @@ -586,38 +556,18 @@ }, { "pname": "Serilog.Sinks.Console", - "version": "6.0.0", - "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" - }, - { - "pname": "Serilog.Sinks.File", - "version": "6.0.0", - "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" + "version": "6.1.1", + "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY=" }, { "pname": "Serilog.Sinks.File", "version": "7.0.0", "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, - { - "pname": "SharpZipLib", - "version": "1.4.2", - "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" - }, { "pname": "SixLabors.Fonts", - "version": "1.0.1", - "hash": "sha256-fox6f9Z5xunVXiy71KTSkb0DirMN00tuUlChyp96kiI=" - }, - { - "pname": "SixLabors.ImageSharp", - "version": "2.1.10", - "hash": "sha256-nmvI1fZtimtmiitXBQJhYXHsYM8IGjEMxlKcsaORC3Y=" - }, - { - "pname": "SixLabors.ImageSharp", - "version": "3.1.11", - "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA=" + "version": "1.0.0", + "hash": "sha256-kyAQcZZOdD50Lo7l7z8qnFMerJjlAV66HNBq7BI6TNM=" }, { "pname": "SkiaSharp", @@ -646,28 +596,43 @@ }, { "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" + "version": "17.1.1", + "hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo=" + }, + { + "pname": "Splat.Builder", + "version": "17.1.1", + "hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI=" + }, + { + "pname": "Splat.Core", + "version": "17.1.1", + "hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0=" + }, + { + "pname": "Splat.Logging", + "version": "17.1.1", + "hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", - "version": "2.1.10", - "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ=" + "version": "2.1.11", + "hash": "sha256-kWRapMTVEfcc0DxnI9Ai1+RwAAcR2+HUu+WF+OeLJCs=" }, { "pname": "SQLitePCLRaw.core", - "version": "2.1.10", - "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" + "version": "2.1.11", + "hash": "sha256-s/fxEoYlNf9c2C4HZueMzPCBvpiViDVlSpg7epB0GXY=" }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", - "version": "2.1.10", - "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc=" + "version": "2.1.11", + "hash": "sha256-ZmffbHNgnLUdsPbikilEAihxXl1MedIBQ1Xzt9226Bw=" }, { "pname": "SQLitePCLRaw.provider.e_sqlite3", - "version": "2.1.10", - "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" + "version": "2.1.11", + "hash": "sha256-LdfV325AmYgBOwmwP7MNZxMJZkNO6bwrHvB6C5SyItA=" }, { "pname": "System.CodeDom", @@ -675,59 +640,54 @@ "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { - "pname": "System.Collections.Immutable", + "pname": "System.CodeDom", "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=" }, { - "pname": "System.Collections.Immutable", + "pname": "System.CodeDom", "version": "9.0.0", - "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" - }, - { - "pname": "System.Collections.Immutable", - "version": "9.0.8", - "hash": "sha256-/5757YLLlbkDL29+ZSoTiJ4TpFy6HQSKwdMPlT7KYQw=" - }, - { - "pname": "System.Collections.NonGeneric", - "version": "4.3.0", - "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" + "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=" }, { "pname": "System.Composition", - "version": "7.0.0", - "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao=" + "version": "9.0.0", + "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=" }, { "pname": "System.Composition.AttributedModel", - "version": "7.0.0", - "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM=" + "version": "9.0.0", + "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M=" }, { "pname": "System.Composition.Convention", - "version": "7.0.0", - "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk=" + "version": "9.0.0", + "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=" }, { "pname": "System.Composition.Hosting", - "version": "7.0.0", - "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M=" + "version": "9.0.0", + "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=" }, { "pname": "System.Composition.Runtime", - "version": "7.0.0", - "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0=" + "version": "9.0.0", + "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=" }, { "pname": "System.Composition.TypedParts", + "version": "9.0.0", + "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "10.0.0", + "hash": "sha256-wiKDcpzYRM2Qsb9EE5luJYpjeItQXJT8LvdruqeqZtg=" + }, + { + "pname": "System.Configuration.ConfigurationManager", "version": "7.0.0", - "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s=" + "hash": "sha256-SgBexTTjRn23uuXvkzO0mz0qOfA23MiS4Wv+qepMLZE=" }, { "pname": "System.Configuration.ConfigurationManager", @@ -735,9 +695,9 @@ "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=" }, { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + "pname": "System.Diagnostics.EventLog", + "version": "10.0.0", + "hash": "sha256-pN3tld926Fp0n5ZNjjzIJviUQrynlOAB0vhc1aoso6E=" }, { "pname": "System.Diagnostics.EventLog", @@ -745,34 +705,14 @@ "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=" }, { - "pname": "System.Diagnostics.EventLog", - "version": "9.0.8", - "hash": "sha256-u10dcgug0Pwp83YNagVto8Pu3ieuByflYLNwAdX9Fm0=" + "pname": "System.Formats.Nrbf", + "version": "9.0.0", + "hash": "sha256-c4qf6CocQUZB0ySGQd8s15PXY7xfrjQqMGXxkwytKyw=" }, { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.IO.Pipelines", - "version": "7.0.0", - "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" - }, - { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" - }, - { - "pname": "System.Memory", - "version": "4.5.3", - "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" - }, - { - "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + "pname": "System.IO.Packaging", + "version": "8.0.1", + "hash": "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4=" }, { "pname": "System.Reactive", @@ -780,14 +720,19 @@ "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + "pname": "System.Reactive", + "version": "6.0.2", + "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE=" }, { - "pname": "System.Reflection.Metadata", + "pname": "System.Reactive", + "version": "6.1.0", + "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y=" + }, + { + "pname": "System.Reflection.MetadataLoadContext", "version": "7.0.0", - "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + "hash": "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI=" }, { "pname": "System.Reflection.TypeExtensions", @@ -795,34 +740,29 @@ "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" }, { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "5.0.0", - "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + "pname": "System.Resources.Extensions", + "version": "9.0.0", + "hash": "sha256-y2gLEMuAy6QfEyNJxABC/ayMWGnwlpX735jsUQLktho=" }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.1", - "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" + "version": "7.0.0", + "hash": "sha256-3J3vL9hcKSuZjT2GKappa2A9p2xJm1nH2asTNAl8ZCA=" + }, + { + "pname": "System.Security.Cryptography.Pkcs", + "version": "7.0.2", + "hash": "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8=" + }, + { + "pname": "System.Security.Cryptography.Pkcs", + "version": "9.0.0", + "hash": "sha256-AjG14mGeSc2Ka4QSelGBM1LrGBW3VJX60lnihKyJjGY=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "10.0.0", + "hash": "sha256-hoR1lVXVEUXfItNzJ23/SRybLBqaf4ZYzJBjlWgHpSM=" }, { "pname": "System.Security.Cryptography.ProtectedData", @@ -831,53 +771,33 @@ }, { "pname": "System.Security.Cryptography.Xml", - "version": "8.0.2", - "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28=" + "version": "7.0.1", + "hash": "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w=" }, { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, - { - "pname": "System.ServiceProcess.ServiceController", + "pname": "System.Security.Cryptography.Xml", "version": "9.0.0", - "hash": "sha256-R2tdnqpNudV9Z4BTuI2q7Yqb97ZDEOjLxBNd28HjRX8=" + "hash": "sha256-SQJWwAFrJUddEU6JiZB52FM9tGjRlJAYH8oYVzG5IJU=" + }, + { + "pname": "System.Security.Permissions", + "version": "7.0.0", + "hash": "sha256-DOFoX+AKRmrkllykHheR8FfUXYx/Ph+I/HYuReQydXI=" + }, + { + "pname": "System.Security.Permissions", + "version": "9.0.0", + "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=" }, { "pname": "System.ServiceProcess.ServiceController", - "version": "9.0.8", - "hash": "sha256-Cb/kCaHXKtuGva1lsog1NDzEWVkHL5UUhBBGlA36N9Q=" + "version": "10.0.0", + "hash": "sha256-94SnWmBG5zcg2JmzFb6H3KKBnyi7OtYhRY7imxju3d8=" }, { - "pname": "System.Text.Encoding.CodePages", - "version": "5.0.0", - "hash": "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4=" - }, - { - "pname": "System.Text.Json", - "version": "7.0.3", - "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.8", - "hash": "sha256-CEoLOj0KeuctK2jXd6yZ+/5yx4apsEh7+xsJH95h/1c=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Channels", - "version": "7.0.0", - "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + "pname": "System.Windows.Extensions", + "version": "9.0.0", + "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=" }, { "pname": "Tmds.DBus.Protocol", @@ -885,8 +805,8 @@ "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" }, { - "pname": "ZString", - "version": "2.6.0", - "hash": "sha256-9Q/L1SPmI+oVxvUBIz202mUn+UVsoV/y2OfhopHXzeo=" + "pname": "WebViewControlAvaloniaFree", + "version": "11.3.15", + "hash": "sha256-Bp93SS9iabK+nHzqDu/MP9L+zyvdgFKPVTLzNHR0oJE=" } ] diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index d2cdd50d4124..76608ebc19e8 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -13,20 +13,20 @@ buildDotnetModule rec { pname = "libation"; - version = "12.5.4"; + version = "12.7.3"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-W2wCtXcvft450A2cdLPbOFjHrQahSbTEbfyoSXUtH/E="; + hash = "sha256-MFrtEFgM584SGbcQNQLTlj4BBh2ct2rpQyx0/se8Eo0="; }; sourceRoot = "${src.name}/Source"; - dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; - dotnet-runtime = dotnetCorePackages.runtime_9_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; nugetDeps = ./deps.json; @@ -57,8 +57,6 @@ buildDotnetModule rec { postInstall = '' install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop - substituteInPlace $out/share/applications/libation.desktop \ - --replace-fail "/usr/bin/libation" "libation" ''; # wrap manually, because we need lower case executables @@ -78,6 +76,9 @@ buildDotnetModule rec { homepage = "https://github.com/rmcrackan/Libation"; license = lib.licenses.gpl3Plus; mainProgram = "libation"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + tebriel + ]; }; } diff --git a/pkgs/by-name/li/libatomic_ops/package.nix b/pkgs/by-name/li/libatomic_ops/package.nix index e7f2d6ca0190..38dda0f5ce14 100644 --- a/pkgs/by-name/li/libatomic_ops/package.nix +++ b/pkgs/by-name/li/libatomic_ops/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libatomic_ops"; - version = "7.8.4"; + version = "7.10.0"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "sha256-I1bgAugO9pWHXpcdak/YxhylxvpP0b8xzOVKJpyL/NU="; + sha256 = "sha256-DbPr/3VdsXD2XnSmTsRRGBLp7jGFwjLu/+rNJ0GQ37A="; }; outputs = [ diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index dd0f0e59dbca..e02bed45e34f 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc="; + hash = "sha256-MQADGFruQODQ8rxu1R8TF9zqd4jKLtyRQrWFds5UNS0="; }; outputs = [ diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 150bfd679762..f6eca00a1e0a 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -11,6 +11,8 @@ makeBinaryWrapper, pkg-config, targetPackages, + cosmic-icons, + cosmic-settings, libGL, libxkbcommon, xorg, @@ -49,11 +51,11 @@ makeSetupHook { let fallbackThemes = runCommand "cosmic-fallback-themes" { } '' mkdir -p $out/share - ln -s ${targetPackages.cosmic-settings}/share/cosmic $out/share/cosmic + ln -s ${targetPackages.cosmic-settings or cosmic-settings}/share/cosmic $out/share/cosmic ''; in lib.makeSearchPath "share" ( - lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ] + lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons or cosmic-icons ] ); # Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392 # See ./libcosmic-app-hook.sh diff --git a/pkgs/by-name/li/libcrossguid/package.nix b/pkgs/by-name/li/libcrossguid/package.nix index ac743a2452a7..bc9b0706738a 100644 --- a/pkgs/by-name/li/libcrossguid/package.nix +++ b/pkgs/by-name/li/libcrossguid/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/graeme-hill/crossguid"; platforms = with platforms; linux; }; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 64e742343c2c..53574bba138f 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.28.0"; + version = "2.33.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-nJ9ZBk+CO4FI5xqDUSNTc+1OEClAS3D5D5Kc6oK9LEc="; + hash = "sha256-4cnYTtm5bQ86BgMOOH5d881ahjuFFOxVuGffRp3Nbw4="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-bqHe7f9+ABGFnk2rQqFHd9VWuTw05i2JA4ZsSXJe4Dk="; + hash = "sha256-TOGSvvFKsWshfMqGNEOtjhHcpTJ0FAiK6RigmlT4AFA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index 99297ce3283a..b29b53cc4988 100644 --- a/pkgs/by-name/li/libdict/package.nix +++ b/pkgs/by-name/li/libdict/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdict"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "rtbrick"; repo = "libdict"; rev = finalAttrs.version; - hash = "sha256-GFK2yjtxAwwstoJQGCXxwNKxn3LL74FBxad7JdOn0pU="; + hash = "sha256-604escyV5MVuYggs1awIrorCrdXSUj3IhjwXV2QdDMU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix index a7a09e96dfee..a7e58c1dbee6 100644 --- a/pkgs/by-name/li/libdigidocpp/package.nix +++ b/pkgs/by-name/li/libdigidocpp/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.flokli - maintainers.jagajaga ]; }; } diff --git a/pkgs/by-name/li/libgdstk/package.nix b/pkgs/by-name/li/libgdstk/package.nix new file mode 100644 index 000000000000..7ec5c8d0920a --- /dev/null +++ b/pkgs/by-name/li/libgdstk/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + + # build-time deps + cmake, + ninja, + + # run-time deps + zlib, + qhull, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libgdstk"; + version = "0.9.61"; + pyproject = true; + + src = fetchFromGitHub { + owner = "heitzmann"; + repo = "gdstk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-soU+6EbyOkHGvVq230twiRzywOskhkkXFr5akBpvgBw="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + zlib + qhull + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "C++/Python library for creation and manipulation of GDSII and OASIS files"; + homepage = "https://github.com/heitzmann/gdstk"; + changelog = "https://github.com/heitzmann/gdstk/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ + eljamm + gonsolo + ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch b/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch deleted file mode 100644 index 8c8550a1ce2b..000000000000 --- a/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 4277cc75bc147d0af6ffddc7db96f48492977968 -Author: bakersdozen123 -Date: Sat Oct 11 09:56:48 2025 -0700 - - ssh: fix custom ssh heap buffer overflow - - The `ssh_custom_free()` function calls `strlen()` on the `publickey` - field, which stores binary data, not a null-terminated string. This - causes a heap buffer overflow when the public key data is not - null-terminated or contains embedded null bytes. - - The `publickey` field stores binary data, as required by the underlying - `libssh2_userauth_publickey()` function, which accepts a public key - parameter of the type `const unsigned char*`. - - Use the stored `publickey_len` instead of `strlen()` to determine the - correct buffer size. - -diff --git a/src/libgit2/transports/credential.c b/src/libgit2/transports/credential.c -index b47bd63a1..7d0eacecf 100644 ---- a/src/libgit2/transports/credential.c -+++ b/src/libgit2/transports/credential.c -@@ -161,7 +161,7 @@ static void ssh_custom_free(struct git_credential *cred) - - if (c->publickey) { - /* Zero the memory which previously held the publickey */ -- size_t key_len = strlen(c->publickey); -+ size_t key_len = c->publickey_len; - git__memzero(c->publickey, key_len); - git__free(c->publickey); - } diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix index a244a72cfa3d..7a6d5c1ad278 100644 --- a/pkgs/by-name/li/libgit2/package.nix +++ b/pkgs/by-name/li/libgit2/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.9.1"; + version = "1.9.2"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = [ @@ -36,14 +36,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw="; + hash = "sha256-TCeEh8DpVoxpF/HkahxM3ONDjawAkIiMo6S7ogG3fLg="; }; - patches = [ - # https://github.com/libgit2/libgit2/pull/7146 - ./fix-ssh-custom-heap-buffer-overflow.patch - ]; - cmakeFlags = [ "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=llhttp" diff --git a/pkgs/by-name/li/libidn/package.nix b/pkgs/by-name/li/libidn/package.nix index c60f4815390d..d36eedac8fe9 100644 --- a/pkgs/by-name/li/libidn/package.nix +++ b/pkgs/by-name/li/libidn/package.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ lsix ]; }; }) diff --git a/pkgs/by-name/li/libkate/package.nix b/pkgs/by-name/li/libkate/package.nix index 553ba6e89ce3..dc076dec0843 100644 --- a/pkgs/by-name/li/libkate/package.nix +++ b/pkgs/by-name/li/libkate/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.4.3"; src = fetchFromGitLab { - domain = "gitlab.xiph.org/"; + domain = "gitlab.xiph.org"; owner = "xiph"; repo = "kate"; tag = "kate-${finalAttrs.version}"; diff --git a/pkgs/by-name/li/libkcapi/package.nix b/pkgs/by-name/li/libkcapi/package.nix index 97009bbe40f9..aea06836eb4e 100644 --- a/pkgs/by-name/li/libkcapi/package.nix +++ b/pkgs/by-name/li/libkcapi/package.nix @@ -13,17 +13,24 @@ kcapi-dgstapp ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkcapi"; version = "1.5.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "libkcapi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8="; }; + outputs = [ + "out" + ] + ++ lib.optionals kcapi-test [ + "selftests" + ]; + nativeBuildInputs = [ autoreconfHook ]; # libkcapi looks also for a host c compiler when cross-compiling @@ -33,6 +40,7 @@ stdenv.mkDerivation rec { buildPackages.stdenv.cc ]; + strictDeps = true; enableParallelBuilding = true; configureFlags = @@ -43,6 +51,11 @@ stdenv.mkDerivation rec { ++ lib.optional kcapi-encapp "--enable-kcapi-encapp" ++ lib.optional kcapi-dgstapp "--enable-kcapi-dgstapp"; + postInstall = lib.optionalString kcapi-test '' + mkdir -p $selftests/bin + find $out -iname '*.sh' -exec mv {} $selftests/bin/ \; + ''; + meta = { homepage = "http://www.chronox.de/libkcapi.html"; description = "Linux Kernel Crypto API User Space Interface Library"; @@ -56,4 +69,4 @@ stdenv.mkDerivation rec { thillux ]; }; -} +}) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 416e18fb5d63..bd063f6cee84 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; tag = finalAttrs.version; - hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0="; + hash = "sha256-ojcAS5NYAhklACrBkmSHRPNiVLjUR/umll0vhoFnFBs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmatthew_java/package.nix b/pkgs/by-name/li/libmatthew_java/package.nix index 83d7fdc2ea26..bef6d89380de 100644 --- a/pkgs/by-name/li/libmatthew_java/package.nix +++ b/pkgs/by-name/li/libmatthew_java/package.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = [ maintainers.sander ]; license = licenses.mit; }; } diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix index c8a6c712c1d6..a152d0823744 100644 --- a/pkgs/by-name/li/libnet/package.nix +++ b/pkgs/by-name/li/libnet/package.nix @@ -5,6 +5,7 @@ autoconf, automake, libtool, + bash, }: stdenv.mkDerivation rec { @@ -18,14 +19,30 @@ stdenv.mkDerivation rec { hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; }; + strictDeps = true; + enableParallelBuilding = true; + + outputs = [ + "out" + "dev" + ]; + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ + bash + ]; + preConfigure = "./autogen.sh"; + preFixup = '' + moveToOutput bin/libnet-config "$dev" + ''; + meta = with lib; { homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; diff --git a/pkgs/by-name/li/liboprf/no-static.patch b/pkgs/by-name/li/liboprf/no-static.patch new file mode 100644 index 000000000000..7fd8afdefcd8 --- /dev/null +++ b/pkgs/by-name/li/liboprf/no-static.patch @@ -0,0 +1,37 @@ +diff --git a/makefile b/makefile +index 444feae..0b2d482 100644 +--- a/makefile ++++ b/makefile +@@ -134,8 +134,12 @@ clean: + + install: install-oprf install-noiseXK + +-install-oprf: $(DESTDIR)$(PREFIX)/lib/liboprf.$(SOEXT) \ +- $(DESTDIR)$(PREFIX)/lib/liboprf.$(STATICEXT) \ ++INSTALL_EXT=$(STATICEXT) ++ifeq ($(findstring -shared,$(LDFLAGS)),) ++ INSTALL_EXT=$(SOEXT) ++endif ++ ++install-oprf: $(DESTDIR)$(PREFIX)/lib/liboprf.$(INSTALL_EXT) \ + $(DESTDIR)$(PREFIX)/lib/pkgconfig/liboprf.pc \ + $(DESTDIR)$(PREFIX)/include/oprf/oprf.h \ + $(DESTDIR)$(PREFIX)/include/oprf/toprf.h \ +diff --git a/noise_xk/makefile b/noise_xk/makefile +index 0f18a04..b6261a5 100644 +--- a/noise_xk/makefile ++++ b/noise_xk/makefile +@@ -56,7 +56,12 @@ clean: + liboprf-noiseXK.$(SOEXT).$(SOVER): liboprf-noiseXK.$(SOEXT) + ln -sf $^ $@ + +-install: $(DESTDIR)$(PREFIX)/lib/liboprf-noiseXK.$(SOEXT) $(DESTDIR)$(PREFIX)/lib/liboprf-noiseXK.$(STATICEXT) $(DESTDIR)$(PREFIX)/include/oprf/noiseXK ++INSTALL_EXT=$(STATICEXT) ++ifeq ($(findstring -shared,$(LDFLAGS)),) ++ INSTALL_EXT=$(SOEXT) ++endif ++ ++install: $(DESTDIR)$(PREFIX)/lib/liboprf-noiseXK.$(INSTALL_EXT) $(DESTDIR)$(PREFIX)/include/oprf/noiseXK + + uninstall: $(DESTDIR)$(PREFIX)/lib/liboprf-noiseXK.$(SOEXT) $(DESTDIR)$(PREFIX)/lib/liboprf-noiseXK.$(STATICEXT) $(DESTDIR)$(PREFIX)/include/oprf/noiseXK + rm -rf $^ diff --git a/pkgs/by-name/li/liboprf/package.nix b/pkgs/by-name/li/liboprf/package.nix index c936a121b585..30e0c77c65c6 100644 --- a/pkgs/by-name/li/liboprf/package.nix +++ b/pkgs/by-name/li/liboprf/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src"; + patches = [ + ./no-static.patch + ]; + strictDeps = true; nativeBuildInputs = [ pkgconf ]; diff --git a/pkgs/by-name/li/libp11/package.nix b/pkgs/by-name/li/libp11/package.nix index 4b12b2bda7dc..932106c7f3bd 100644 --- a/pkgs/by-name/li/libp11/package.nix +++ b/pkgs/by-name/li/libp11/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "OpenSC"; repo = "libp11"; rev = "${pname}-${version}"; - sha256 = "sha256-teYXlPtCt6ifQDArbCJWGrYl9pdr6V7HVpU4HXTPIco="; + sha256 = "sha256-xH5Ic8HpWB5O2MWXf2A9FUiV10VZajDdPqEVF0Hs6u0="; }; configureFlags = [ diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index dfd54c06efad..c1742c1c3bf1 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.19"; + version = "9.0.20"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-mAf4jgI8aum/XbO8OKOoLCMWxwUMee5erDocxV8/TMA="; + hash = "sha256-naIlf09phlgFS4GqNSLLqzQwM3DGp3bBu3cFinrUYFA="; }; patches = [ diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix index aa2b60d84175..996d89a7dc71 100644 --- a/pkgs/by-name/li/libresample/package.nix +++ b/pkgs/by-name/li/libresample/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = lib.platforms.all; maintainers = [ - lib.maintainers.sander lib.maintainers.emily ]; mainProgram = "resample-sndfile"; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index bbab677e56f9..02978f5ea6a4 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-11-19"; + version = "0-unstable-2025-12-02"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "279b031c92c7a376be47ffdec5fe669fb5dcebc0"; - hash = "sha256-0OltcN4W0vp7jtDSSIJ2ZanFi5p/efnPDOhaurr3ShY="; + rev = "cf5c768ffda2520d4938df68d33fd63fff276c0c"; + hash = "sha256-0ExGupoxdKAbQ6znzHixivvskFwgO+aKLsRvJlfB0Oc="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix index 99b19b71e871..e479c07add62 100644 --- a/pkgs/by-name/li/libssh/package.nix +++ b/pkgs/by-name/li/libssh/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { description = "SSH client library"; homepage = "https://libssh.org"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ sander ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix index 3a9601fc14b4..c9dfc5b174c6 100644 --- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rakshasa"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-r+5rNaBXhHbDWFXbgEPriEmjWEjTyu2I5H7rl3PoF38="; + hash = "sha256-zBMenewDtUyhOAQrIKejiShGWDeIA+7U1heyOKfAjio="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix index d520ec04b3e0..e39612f62639 100644 --- a/pkgs/by-name/li/libuv/package.nix +++ b/pkgs/by-name/li/libuv/package.nix @@ -12,7 +12,7 @@ # for passthru.tests bind, cmake, - knot-resolver, + knot-resolver_5, sbclPackages, luajitPackages, mosquitto, @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { inherit bind cmake - knot-resolver + knot-resolver_5 mosquitto neovim nodejs diff --git a/pkgs/by-name/li/libvirt-dbus/package.nix b/pkgs/by-name/li/libvirt-dbus/package.nix index a898b51bf923..fae5d412b5ef 100644 --- a/pkgs/by-name/li/libvirt-dbus/package.nix +++ b/pkgs/by-name/li/libvirt-dbus/package.nix @@ -11,6 +11,7 @@ systemd, gitUpdater, lib, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -60,8 +61,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # needs running D-Bus and libvirt - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + tests = { + inherit (nixosTests) libvirtd; + }; }; meta = { diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 5b19ab79011e..4db2a2fb9988 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -412,7 +412,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fpletz - globin lovesegfault ]; }; diff --git a/pkgs/by-name/li/libvisio2svg/package.nix b/pkgs/by-name/li/libvisio2svg/package.nix index fc67b501aebf..b6f86d88a3b6 100644 --- a/pkgs/by-name/li/libvisio2svg/package.nix +++ b/pkgs/by-name/li/libvisio2svg/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libvisio2svg"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "kakwa"; repo = "libvisio2svg"; rev = version; - sha256 = "14m37mmib1596c76j9w178jqhwxyih2sy5w5q9xglh8cmlfn1hfx"; + sha256 = "sha256-MklZ/pY04kw8BJxoGcBQAWdXytAPkrDz0N0W1t9I5Is="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix index 46a5ff29365c..eb0f46c6d39e 100644 --- a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { mainProgram = "lightdm-tiny-greeter"; homepage = "https://github.com/off-world/lightdm-tiny-greeter"; license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/lite/package.nix b/pkgs/by-name/li/lite/package.nix index 21191c70baec..a32d3bdd3d24 100644 --- a/pkgs/by-name/li/lite/package.nix +++ b/pkgs/by-name/li/lite/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { description = "Lightweight text editor written in Lua"; homepage = "https://github.com/rxi/lite"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; mainProgram = "lite"; }; diff --git a/pkgs/by-name/li/lix-diff/package.nix b/pkgs/by-name/li/lix-diff/package.nix index cee842717b94..04cc71c5a9ce 100644 --- a/pkgs/by-name/li/lix-diff/package.nix +++ b/pkgs/by-name/li/lix-diff/package.nix @@ -2,19 +2,22 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lix-diff"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "tgirlcloud"; repo = "lix-diff"; tag = "v${finalAttrs.version}"; - hash = "sha256-apjYXFdvxLZjhcN1wV7Y/LKNuWtWtCZM0h1VFg/znVo="; + hash = "sha256-uZd8xoQWsvJCmHtxtKJzKtaupUdXMXKWqSjXnK/BZco="; }; - cargoHash = "sha256-u3aFmPcceLP7yPdWWoPmOnQEbM0jhULs/kPweymQcZ8="; + cargoHash = "sha256-ydB65V879tW42FXSgdoUDeQbovsVf8qXku9uW4mqAfs="; + + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/isabelroses/lix-diff"; diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 8fa50132fd8e..7e61f3a6deb3 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "lk-jwt-service"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-fA33LZkozPTng47kunXWkfUExVbMZsiL8Dtkm1hLV6U="; + hash = "sha256-Qb+6DzaObeNjV+XVXLR6GkgtodIVTqTxC4G4Ef2xFrE="; }; - vendorHash = "sha256-0A9pd+PAsGs4KS2BnCxc7PAaUAV3Z+XKNqSrmYvxNeM="; + vendorHash = "sha256-GJKSvdv41rRSCGVAgUDxHdXoxRj/h+eDktjRJ3O5QFE="; passthru.tests = nixosTests.lk-jwt-service; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 1c34821e632b..6737196f604f 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -73,13 +73,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "6981"; + version = "7342"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-0WtiHDlMeb+m2XcMwkPFY1mtwVTwRJUoxQSwzpiRbts="; + hash = "sha256-x/Eq27wxEBSkcJnJXY8hQ7uL3zFVnAvMKvdoYh2AtPY="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index efeffa65bf80..59f17dcfd316 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.72.1"; + version = "3.73.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-c6eCfQz/Tc8pg1vVjgidkPj7I85sJ5AcyX7Gf/MTXZI="; + hash = "sha256-9m1YvuYuiiEXAX8HFt61VGZN/ThYXdBcwOSeL05mwOU="; }; strictDeps = true; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index e47f63cb38b1..7b18806eef72 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.31-7"; - hash_aarch64-darwin = "sha256-OyPHKUmZsIU0kc3JxwxdxACSN7hR6gFWjMnGp1x5diQ="; - version_x86_64-linux = "0.3.31-7"; - hash_x86_64-linux = "sha256-NeVteQlzygHkwwgLkB5n7meH02WhFE68KkbGRulDiC0="; + version_aarch64-darwin = "0.3.32-2"; + hash_aarch64-darwin = "sha256-7GB0Ccfa7/EuWLlp8IM/1db0ThsaKRMmLiU25rZ2sWQ="; + version_x86_64-linux = "0.3.32-2"; + hash_x86_64-linux = "sha256-JH9sH1zzBJkzQnu8MZhZ81xgQGgpzRduQEiap1lmURA="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/lp/lparchive2epub/package.nix b/pkgs/by-name/lp/lparchive2epub/package.nix index b5f1058363ce..767c5cf2004d 100644 --- a/pkgs/by-name/lp/lparchive2epub/package.nix +++ b/pkgs/by-name/lp/lparchive2epub/package.nix @@ -19,6 +19,10 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ poetry-core ]; + pythonRelaxDeps = [ + "ebooklib" + ]; + dependencies = with python3Packages; [ ebooklib beautifulsoup4 diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 949549975b71..6fbd744e5e12 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.701"; + version = "0.702"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-8Zla+iPARPPbNN3l7Bc96KguhxboPYj21yVYC0u6LlY="; + hash = "sha256-XHktbCz70b3+o66vq1AKBKbZbmHIyT+1Usub82hSvc0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/lu/luigi/package.nix b/pkgs/by-name/lu/luigi/package.nix index 8e6aebdf037e..5c9535441b5f 100644 --- a/pkgs/by-name/lu/luigi/package.nix +++ b/pkgs/by-name/lu/luigi/package.nix @@ -42,6 +42,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/spotify/luigi"; changelog = "https://github.com/spotify/luigi/releases/tag/${version}"; license = [ lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.bhipple ]; }; } diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 56344b62363f..3442c477f25a 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.5.9"; + version = "3.5.11"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-Gl9bJ8Hn3aVn/oKxBNb7CjJHLQ6NjFH/x45euWjCYaTtxF3qOTzuEm2VrivpghiviZIUGPWHP7rOKH8OWzPjLQ=="; + hash = "sha512-YYsUyuJMYos8aiOCbQy7FlVRakfBXC63HiTbg3YBd8I+kR1zA38FWAkRZeAiA3WyUutmJLJxaDtwBzhq/QgQ7w=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 42ebe1d35a55..0da072090572 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.20.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-fhEYHtGrEK/6T/vf5evlOmFTtepkuX/i9Xf6SzxwFOg="; + hash = "sha256-ThzpRKNosPtXCd2l97rQo7pKqgsVzbhON2E/tGsYhN4="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-yhJOm7vzDSMQtxCMJXXe4Q0DUV4agXSZ/XbcFxVgTCE="; + cargoHash = "sha256-EpOLDIhaQT+ao8di4L1Mh+2JI6uIfekJStccHzvpC8M="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index d5ce649830d2..0c1da12790ac 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-mjpBE896mKQbJZysGW6skzisrUhcanU0tMB8bk4YauM="; + hash = "sha256-f6Ug0m1BKvSFGIG3lC/YBcR1JXQGEJ/rAimdq36iTco="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix index 52c642a9f80e..ad15692d602d 100644 --- a/pkgs/by-name/ly/ly/deps.nix +++ b/pkgs/by-name/ly/ly/deps.nix @@ -97,19 +97,19 @@ linkFarm name [ }; } { - name = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc"; + name = "zigini-0.3.3-36M0FRJJAADZVq5HPm-hYKMpFFTr0OgjbEYcK2ijKZ5n"; path = fetchZigArtifact { name = "zigini"; - url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz"; - hash = "sha256-Hhc/+a8ToHI9RAJTIQ6Z3KZKQFvoPvd5ODz7HRbytdw="; + url = "https://github.com/AnErrupTion/zigini/archive/9281f47702b57779e831d7618e158abb8eb4d4a2.tar.gz"; + hash = "sha256-/g0az0MRQOmww0DhZQo/1YH2qkJcscoCpaoW4pWGVIk="; }; } { - name = "ini-0.1.0-YCQ9YkUnAAA7SjpLwvomwrngMn3TConSAlNgo7Q8ibMZ"; + name = "ini-0.1.0-YCQ9Ys0pAABixEvvQvhVXAdqRE3wrZk_wiL9TPNHhB8d"; path = fetchZigArtifact { name = "ini"; - url = "https://github.com/AnErrupTion/ini/archive/ac6e656157b2ac6c98392283a139b47c44a85d54.tar.gz"; - hash = "sha256-rOXuHsd4WiLDODruQioADMWQ7UkNtx5LUdTcK2dve40="; + url = "https://github.com/AnErrupTion/ini/archive/918f16d0dcf893d0c1cdffe204faa08bb3584e04.tar.gz"; + hash = "sha256-z2IMS0grfnf33h6tz1ERv2i6gfnS6p8oMWFz+AmGoA8="; }; } { diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index f6461a3fb1d1..a89eea2df810 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ly"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fairyglade"; repo = "ly"; tag = "v${finalAttrs.version}"; - hash = "sha256-2JOpC70uBvGk17edXDNeNhNqn2hHZBpOoQaUxN0IlLk="; + hash = "sha256-OmbOWZZR5kvqWJkNhTkV5O2tfFj5BtJPLtINe59Y0tI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/macism/package.nix b/pkgs/by-name/ma/macism/package.nix new file mode 100644 index 000000000000..e192d64bc4af --- /dev/null +++ b/pkgs/by-name/ma/macism/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch2, + swift, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "macism"; + version = "3.0.10"; + + src = fetchFromGitHub { + owner = "laishulu"; + repo = "macism"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TNZoVCGbWYZHWL1hgdq9p+RrbsWLtL8FuNpf0OvN+uM="; + }; + + patches = [ + # Fix version check to work with nix build environment + (fetchpatch2 { + name = "fix-version-check"; + url = "https://github.com/laishulu/macism/commit/928f6f55e9cdaaf39ae5fe7ce7f803d608c68565.patch?full_index=1"; + hash = "sha256-9rh1bxpYMOKNumAthZBNluJbbH5HLI9PfM6hGzxGpjU="; + }) + ]; + + dontConfigure = true; + + nativeBuildInputs = [ + swift + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp macism $out/bin + + mkdir -p $out/Applications + cp -r TemporaryWindow.app $out/Applications + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = { + description = "Reliable CLI MacOS input source manager"; + longDescription = '' + This tool manages macOS input sources from the command line, ideal for + integration with vim and emacs(e.g. sis). + + macism's main advantage over other similar tools is that it can reliably + select CJKV(Chinese/Japanese/Korean/Vietnamese) input source, while with + other tools (such as input-source-switcher, im-select from smartim, swim), + when you switch to CJKV input source, you will see that the input source + icon has already changed in the menu bar, but unless you activate other + applications and then switch back, the input source is actually still the + same as before. + ''; + homepage = "https://github.com/laishulu/macism"; + maintainers = with lib.maintainers; [ + yzx9 + ]; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + mainProgram = "macism"; + }; +}) diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index 07db1071d379..b7bc0058abd2 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -7,18 +7,18 @@ }: python3Packages.buildPythonApplication rec { pname = "mackup"; - version = "0.9.5"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "lra"; repo = "mackup"; rev = "${version}"; - hash = "sha256-10Q0lb2wiDjD4v2yFBvG3tvy9r+/T/ni4QhHUPyxFO0="; + hash = "sha256-tFuIpR8EsTbiuHCb5RS9QPQ3YpnvYOWOBEOI5J9jaSM="; }; postPatch = '' - substituteInPlace mackup/utils.py \ + substituteInPlace src/mackup/utils.py \ --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \ ''; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/by-name/ma/maia-icon-theme/package.nix similarity index 88% rename from pkgs/data/icons/maia-icon-theme/default.nix rename to pkgs/by-name/ma/maia-icon-theme/package.nix index 2d087781d1ba..818a8cf9f167 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/by-name/ma/maia-icon-theme/package.nix @@ -5,9 +5,8 @@ cmake, extra-cmake-modules, gtk3, - plasma-framework, - kwindowsystem, hicolor-icon-theme, + libsForQt5, }: stdenv.mkDerivation { @@ -27,8 +26,8 @@ stdenv.mkDerivation { cmake extra-cmake-modules gtk3 - plasma-framework - kwindowsystem + libsForQt5.plasma-framework + libsForQt5.kwindowsystem ]; propagatedBuildInputs = [ @@ -52,10 +51,10 @@ stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "Icons based on Breeze and Super Flat Remix"; homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; - license = licenses.lgpl3; - platforms = platforms.all; + license = lib.licenses.lgpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index b6604b9a6c77..7a7e025388b2 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://mapnik.org"; changelog = "https://github.com/mapnik/mapnik/blob/${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ - hrdinka hummeltech ]; teams = [ lib.teams.geospatial ]; diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index d57a6a1eb2ee..69f406d37fca 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.4.1"; + version = "8.6.0"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-Q5PFOA/UGpDbzS0yROBOY6eXSgzx7nzSC+P109FrhvA="; + hash = "sha256-KfCYYbBAsOKWkpaPIiN+xxu1IXoMkk0NWSdndk8FpTg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index adcfd704a9a5..81a1ee8ab801 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - asio, + asio_1_32_0, boost, check, openssl, @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - asio + # depends on io_service + asio_1_32_0 boost.dev check openssl diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index 787ee1dcce1d..d9709279077d 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 rec { pname = "mark"; - version = "15.1.0"; + version = "15.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "v${version}"; - sha256 = "sha256-7aOzl1+Nihj2UiAAaoQAtTlxr1FSOS/0fYmeg/dYukc="; + sha256 = "sha256-ZvFaSoD9nQtxc5ONWneVgpAfX3f7sS0lBSMXqhABn8o="; }; - vendorHash = "sha256-jbaDk28NIPqjf5fLOJZnsShVw5Ni14JS4J+T0GKNTbQ="; + vendorHash = "sha256-3hfeh7PRzsPfQ+aLPV44ExXum6lG6Huvc7itRIn8mNo="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index c65626c9e0bf..bb5791819406 100644 --- a/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/pkgs/by-name/ma/markdown-oxide/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "markdown-oxide"; - version = "0.25.8"; + version = "0.25.10"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y3xMiWnLHDVeRn1KbmsC/5yJWhukKFB6X9VHnuEkFU8="; + hash = "sha256-nzUje11rp6ByfajrxeEszi1mYs2Pu9Fq+blRdUECqT4="; }; - cargoHash = "sha256-M4LwkF031bv7aIC9aEh5bF6Vk/DJt3DH1Rh3dUNopX4="; + cargoHash = "sha256-Zzo7lEGfzPpxODeVHm89q22aAmuN5h2nIdh2eF2jSpY="; meta = { description = "Markdown LSP server inspired by Obsidian"; diff --git a/pkgs/by-name/ma/marksman/deps.json b/pkgs/by-name/ma/marksman/deps.json index 9de1401afc3b..7ed1a5f60a80 100644 --- a/pkgs/by-name/ma/marksman/deps.json +++ b/pkgs/by-name/ma/marksman/deps.json @@ -1,23 +1,33 @@ [ { "pname": "coverlet.collector", - "version": "6.0.2", - "hash": "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo=" + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" }, { "pname": "fantomas", "version": "6.3.16", "hash": "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=" }, + { + "pname": "FSharp.Core", + "version": "6.0.0", + "hash": "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI=" + }, + { + "pname": "FSharp.Core", + "version": "6.0.6", + "hash": "sha256-58TuDbZAOEYdHCXtYNH6Jo9n9pO2+o4vEYEhoj/PYdU=" + }, { "pname": "FSharp.SystemCommandLine", - "version": "0.13.0-beta4", - "hash": "sha256-QDT7vllfe978acAmSXltWXsnG/LZOEWTb1C85vBDBYI=" + "version": "2.0.0", + "hash": "sha256-UCokH9l8iFfhVC8HqwqPhugd0NEgePxwIUTSg0/7l40=" }, { "pname": "FSharpPlus", - "version": "1.6.1", - "hash": "sha256-MGwxfDTg6gJiS88yiqi1OGJk5WmaAFkVniniwF9Ilkc=" + "version": "1.8.0", + "hash": "sha256-XcIPe4EoP2hLmtk5iOULRAK1qk322/juVZ4FK5Hyq7E=" }, { "pname": "Glob", @@ -26,28 +36,23 @@ }, { "pname": "Markdig", - "version": "0.38.0", - "hash": "sha256-5DuDlj+TCDJWP8oJM2WU48ps3HFuUg5P28O/SPcjwGk=" + "version": "0.43.0", + "hash": "sha256-lUdjtLzSxAI0BEMdIgEc3fZ/VR8NO0gKSs1k6mgy6zU=" }, { "pname": "MessagePack", - "version": "2.5.108", - "hash": "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI=" + "version": "2.5.192", + "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU=" }, { "pname": "MessagePack.Annotations", - "version": "2.5.108", - "hash": "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk=" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "7.0.0", - "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + "version": "2.5.192", + "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "18.0.1", + "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY=" }, { "pname": "Microsoft.CSharp", @@ -56,74 +61,49 @@ }, { "pname": "Microsoft.NET.StringTools", - "version": "17.4.0", - "hash": "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo=" + "version": "17.6.3", + "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + "version": "18.0.1", + "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "18.0.1", + "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "18.0.1", + "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4=" }, { - "pname": "Microsoft.VisualStudio.Threading", - "version": "17.6.40", - "hash": "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc=" - }, - { - "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.6.40", - "hash": "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0=" + "pname": "Microsoft.VisualStudio.Threading.Only", + "version": "17.13.61", + "hash": "sha256-OhXEAuF9PZAkZuHqHwdVODLjA/rIMqmD7nXJfVAQWA8=" }, { "pname": "Microsoft.VisualStudio.Validation", - "version": "17.6.11", - "hash": "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + "version": "17.8.8", + "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms=" }, { "pname": "Nerdbank.Streams", - "version": "2.10.66", - "hash": "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI=" - }, - { - "pname": "Newtonsoft.Json", - "version": "13.0.1", - "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + "version": "2.12.87", + "hash": "sha256-BglFZT1nSyJO8mB235sP5yyu51iaGXwRHSOV8aeeY2A=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, { "pname": "Newtonsoft.Json", "version": "9.0.1", @@ -131,13 +111,18 @@ }, { "pname": "Serilog", - "version": "2.11.0", - "hash": "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds=" + "version": "2.10.0", + "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + }, + { + "pname": "Serilog", + "version": "2.12.0", + "hash": "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM=" }, { "pname": "Serilog.Sinks.Console", - "version": "4.0.1", - "hash": "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA=" + "version": "4.1.0", + "hash": "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y=" }, { "pname": "Snapper", @@ -146,8 +131,8 @@ }, { "pname": "StreamJsonRpc", - "version": "2.16.36", - "hash": "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68=" + "version": "2.22.23", + "hash": "sha256-SRk+00fzJk/jA2dbQbYE/udmcZgqVkscgZT8yi+D2NY=" }, { "pname": "System.Collections", @@ -156,29 +141,19 @@ }, { "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" }, { "pname": "System.CommandLine", - "version": "2.0.0-beta4.22272.1", - "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + "version": "2.0.0", + "hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "7.0.2", - "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", @@ -194,20 +169,10 @@ "version": "4.1.0", "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.Pipelines", - "version": "7.0.0", - "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "System.Linq", @@ -219,11 +184,6 @@ "version": "4.1.0", "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -234,21 +194,6 @@ "version": "4.1.0", "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", @@ -256,18 +201,8 @@ }, { "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" }, { "pname": "System.Resources.ResourceManager", @@ -279,41 +214,16 @@ "version": "4.1.0", "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, { "pname": "System.Text.Encoding", "version": "4.0.11", @@ -324,16 +234,6 @@ "version": "4.0.11", "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "7.0.0", - "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=" - }, - { - "pname": "System.Text.Json", - "version": "7.0.3", - "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" - }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", @@ -349,21 +249,6 @@ "version": "4.0.11", "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, - { - "pname": "System.Threading.Tasks.Dataflow", - "version": "7.0.0", - "hash": "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", @@ -376,13 +261,13 @@ }, { "pname": "Tomlyn", - "version": "0.17.0", - "hash": "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY=" + "version": "0.19.0", + "hash": "sha256-TPw6K1JzN1FUyGSpANHu5lDW2mFN1sg0apMNKMOBX+8=" }, { "pname": "xunit", - "version": "2.9.2", - "hash": "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo=" + "version": "2.9.3", + "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c=" }, { "pname": "xunit.abstractions", @@ -391,32 +276,32 @@ }, { "pname": "xunit.analyzers", - "version": "1.16.0", - "hash": "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU=" + "version": "1.18.0", + "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0=" }, { "pname": "xunit.assert", - "version": "2.9.2", - "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4=" + "version": "2.9.3", + "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" }, { "pname": "xunit.core", - "version": "2.9.2", - "hash": "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8=" + "version": "2.9.3", + "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw=" }, { "pname": "xunit.extensibility.core", - "version": "2.9.2", - "hash": "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c=" + "version": "2.9.3", + "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g=" }, { "pname": "xunit.extensibility.execution", - "version": "2.9.2", - "hash": "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80=" + "version": "2.9.3", + "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw=" }, { "pname": "xunit.runner.visualstudio", - "version": "2.8.2", - "hash": "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60=" + "version": "3.1.5", + "hash": "sha256-O5657884QGldszsEWQFCDRTXViFBmZ4GGC+4iU+usSQ=" } ] diff --git a/pkgs/by-name/ma/marksman/package.nix b/pkgs/by-name/ma/marksman/package.nix index 444b35a6ee94..a067a757f511 100644 --- a/pkgs/by-name/ma/marksman/package.nix +++ b/pkgs/by-name/ma/marksman/package.nix @@ -3,23 +3,27 @@ fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - marksman, - testers, + nix-update-script, + versionCheckHook, }: -buildDotnetModule rec { +let pname = "marksman"; - version = "2024-12-18"; + dotnet-sdk = dotnetCorePackages.sdk_9_0_1xx-bin; +in +buildDotnetModule (finalAttrs: { + inherit pname dotnet-sdk; + version = "2025-11-30"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; - rev = version; - sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to="; + tag = finalAttrs.version; + hash = "sha256-rEGMh4QsxTe35psbflYGgjjDDf0TzvItkx/ARE8ZC1E="; }; projectFile = "Marksman/Marksman.fsproj"; - dotnetBuildFlags = [ "-p:VersionString=${version}" ]; + dotnetBuildFlags = [ "-p:VersionString=${finalAttrs.version}" ]; __darwinAllowLocalNetworking = true; @@ -28,22 +32,20 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; postInstall = '' install -m 644 -D -t "$out/share/doc/${pname}" LICENSE ''; passthru = { - updateScript = ./update.sh; - tests.version = testers.testVersion { - package = marksman; - command = "marksman --version"; - }; + updateScript = nix-update-script { }; }; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { description = "Language Server for Markdown"; longDescription = '' Marksman is a program that integrates with your editor @@ -54,12 +56,12 @@ buildDotnetModule rec { references that enable Zettelkasten-like note taking. ''; homepage = "https://github.com/artempyanykh/marksman"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stasjok plusgut ]; platforms = dotnet-sdk.meta.platforms; - mainProgram = "marksman"; + mainProgram = pname; }; -} +}) diff --git a/pkgs/by-name/ma/marksman/update.sh b/pkgs/by-name/ma/marksman/update.sh deleted file mode 100755 index b17097e683c4..000000000000 --- a/pkgs/by-name/ma/marksman/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -#shellcheck shell=bash - -set -eu -o pipefail - -version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/artempyanykh/marksman/releases/latest | jq -e -r .tag_name) -old_version=$(nix-instantiate --eval -A marksman.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 marksman "$version" - -$(nix-build -A marksman.fetch-deps --no-out-link) diff --git a/pkgs/by-name/ma/matchbox-server/package.nix b/pkgs/by-name/ma/matchbox-server/package.nix index 4967fef7851b..e668de8c8ead 100644 --- a/pkgs/by-name/ma/matchbox-server/package.nix +++ b/pkgs/by-name/ma/matchbox-server/package.nix @@ -2,16 +2,17 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "matchbox-server"; - version = "v0.11.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "poseidon"; repo = "matchbox"; - rev = "${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-u1VY+zEx2YToz+WxVFaUDzY7HM9OeokbR/FmzcR3UJ8="; }; @@ -24,7 +25,7 @@ buildGoModule rec { # Go linker flags (go tool link) # Omit symbol tables and debug info ldflags = [ - "-w -s -X github.com/poseidon/matchbox/matchbox/version.Version=${version}" + "-w -s -X github.com/poseidon/matchbox/matchbox/version.Version=${finalAttrs.version}" ]; # Disable cgo to produce a static binary @@ -33,12 +34,14 @@ buildGoModule rec { # Don't run Go tests doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Server to network boot and provision Fedora CoreOS and Flatcar Linux clusters"; homepage = "https://matchbox.psdn.io/"; changelog = "https://github.com/poseidon/matchbox/blob/main/CHANGES.md"; - license = licenses.asl20; - maintainers = with maintainers; [ dghubble ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dghubble ]; mainProgram = "matchbox"; }; -} +}) diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix new file mode 100644 index 000000000000..9811b2387d83 --- /dev/null +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mathjax"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "mathjax"; + repo = "mathjax"; + tag = finalAttrs.version; + hash = "sha256-36lTjx4zuFeT1+QFemiQcCZfAjyh7vFPpYeRhO2mzGI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/mathjax + mv * $out/lib/node_modules/mathjax + # This is a MathJax v3 compat shim, notably still needed for sagemath + ln -s $out/lib/node_modules/mathjax $out/lib/node_modules/mathjax/es5 + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/mathjax/MathJax/releases/tag/${finalAttrs.version}"; + description = "Beautiful and accessible math in all browsers"; + homepage = "https://www.mathjax.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index d2915a8502d6..fcfe5b0b322c 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -43,8 +43,8 @@ let # The commit on the rocksdb fork, tuwunel-changes branch referenced by the upstream # tuwunel flake.lock: # https://github.com/matrix-construct/tuwunel/blob/main/flake.lock#L557C17-L557C57 - rev = "cf7f65d0b377af019661c240f9165b3ef60640c3"; - hash = "sha256-ZSjvAZBfZkJrBIpw8ANZMbJVb8AeuogvuAipGVE4Qe4="; + rev = "9a3a213b55df0b11408102c899a940675c0d90e4"; + hash = "sha256-aOV/jJjRjNJ3hrRqhCsXlIz05NvEhDF/j5Q5UOQuvp8="; }; version = "tuwunel-changes"; patches = [ ]; @@ -88,16 +88,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-EmIBhSxYD52BzwewcIL53e3/7GLY+5nccmAYGf1LPqI="; + hash = "sha256-TaMPGxVRV7MpTIdIWylKeiZa22s8EgNGSiiXNUWonfc="; }; - cargoHash = "sha256-aVMJr216gkYpanCee6UhNGINAi/EZ0V5m0WaTYpQJcY="; + cargoHash = "sha256-ZfC6Rqd3Or23TEoGuKu1pB+USv7rlOEzRYBisoK2Pcc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix index e5eb3720e42a..c7bb9ae0bbbf 100644 --- a/pkgs/by-name/mc/mc/package.nix +++ b/pkgs/by-name/mc/mc/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation rec { downloadPage = "https://ftp.osuosl.org/pub/midnightcommander/"; homepage = "https://midnight-commander.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sander ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "mc"; }; diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix index f2d69266ac17..b8b604216092 100644 --- a/pkgs/by-name/md/mdadm4/package.nix +++ b/pkgs/by-name/md/mdadm4/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"; license = licenses.gpl2Plus; mainProgram = "mdadm"; - maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/md/mdbook-yml-header/package.nix b/pkgs/by-name/md/mdbook-yml-header/package.nix index d0eee046e3ca..f19a6c00e9ae 100644 --- a/pkgs/by-name/md/mdbook-yml-header/package.nix +++ b/pkgs/by-name/md/mdbook-yml-header/package.nix @@ -7,17 +7,17 @@ let pname = "mdbook-yml-header"; - version = "0.1.4"; + version = "0.1.5"; in rustPlatform.buildRustPackage { inherit pname version; src = fetchCrate { inherit pname version; - hash = "sha256-qRAqZUKOiXTh4cJjczBQ9zAL6voaDvko7elfE6eB2jA="; + hash = "sha256-QlclxqH6cKo9QZyUBFCcujT9liTc8lmEheyjFKK7N58="; }; - cargoHash = "sha256-C8M2Y7igeDmi337GXWmLcwNTGr1/CTHWWTuMPDtkqxs="; + cargoHash = "sha256-iBvVes32G0Ji9gk97axeTzbXlVh0Qn9Bzj64G6oEDFM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index f0966dcc0dbf..25c6f677de56 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mdevctl/mdevctl"; description = "Mediated device management utility for linux"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix index d2456159196b..8296cde08a7f 100644 --- a/pkgs/by-name/md/mdns-scanner/package.nix +++ b/pkgs/by-name/md/mdns-scanner/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdns-scanner"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "CramBL"; repo = "mdns-scanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q8xJ1RmJCaeqbCS5pRnV2kvfyLh1Mx7r+aU0HRbkBvY="; + hash = "sha256-CUaJ2TZGOnb+ebckvKzQFhUx/B+BU1Wu8cr247VE4Pg="; }; - cargoHash = "sha256-fUauhWqAv7Ce4nmbsmVoWJBAG+M0IgtOU7nU8F0u540="; + cargoHash = "sha256-Lb24qEiIMbatzKY9YQgQRrsRBp/An4ADalNY8zG5Mr0="; meta = { homepage = "https://github.com/CramBL/mdns-scanner"; diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 745177a1492f..4c83e799096c 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.44.2"; + version = "1.45.0"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-59cCZpeWcfr9A3BeF6IfGFvRsoP/hD7XL+KQ6G+sQzE="; + hash = "sha256-1Jm8frPXGDXCvsHJyu2IoDCK7DfwcmTnURDSor7wJTQ="; }; postPatch = '' diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index bab5fe23e3b5..a762f32c1ce3 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.27.0"; + version = "1.28.2"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meiliSearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-tA2EN739QNNhMG1okfwBgOQLVah/p3PCFF1LESafFdY="; + hash = "sha256-Sp3YAAOgkBoBIz4Yj0AKJ0aI0HBAIg75E9BjtzGxXLM="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-na6FArvYMaIenc/h9dKAzIcWZuz8Q3L+2uun39T9LTI="; + cargoHash = "sha256-W6nTVgD0U4bZ0ybGU6wTQmp+SVvorZCqKOJnf1GG1gU="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index a8080e0219ca..b8589c546eb4 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -50,7 +50,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne teutat3s ]; mainProgram = "metal"; diff --git a/pkgs/by-name/mf/mfaktc/package.nix b/pkgs/by-name/mf/mfaktc/package.nix index 3db9a4d6d78f..e8c9fd4dafc4 100644 --- a/pkgs/by-name/mf/mfaktc/package.nix +++ b/pkgs/by-name/mf/mfaktc/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "mfaktc"; - version = "0.23.6"; + version = "0.24.0"; src = fetchFromGitHub { owner = "primesearch"; repo = "mfaktc"; tag = "${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+oO2zMGxcnkEUlD1q5Sy79aXp7BtGTTsvbKjPqBt7sw="; + hash = "sha256-7lJ3+v9exe+n+Txkn1vsvSPYLEP4l/0UgHpc6lAGv1Y="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix index 7d1892afd7e3..a72cea1eafb1 100644 --- a/pkgs/by-name/mg/mgrep/package.nix +++ b/pkgs/by-name/mg/mgrep/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mgrep"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "mixedbread-ai"; repo = "mgrep"; tag = "v${finalAttrs.version}"; - hash = "sha256-FwgUK5vPXba8cmGrsSItbhXYDNPxkr7x5u1jPxs3SAA="; + hash = "sha256-jGzOwonT4nq0nMUBBp4Y7BvwTerHLzkTMss9glM+uP4="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 322a04c13816..8f73972ffd68 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "142.0.3595.94"; + version = "143.0.3650.66"; 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-P+mPXg0gVWqlJqBS2F/Tuf42BikntPO0R693wPASKQc="; + hash = "sha256-Oak7r7ykODJsqzdb+cEmzkUrcezTUe+Xl9oo1lUrq6w="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/mindustry/deps.json b/pkgs/by-name/mi/mindustry/deps.json index 8ed40fbb14e4..bf9499c13366 100644 --- a/pkgs/by-name/mi/mindustry/deps.json +++ b/pkgs/by-name/mi/mindustry/deps.json @@ -2,8 +2,8 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://download.savannah.gnu.org": { - "releases/freetype/freetype-2.10.4": { - "tar.gz": "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw=" + "releases/freetype/freetype-2.14.1": { + "tar.gz": "sha256-F02eU0AuG/nscnfiLsGZuj5Vpr4sB0DLGMDumFD8jDQ=" } }, "https://github.com": { @@ -26,27 +26,34 @@ "jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=", "pom": "sha256-ktvhk8s3T1zswrYWuXz+cWHRyK3YbkikD5Sv/gjcfz4=" }, - "libgdx/gdx-jnigen#gdx-jnigen-gradle/dffc32eecbf77aad264991ea44f1767a58cbee9d": { - "jar": "sha256-nuUxM4zDV48+8Z+Rsn2dhEhkH4wOcfG62lz84BUhDH0=", - "module": "sha256-OU9DEb3A9A7OtnJ6jQkS32KImMlNn9NX7eKMX4YVh5E=", - "pom": "sha256-0THLPDNZDZe9PbIEPl71pGwL7E6Oq2Y5LiVevltdbP8=" + "libgdx/gdx-jnigen#gdx-jnigen-gradle/2.5.1": { + "jar": "sha256-58CVbO1KcCD3O1KssA1fjFtmFv/w1ELaKjpxYQy4uOo=", + "module": "sha256-ed8mnMRwzTx8sz6m1K00O/m5TUClRgFBr7Z52QTvMYI=", + "pom": "sha256-39d36SZMtgx/Lcu44RQbayrsHGmqq+7mUbHyZul96fc=" }, - "libgdx/gdx-jnigen#gdx-jnigen/28dd11fa4c33a7ae9e58897912b52ba7d53d54fe": { - "jar": "sha256-fPszziBPrTDACbBuL6OxJ2oK1iA4izBk4TMHK53b+GQ=", - "module": "sha256-0RR9vgSqD1ISADHSO5OV7rxi+6HM9h0ZO4kEYw/Ao4Y=", - "pom": "sha256-vnz59i+3/wY9RizYWGMOuebfrZO4HrpOYV73ShIFH2g=" + "libgdx/gdx-jnigen#gdx-jnigen-loader/2.5.1": { + "jar": "sha256-6I+6THOtnaVYhOB4feFo1xkdF25G6T5iJfQyPCTc+Wo=", + "module": "sha256-Sdga7alkfzS4Loy6XAGXvw/+E0AoS6I1HcWD3cBPej4=", + "pom": "sha256-ieP1KOe4XwibX7rqHWJat1iH0saLcvfGjosSbODwKcc=" }, - "libgdx/gdx-jnigen#gdx-jnigen/dffc32eecbf77aad264991ea44f1767a58cbee9d": { - "jar": "sha256-bd8xr4/YgvQbvdFkayXdJKpMvYwE9XlISof20vsfcSU=", - "module": "sha256-zQ1DewRtrsdTgxXINq7pOa+UJwnDNrGsVKnX0K/AWRQ=", - "pom": "sha256-HWFvvs+x6DyJioqkRDDVvf0GCKfxPTjhdec8JC2PZvA=" + "libgdx/gdx-jnigen#gdx-jnigen/2.5.1": { + "jar": "sha256-OeLq815DT4ZtC8d7Ko/3VtV3u7R8Rj8HGX8mQb0eAZw=", + "module": "sha256-nicta1Y8N7VYMmNINhN4BRjsUCljtHv+g1lphUuKno8=", + "pom": "sha256-lpq6D25HGTFHWR3WDgKd4G2irqsk1rnjvMQlqKL1/NM=" } }, - "https://plugins.gradle.org/m2/org/jetbrains/kotlin": { - "jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.10": { + "https://plugins.gradle.org/m2": { + "de/undercouch#gradle-download-task/5.0.1": { + "jar": "sha256-7VONXLvRug+MUcCRaEVg0S4JPuJwyFvDN6emaj97Rcc=", + "pom": "sha256-AkX+RSGxdvwB9LLDtWi08AGYjBxHtCg7cm2rRqhqC4g=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.0.1": { + "pom": "sha256-GR8NCdz7n02v4EMwQRsdllH9IUpaZ5FoGnfOzSPCQ7A=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.10": { "pom": "sha256-KoiNElh3d5C3j7zg6xTZUFBwv1uLzKS7YB4s6/pCPtA=" }, - "kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": { + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": { "pom": "sha256-HzOk8LbO3qaMYhC518PU/t7EGF2dUIqsqs0933q2Ti8=" } }, diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix index a3ae173eed8d..9e3c305f80ba 100644 --- a/pkgs/by-name/mi/mindustry/package.nix +++ b/pkgs/by-name/mi/mindustry/package.nix @@ -38,7 +38,7 @@ let pname = "mindustry"; - version = "152.2"; + version = "153"; buildVersion = makeBuildVersion version; jdk = jdk17; @@ -48,14 +48,14 @@ let owner = "Anuken"; repo = "Mindustry"; tag = "v${version}"; - hash = "sha256-DRH6Gd/NOXvTZAMu3qcpEk6Ii1l7NMPLd8+RLUyt7yE="; + hash = "sha256-yVrOHZOCZrI5SsmMdo7Eh+zS0PXv2X67zLCdLOWcPVc="; }; Arc = fetchFromGitHub { name = "Arc-source"; owner = "Anuken"; repo = "Arc"; tag = "v${version}"; - hash = "sha256-TfDgzApR9LlnVVUOgIZu5pSLzbGlqrsXqzUN88lYN8s="; + hash = "sha256-JyiFxzdZtU0ILytTCfZrhBU2oZ3gF1kzMbSdjxqvTYs="; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -155,16 +155,20 @@ stdenv.mkDerivation { '' + lib.optionalString enableClient '' pushd ../Arc - gradle jnigenBuild + # unsupported platforms need to be excluded because their native build tools aren't available + gradle jnigenBuild -x jnigenBuildAndroid -x jnigenBuildWindows -x jnigenBuildWindows64 gradle jnigenJarNativesDesktop glewlib=${lib.getLib glew}/lib/libGLEW.so sdllib=${lib.getLib SDL2}/lib/libSDL2.so - patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ - --add-needed $glewlib \ - --add-needed $sdllib + patchelf backends/backend-sdl/build/Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \ + --add-needed "$glewlib" \ + --add-needed "$sdllib" # Put the freshly-built libraries where the pre-built libraries used to be: - cp arc-core/libs/*/* natives/natives-desktop/libs/ - cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ + cp arc-core/build/Arc/arc-core/libs/*/* natives/natives-desktop/libs/ + cp backends/backend-sdl/build/Arc/backends/backend-sdl/libs/*/* natives/natives-desktop/libs/ + # below target dirs are based on Arc upstream: Arc/extensions/../build.gradle + cp extensions/freetype/build/Arc/extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ + cp extensions/filedialogs/build/Arc/extensions/filedialogs/libs/*/* natives/natives-filedialogs/libs/ popd gradle desktop:dist diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index 1b44b1b6e6b5..4e6870638aac 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "miniflux"; - version = "2.2.14"; + version = "2.2.15"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = finalAttrs.version; - hash = "sha256-x6I5PMlQtsjvFtEyoaKKE6if3I0IBIyps4kPQL4c8aw="; + hash = "sha256-19i+TeBcPnI1Gfpf81gHE9sLvytsS4x1A5XU8oD7YIU="; }; - vendorHash = "sha256-X/6YvAhIHSOS3qaoR6/pa2b7EziZzx8B+CbYrJ9/mcM="; + vendorHash = "sha256-XrTmXAUABlTQaA3Z0vU0HQW5Q1e/Yg6yq690oZH8M+A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index f6ac0a8b8b7c..d9fa50ae2156 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.174.0", + "version": "3.176.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.174.0/mirrord_linux_x86_64", - "hash": "sha256-ZhI5ZC54mD2QbX3LDZJablJDZV7bE25acVLYo1AB/GY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_linux_x86_64", + "hash": "sha256-rvVq0yq0j5IpRFaA/D+65kUAJ1qyqUipKWMftNAM1sU=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.174.0/mirrord_linux_aarch64", - "hash": "sha256-Kdpdk+yOgJAtz7CwOc5mudbzRyPrtT46mABOXjySb/Y=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_linux_aarch64", + "hash": "sha256-v9PnJVNUaDHYqTXRQPgqnX4WYoHOFz78afWuCZ9LHRQ=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.174.0/mirrord_mac_universal", - "hash": "sha256-k4JMnoG1GwSKz4Drw5BNa5lbsiZPdJzvEmVaQ0rLqGg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_mac_universal", + "hash": "sha256-+jorMrKRRCkxv/KJITVKf6UZN61n3IpDlM8cXDjZ0Qw=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.174.0/mirrord_mac_universal", - "hash": "sha256-k4JMnoG1GwSKz4Drw5BNa5lbsiZPdJzvEmVaQ0rLqGg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_mac_universal", + "hash": "sha256-+jorMrKRRCkxv/KJITVKf6UZN61n3IpDlM8cXDjZ0Qw=" } } } diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index bf1207cddd03..0ab5d6eb33cc 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.11.11"; + version = "2025.12.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Qvxh3mxT6Eb2T2x83TonlmdBdmor5AqbVadUUG9p1o8="; + hash = "sha256-QQE8Dt/juQTf1E+zigOpqlQmpaiTWr+MTlLduCkjxDU="; }; - cargoHash = "sha256-G2cLBPKXkK6LcK2wGIknz9TH2RGndmc4/3oq/QKkw2c="; + cargoHash = "sha256-su7HbmVEEUDvqj7147ATln+7ra/dgFCs8q1h+aWqh4Q="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index 8053f85768fd..73927cfde807 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -179,8 +179,14 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/missioncenter"; doInstallCheck = true; + dontWrapGApps = true; + postFixup = '' + wrapProgram $out/bin/missioncenter \ + "''${gappsWrapperArgs[@]}" + wrapProgram $out/bin/missioncenter-magpie \ + "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ # Make sure libGL libvulkan can be found by dlopen() diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix index bdac3135da31..5b80e16e634f 100644 --- a/pkgs/by-name/mk/mkl/package.nix +++ b/pkgs/by-name/mk/mkl/package.nix @@ -212,7 +212,6 @@ stdenvNoCC.mkDerivation ( "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ bhipple ]; }; } // lib.optionalAttrs stdenvNoCC.hostPlatform.isDarwin { diff --git a/pkgs/by-name/mk/mktoc/package.nix b/pkgs/by-name/mk/mktoc/package.nix new file mode 100644 index 000000000000..02d1148dec00 --- /dev/null +++ b/pkgs/by-name/mk/mktoc/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mktoc"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "KevinGimbel"; + repo = "mktoc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Pq4o0t0cUrkXff+qSU5mlDo5A0nhFBuFk3Xz10AWDeo="; + }; + + cargoHash = "sha256-SdwNXstW61Yvp1V72nxl+9dijGJwyrdPYZo+q0UGYGg="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "Markdown Table of Content generator"; + homepage = "https://github.com/KevinGimbel/mktoc"; + license = lib.licenses.mit; + mainProgram = "mktoc"; + maintainers = with lib.maintainers; [ kevingimbel ]; + }; +}) diff --git a/pkgs/by-name/ml/mlmmj/package.nix b/pkgs/by-name/ml/mlmmj/package.nix index 2da4ac7ab240..26e5dd2f1071 100644 --- a/pkgs/by-name/ml/mlmmj/package.nix +++ b/pkgs/by-name/ml/mlmmj/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; - maintainers = [ maintainers.edwtjo ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix index bb9c35333e23..c91d65966beb 100644 --- a/pkgs/by-name/mo/moc/package.nix +++ b/pkgs/by-name/mo/moc/package.nix @@ -162,7 +162,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ aethelz pSub - jagajaga ]; platforms = platforms.unix; mainProgram = "mocp"; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 9d22a3cf24ec..7140d0d231af 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2025-12-02"; + version = "0-unstable-2025-12-09"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "8bd2b3595f0731c4db5b6fb629655bdb7a23d78b"; - hash = "sha256-SNnqbC1XbeO9f8wSMHPIfdKkgyNbTTM6Lu4IVj9fTDQ="; + rev = "597350692c84a6c32f86fde05e310566a417099e"; + hash = "sha256-m3tegpyPT5yX6IqgJG9+YpmyQ7rBd9H+USS3YDLizsM="; postFetch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' # NOTE: Normalize case-sensitive directory names that cause issues on case-insensitive filesystems cp -r "$out/providers/poe/models/openai"/* "$out/providers/poe/models/openAi/" diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold-unwrapped/package.nix similarity index 96% rename from pkgs/by-name/mo/mold/package.nix rename to pkgs/by-name/mo/mold-unwrapped/package.nix index 19d73b4ac2f2..6c8d2f36e645 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold-unwrapped/package.nix @@ -16,7 +16,7 @@ gccStdenv, hello, mold, - mold-wrapped, + mold-unwrapped, runCommandCC, testers, useMoldLinker, @@ -25,7 +25,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "mold"; + pname = "mold-unwrapped"; version = "2.40.4"; src = fetchFromGitHub { @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { ''; in { - version = testers.testVersion { package = mold; }; + version = testers.testVersion { package = mold-unwrapped; }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { adapter-gcc = helloTest "adapter-gcc" ( @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { ); wrapped = helloTest "wrapped" ( hello.overrideAttrs (previousAttrs: { - nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold-wrapped ]; + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold ]; NIX_CFLAGS_LINK = toString (previousAttrs.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; }) ); diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 34feeb6da8ea..bcdcd92a7a3d 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -36,7 +36,6 @@ nix-update-script, onnxruntime, opencv4, - openhmd, openvr, orc, pcre2, @@ -126,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { libXrandr onnxruntime opencv4 - openhmd openvr orc pcre2 diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 992fdd7cf2ae..5597ea992aaa 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.88"; + version = "11.89"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-dnVcCdIGLWU7CwWdYGNxAF4f41sjFUDRG0L0dNS6yTU="; + hash = "sha256-oXMQUnmFepcaC2UjC7f2Ojd1gHc4dL5ZFnhtVdThIV8="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/monolith/package.nix b/pkgs/by-name/mo/monolith/package.nix index 628467cb92f6..899a7e77cf57 100644 --- a/pkgs/by-name/mo/monolith/package.nix +++ b/pkgs/by-name/mo/monolith/package.nix @@ -42,6 +42,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Y2Z/monolith"; license = licenses.cc0; platforms = lib.platforms.unix; - maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 7d88cc28f90b..0729a3d69453 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "4.1.2"; + version = "4.2.0"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; tag = "v${version}"; - hash = "sha256-nX4GXuQd+WzaRGBtsWduUpwtA3DGjpRkcxPmoEj7FIA="; + hash = "sha256-SrRWMbI+seA7LlOU6dxlbhRKM8Ufa3KLo1tjeCtBWEY="; }; sourceRoot = "${src.name}/source"; @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { mprisify requests ytmusicapi + logboth ]; build-system = with python3Packages; [ @@ -51,7 +52,9 @@ python3Packages.buildPythonApplication rec { gstreamer ]); - postInstall = "make install prefix=$out"; + postInstall = '' + make install prefix=$out + ''; dontWrapGApps = true; @@ -70,7 +73,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.com/zehkira/monophony"; license = lib.licenses.bsd0; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ quadradical ]; + maintainers = with lib.maintainers; [ + quadradical + aleksana + ]; mainProgram = "monophony"; }; } diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 00cafbae722c..f1c3d04efa91 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-+gNM/yqoEZ0JUieRsdGCpO5MG+Jtaxwi114PQEhaMiY="; + hash = "sha256-HOnm991rMuAed4t8Z10HN17w89p1WVUjSGGc/w9UUlg="; }; - vendorHash = "sha256-KTAckjrOZVwl6UBFmbqqMjUyYJDQxySxWiV46QNTfuY="; + vendorHash = "sha256-l1XeVZ4FyQDu2sKo4/SieBbwUicq3gNE3D/0m6fcGt8="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ foo-dogsquared getchoo + zowoq ]; }; }) diff --git a/pkgs/tools/audio/mpd-sima/default.nix b/pkgs/by-name/mp/mpd-sima/package.nix similarity index 73% rename from pkgs/tools/audio/mpd-sima/default.nix rename to pkgs/by-name/mp/mpd-sima/package.nix index 00aee5bbd83e..d123630b72e0 100644 --- a/pkgs/tools/audio/mpd-sima/default.nix +++ b/pkgs/by-name/mp/mpd-sima/package.nix @@ -1,13 +1,12 @@ { lib, - buildPythonApplication, fetchFromGitLab, - python-musicpd, - requests, + python3Packages, sphinxHook, + nix-update-script, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mpd-sima"; version = "0.18.2"; @@ -30,7 +29,7 @@ buildPythonApplication rec { sphinxBuilders = [ "man" ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ requests python-musicpd ]; @@ -41,11 +40,13 @@ buildPythonApplication rec { export HOME="$(mktemp -d)" ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Autoqueuing mpd client"; homepage = "https://kaliko.me/mpd-sima/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ apfelkuchen6 ]; mainProgram = "mpd-sima"; }; diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index c22570ec6ce1..93d01cf3bd48 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; tag = "v${finalAttrs.version}"; - hash = "sha256-/KV4zmato86DKDOUe3D/Ru/cFQaKOPyx6cQ8wZS4bgA="; + hash = "sha256-N/ePJGbF3pGU+IiyztkKujpfFRLy7FSIkpUltv6iJXY="; }; postPatch = '' diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 709d6ee9dd74..4dcc0fb0c2a1 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + gitMinimal, fetchFromGitLab, glfw, glm, @@ -36,8 +37,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "4033cfcc1dd45b3cdf7285afd93556f2cfbe9425"; - hash = "sha256-E1jfbHldIQOwonHvMn0feQiLI9zq3zB8Q9a0ufw1HuY="; + rev = "49623d0c4e1af3c680845191948d10f6d3e92f8a"; + hash = "sha256-jmPPyOHNP8Lrk5BKMhWW6KzizLF4dJB3txqOi2zBW40="; }; googletest = fetchFromGitHub { owner = "google"; @@ -86,7 +87,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.3.7"; + version = "3.4.0"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -94,12 +95,16 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-qetgQDgXtaDAuAo/PakZJEsevnvZFJB5EYXPMWeaEqo="; + hash = "sha256-mW1AZKRo5rC3q7VARNI3HNKYGXxnAX6R1AfmY8J1D/Q="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + # git is needed to apply patches to ccd-src and qhull-src (see below) + gitMinimal + ]; buildInputs = [ glm @@ -120,11 +125,25 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p build/_deps ln -s ${pin.abseil-cpp} build/_deps/abseil-cpp-src ln -s ${pin.benchmark} build/_deps/benchmark-src - ln -s ${pin.ccd} build/_deps/ccd-src + '' + # cccd is patched by mujoco's cmake and thus needs to be writable + # https://github.com/google-deepmind/mujoco/blob/3.4.0/cmake/MujocoDependencies.cmake#L232-L235 + + '' + cp -r ${pin.ccd} build/_deps/ccd-src + chmod -R +w build/_deps/ccd-src + '' + + '' ln -s ${pin.eigen3} build/_deps/eigen3-src ln -s ${pin.googletest} build/_deps/googletest-src ln -s ${pin.lodepng} build/_deps/lodepng-src - ln -s ${pin.qhull} build/_deps/qhull-src + '' + # qhull is patched by mujoco's cmake and thus needs to be writable + # https://github.com/google-deepmind/mujoco/blob/3.4.0/cmake/MujocoDependencies.cmake#L132-L135 + + '' + cp -r ${pin.qhull} build/_deps/qhull-src + chmod -R +w build/_deps/qhull-src + '' + + '' ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src '' diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index b99df370bc72..4972aba704ca 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "15.0.2"; + version = "15.0.3"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-/bA3oVGVqrADLWPegdMCKsePczEqEHNLrFtJ242o1rI="; + hash = "sha256-qrjKGaS4GYp8C4LzElbN9/+v5MYKsVRHaZDsBZe2Bcs="; }; }; diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 473c02637252..eb911d0f767b 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -162,7 +162,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; maintainers = with lib.maintainers; [ - Br1ght0ne ymarkus ]; }; diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 0160cb0bbdf7..5eeeae31c7ea 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -25,15 +25,15 @@ writeScript, }: let - id = "289869947"; + id = "305607196"; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "multiviewer-for-f1"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://releases.multiviewer.dev/download/${id}/multiviewer_${version}_amd64.deb"; - sha256 = "sha256-H+tt2FiT1UxkWBxpuyOIUjRMOMl7kN/SFH/WqoRdVUU="; + url = "https://releases.multiviewer.dev/download/${id}/multiviewer_${finalAttrs.version}_amd64.deb"; + hash = "sha256-Uc4db2o4XBV9eRNugxS6pA9Z5YhjY5QnEkwOICXmUwc="; }; nativeBuildInputs = [ @@ -105,24 +105,24 @@ stdenvNoCC.mkDerivation rec { id=$(echo $latest | jq -r '.downloads[] | select(.platform=="linux_deb").id') version=$(echo $latest | jq -r '.version') - if [ "$version" != "${version}" ] + if [ "$version" != "${finalAttrs.version}" ] then # Pre-calculate package hash hash=$(nix-prefetch-url --type sha256 $link) # Update ID and version in source - update-source-version ${pname} "$id" --version-key=id - update-source-version ${pname} "$version" "$hash" --system=x86_64-linux + update-source-version ${finalAttrs.pname} "$id" --version-key=id + update-source-version ${finalAttrs.pname} "$version" "$hash" --system=x86_64-linux fi ''; - meta = with lib; { + meta = { description = "Unofficial desktop client for F1 TV"; homepage = "https://multiviewer.app"; downloadPage = "https://multiviewer.app/download"; - license = licenses.unfree; - maintainers = with maintainers; [ babeuh ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ babeuh ]; platforms = [ "x86_64-linux" ]; mainProgram = "multiviewer"; }; -} +}) diff --git a/pkgs/by-name/mu/muonlang/package.nix b/pkgs/by-name/mu/muonlang/package.nix index 0141d6dcc764..51165756729e 100644 --- a/pkgs/by-name/mu/muonlang/package.nix +++ b/pkgs/by-name/mu/muonlang/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation { description = "Modern low-level programming language"; homepage = "https://github.com/nickmqb/muon"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix index 9b9230e0ec06..ccd246008c42 100644 --- a/pkgs/by-name/mu/mupen64plus/package.nix +++ b/pkgs/by-name/mu/mupen64plus/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { description = "Nintendo 64 Emulator"; license = licenses.gpl2Plus; homepage = "http://www.mupen64plus.org/"; - maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; mainProgram = "mupen64plus"; }; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index adf014280d88..6dc6e2651723 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,14 +10,14 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.2.20"; + version = "1.2.28"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-rvGwz7rg4yjN0KrfNOpDgE5V2m2m0vgwzE84tcY7EWk="; + hash = "sha256-t0GYaIce5fmQfwpI1cqZEL3OXPmdIet+i1BegIbpU3s="; }; vendorHash = "sha256-napF55nA/9P8l5lddnEHQMjLXWSyTzgblIQCbSZ20MA="; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 25e5da899c68..4e1ad54ad9ef 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-oPes5a7szsiYe4B7kYC8io2G7SBVmON+p2sDF21PNxM="; + hash = "sha256-Q8Qtxb+eUaw0eX3F/jkgKKHmjApZ/UsTE+LeJ1FKoCg="; }; - vendorHash = "sha256-EZnmEYIGvE3BN7S70TsiE1Dkup73bORFx1rYx0cB8Qk="; + vendorHash = "sha256-wHP/l8Evu6F9Kzm88EQv9JMONI3OlWB3jB+88RgzKmo="; subPackages = "."; diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix index 84ba6fb1c364..cd15532ae21a 100644 --- a/pkgs/by-name/n2/n2/package.nix +++ b/pkgs/by-name/n2/n2/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage { pname = "n2"; - version = "0-unstable-2025-03-14"; + version = "0-unstable-2025-11-10"; src = fetchFromGitHub { owner = "evmar"; repo = "n2"; - rev = "d67d508c389ac2e6961c6f84cd668f05ec7dc7b7"; - hash = "sha256-eWcN/iK/ToufABi4+hIyWetp2I94Vy4INHb4r6fw+TY="; + rev = "b1fead52ccda0c497d816696f23f4099c3e8ec1f"; + hash = "sha256-9nS/0QrdKeR8uzcKVu8T5pNp/FX5fGmOM/BRLChTR20="; }; cargoHash = "sha256-LTgAaTQXW0XEbe+WS47pqSb+eU7FqjdTSO2++C3J5aM="; diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix index cc900bf38b97..7e0f215b2862 100644 --- a/pkgs/by-name/n6/n64recomp/package.nix +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "n64recomp"; - version = "0-unstable-2025-11-25"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "N64Recomp"; repo = "N64Recomp"; - rev = "0fab168437a564c1fc93786acdaadcd6bb8c52f1"; - hash = "sha256-Cuw9922HLjiF1viYe1qCtmncEZDHTjIz4acffxNZ/ss="; + rev = "07fcdac76da3e47105238d45defe83d56c2821f5"; + hash = "sha256-KvoJB6M9GX0nm9D4X7P43w8PgHNkGCfj9yuzqc17y8s="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 1706a06c4151..f5ecbc4653c1 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.120.4"; + version = "1.122.5"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-gUqQM/eA7GnvFYiduSGkj/MCvgWNQPhDLExAJz67bHg="; + hash = "sha256-39/f3ueXey6M9pxoChcUZhLxvmE6t/u113oU5wju+5Y="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-UWiN3NvI8We16KwY5JspyX0ok1PJWVg0T5zw+0SnrWk="; + hash = "sha256-LoVJgtADHOI58qZ5T9WNvyn5O8UX5iQ148gZ3KUyYHE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index e596ba1a7553..dfc565a5e09f 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0.2.13"; + version = "0.3.0"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; tag = "v${finalAttrs.version}"; - hash = "sha256-OTQA8Uukhjr0Cy1zqMrxy+wke5cBFFx0OjoenxTBW2Q="; + hash = "sha256-u7pblUmMJYYd0o7jzT5g9moPrWdOgqhPXPzx+B90ybg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index fa7b5e07b2ba..6f8a661bce64 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "nak"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${finalAttrs.version}"; - hash = "sha256-HDhzjVUJbwDAPz/eR42by837eZrKQtiAGfBkSK9NjnY="; + hash = "sha256-FQwo40uNyjoBsqsXFbbReI+n89sQR+d2wn1stSQb/+k="; }; - vendorHash = "sha256-D3IkQZO/CP9gNc4HlDBPmDWyHIb4nm8bGyCdfBGbXMk="; + vendorHash = "sha256-EaJPQS712e5IM1Mh7A2lJKohOkLuKV/7gtxGnajjbFw="; ldflags = [ "-s" diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 3bf2084b10a6..4158e19de7a9 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nakama"; - version = "3.34.1"; + version = "3.35.1"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${version}"; - hash = "sha256-fCQM3e1lsy1xHxoUZnVxMsRh+RLvNGGCN86DsEMjQys="; + hash = "sha256-CntKCWfhK6UjM7NWdzhHfpbll693vmFxgsyoaxyyCQs="; }; vendorHash = null; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index bff996c0588b..0d363f58d9a8 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.452"; + version = "0.0.453"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-hVxjejvpcacyOn0Lk1TKaPiwg+zpYfGwrrGWly1StGE="; + hash = "sha256-kwbfXb7SKm8UfXzYvPxYOtUjsHNrahH0FjQzoCHdwTM="; }; vendorHash = "sha256-rfaQR3B4YvEbI1sBZwwLcSJVrUL98UAmfUiLeK5bN/A="; diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index ea275871df81..32fca0879baa 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm - nequissimus sigmasquadron ]; platforms = platforms.all; diff --git a/pkgs/by-name/na/nanorc/package.nix b/pkgs/by-name/na/nanorc/package.nix index ed3d734f5865..f233503e1e0f 100644 --- a/pkgs/by-name/na/nanorc/package.nix +++ b/pkgs/by-name/na/nanorc/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ nequissimus ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 22a419a60da1..07a790b86c95 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "navicat-premium"; - version = "17.3.3"; + version = "17.3.5"; src = appimageTools.extractType2 { inherit (finalAttrs) pname version; src = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20251008050849/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-gXXj2FXOw2OHUTaX5XYtd0/nL/E/hNmcmvc0TDaOCUQ="; + url = "https://web.archive.org/web/20251209223816/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-T2NsaUv/S2dWEP1QUBA+tHrM1UeP4Mh8jamg1obeEFs="; }; aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20251008051000/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; - hash = "sha256-18JbUJV8jAXRiVVerfYZLsjy+5K2DjwqAY+Hqjtlnfg="; + url = "https://web.archive.org/web/20251209224531/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-GMyIaDUFlcSfN0RydJjxOi3S5WexhyaJLXKtx9Kwvzs="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 80f8de22b211..d1529a52d775 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -19,23 +19,23 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.58.5"; + version = "0.59.0"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-bb6Ak8coEhN4ny79WgZ4DqzjqLbCr1FW/a3w2gfls2M="; + hash = "sha256-YXyNnjaLgu4FXvgsbbzCOZRIuN96h+KDrXmJe1607JI="; }; - vendorHash = "sha256-axtXNcduTCmi08kjmGCCgokvHR+uIdpZtnLCSFUIoM4="; + vendorHash = "sha256-FFtTQuXb5GYxZmUiNjZNO6K8QYF0TLH4JU2JmAzZhqQ="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/ui"; - hash = "sha256-X6H3laLaWsI0aqFKIE7IDdWqYuTScI7gcRbcB4wPsKA="; + hash = "sha256-RTye1ZbxLqfkZUvV0NLN7wcRnri3sC5Lfi8RXVG1bLM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nebula-lighthouse-service/package.nix b/pkgs/by-name/ne/nebula-lighthouse-service/package.nix index 47c431ec67af..532f334f244d 100644 --- a/pkgs/by-name/ne/nebula-lighthouse-service/package.nix +++ b/pkgs/by-name/ne/nebula-lighthouse-service/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "nebula-lighthouse-service"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "manuels"; repo = "nebula-lighthouse-service"; tag = "v${version}"; - hash = "sha256-cRwmOGuPEYlURVbaf9AwaSmhvUzzZvATv5RGPUztnbY="; + hash = "sha256-I2eoofEAY1Bbk17opx5cHWK4R+n2RE8JOUVGX1409Xk="; }; postPatch = '' diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix index 80ce794aec44..e77681ae5da6 100644 --- a/pkgs/by-name/ne/nebula/package.nix +++ b/pkgs/by-name/ne/nebula/package.nix @@ -3,29 +3,54 @@ buildGoModule, fetchFromGitHub, nixosTests, + withPkcs11 ? true, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "nebula"; - version = "1.9.7"; + version = "1.10.0"; src = fetchFromGitHub { owner = "slackhq"; repo = "nebula"; - tag = "v${version}"; - hash = "sha256-U6PCHRSETkrA/nulTqIn9vvj3zks10kJ1k2syFsPMnM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-p/2A1ZTBUPvrA8eAgLxjR7NSAfiIEkDcjX0Db8dCmfQ="; }; - vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA="; + vendorHash = "sha256-rod6YDosI9nBf2v6Q/rw/fT9p9N8Zo/lu989UhyL8/s="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - ldflags = [ "-X main.Build=${version}" ]; + tags = lib.optional withPkcs11 "pkcs11"; + + ldflags = [ "-X main.Build=${finalAttrs.version}" ]; + + checkFlags = [ + "-v" + ] + ++ lib.optionals withPkcs11 [ + "-tags" + "pkcs11" + ]; + + env = lib.optionalAttrs (!withPkcs11) { + CGO_ENABLED = 0; + }; passthru.tests = { + e2e = finalAttrs.finalPackage.overrideAttrs (prev: { + # go test picks up all the tests if we do not limit the subpackages built + subPackages = [ ]; + + # Also run the e2e tests. + postCheck = '' + make e2ev + ''; + }); + inherit (nixosTests.nebula) connectivity reload @@ -50,11 +75,10 @@ buildGoModule rec { parts. ''; homepage = "https://github.com/slackhq/nebula"; - changelog = "https://github.com/slackhq/nebula/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/slackhq/nebula/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne numinit ]; }; -} +}) diff --git a/pkgs/by-name/ne/neo-cowsay/package.nix b/pkgs/by-name/ne/neo-cowsay/package.nix index 8f3f556c877c..05af75036d41 100644 --- a/pkgs/by-name/ne/neo-cowsay/package.nix +++ b/pkgs/by-name/ne/neo-cowsay/package.nix @@ -33,7 +33,6 @@ buildGoModule rec { artistic1 # or gpl3 ]; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "cowsay"; }; } diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix new file mode 100644 index 000000000000..34d8f0b9c9b6 --- /dev/null +++ b/pkgs/by-name/ne/neowall/package.nix @@ -0,0 +1,56 @@ +{ + stdenv, + pkg-config, + fetchFromGitHub, + lib, + libglvnd, + mesa, + libpng, + libjpeg, + wayland, + wayland-scanner, + versionCheckHook, +}: + +stdenv.mkDerivation (finallAttrs: { + pname = "neowall"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "1ay1"; + repo = "neowall"; + tag = "v${finallAttrs.version}"; + hash = "sha256-q/M79ol4l4YIsewP50/6I2C5zKmF1Bc4mgIC896qxPY="; + }; + + nativeBuildInputs = [ + pkg-config + wayland-scanner + ]; + + buildInputs = [ + wayland + mesa + libglvnd + libpng + libjpeg + ]; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/1ay1/neowall/releases/tag/${finallAttrs.src.tag}"; + description = "GPU shader wallpapers for Wayland"; + homepage = "https://github.com/1ay1/neowall"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lonerOrz ]; + mainProgram = "neowall"; + }; +}) diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index f679b97dabf8..25a120042222 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "containers"; repo = "netavark"; rev = "v${version}"; - hash = "sha256-Co7Wt6eUwbDVd+MljXh+kJ1Op8ekGzYxWA4j8EWa0jk="; + hash = "sha256-KLN1Y2C43dTZlm1VNZq49/zQY55iAPf5V7KK5zjC2dw="; }; - cargoHash = "sha256-FBvD7EY+NryetZmJSAMZdikDi5N5kLWHL8gzd0rGnj8="; + cargoHash = "sha256-Ac8/0MgvDZ3djUlKOv3yT3aCPkxbNPnFM8ZId6yN354="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix index 0f5e372d1efb..1cc2d865d137 100644 --- a/pkgs/by-name/ne/netbeans/package.nix +++ b/pkgs/by-name/ne/netbeans/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation { binaryNativeCode ]; maintainers = with lib.maintainers; [ - sander rszibele kashw2 ]; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index f07f06a96b5b..afe06bf284f3 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.20.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-RvnoQRVJlZNqfmOa2c1s/ZuA0Ej7pZ7WcXM+31t22eY="; + hash = "sha256-BuoDcgc68qJGPruqSUB1IFOvuPOH0+6J+k044jJefsI="; }; - npmDepsHash = "sha256-93w0ZWtrLfYRBa5Ps4duSRoiI4hu9AoK7GZRRH4zmL0="; + npmDepsHash = "sha256-Ry9T4SdR3UWv/IDd99Ar+sFTMP1JAEg0QcAEM7uY4Hk="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index f9f4e3af3a43..cc77e4565147 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.60.2"; + version = "0.60.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-8z0MMoY3ny64yuHK8iwV27HYLy96QKQe9ddAylRy+gk="; + hash = "sha256-p+sfa9gZQltX9BsA0QUDDR3W9JGERUEzjahogIE2aq0="; }; - vendorHash = "sha256-KuazgdFPc+ahBQCPvBvQajCNZi/roU8JrYNoiaOtcjc="; + vendorHash = "sha256-vtyzl1fIl3vsj61X+l6Fc8BKqwM68iwkX5+WgcQRlME="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix index 0a05c87a2543..c7cb6829bd63 100644 --- a/pkgs/by-name/ne/netpeek/package.nix +++ b/pkgs/by-name/ne/netpeek/package.nix @@ -15,14 +15,14 @@ }: python3Packages.buildPythonApplication rec { pname = "netpeek"; - version = "0.2.5"; + version = "0.2.6"; pyproject = false; src = fetchFromGitHub { owner = "ZingyTomato"; repo = "NetPeek"; tag = "v${version}"; - hash = "sha256-b7XHBmFSI3ITojd05M6tytozgfBg0WvN/CWFbk5c/JQ="; + hash = "sha256-SFY/bUUS4AOniOGjngH/fUHrYiq+dMWxHYvoSkhfnkA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index b76c74b0d894..08963d43fb3b 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -16,16 +16,16 @@ let in buildNpmPackage (finalAttrs: { pname = "netron"; - version = "8.7.5"; + version = "8.7.6"; src = fetchFromGitHub { owner = "lutzroeder"; repo = "netron"; tag = "v${finalAttrs.version}"; - hash = "sha256-wK6aKoTnERW1qkCv1zy4Pea00VP0mOPZGFxLbGQ6IFg="; + hash = "sha256-gVaNYbKTvymRl1M58Hk2CAxiRXB73adfkaRbpGHsReI="; }; - npmDepsHash = "sha256-+beWln/XjFyRc1g4ERvWACt7XRSimDX7G1x9R3YP3Eg="; + npmDepsHash = "sha256-ScEqjtCafuCQ3+KgQnQQ6q+t483Sy/0N5kSQUsbgnRw="; nativeBuildInputs = [ jq ]; diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index 486551ce0f6a..5c2003027f81 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -5,6 +5,7 @@ fetchpatch, installShellFiles, python3Packages, + python3, asciidoc, wrapGAppsNoGuiHook, iw, @@ -46,10 +47,14 @@ stdenv.mkDerivation rec { asciidoc # for a2x installShellFiles wrapGAppsNoGuiHook - python3Packages.wrapPython ]; - dontWrapGApps = true; + buildInputs = [ + (python3.withPackages (ps: [ + ps.dbus-python + ps.pygobject3 + ])) + ]; checkInputs = with python3Packages; [ dbus-python @@ -59,14 +64,10 @@ stdenv.mkDerivation rec { pytestCheckHook ]; - pythonPath = with python3Packages; [ - dbus-python - pygobject3 - ]; - installPhase = '' runHook preInstall install -D -m755 -t $out/bin networkd-dispatcher + patchShebangs --host $out/bin/networkd-dispatcher install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf installManPage networkd-dispatcher.8 @@ -76,13 +77,7 @@ stdenv.mkDerivation rec { doCheck = true; preFixup = '' - makeWrapperArgs+=( \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : "${lib.makeBinPath [ iw ]}" \ - ) - ''; - postFixup = '' - wrapPythonPrograms + gappsWrapperArgs+=("--prefix" "PATH" ":" "${lib.makeBinPath [ iw ]}") ''; meta = with lib; { diff --git a/pkgs/by-name/ne/networking-ts-cxx/package.nix b/pkgs/by-name/ne/networking-ts-cxx/package.nix index 2abc08f86762..c020bdc77071 100644 --- a/pkgs/by-name/ne/networking-ts-cxx/package.nix +++ b/pkgs/by-name/ne/networking-ts-cxx/package.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation { description = "Experimental implementation of the C++ Networking Technical Specification"; homepage = "https://github.com/chriskohlhoff/networking-ts-impl"; license = licenses.boost; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index bae7b6f8ec51..4a2fe0825d46 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "4.0.1"; + version = "4.0.3"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-5E4VB+wZQfB8zkFtNrzpCv47iCpk6XS4rCkDKoU0JhM="; + hash = "sha256-PwL5USUP60ePxn0U7zyx6hHQlx4xKVquZ1QLTWTsSRU="; }; patches = [ diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 45d5c4c11912..2e0f0d3005ca 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 = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-rof0q498RzrE+v9iSwry6FF1SX8LWpvHt9hWfLXiuY0="; + hash = "sha256-K5iE+76Bu03NYx8eQxVgY2NN1r7Acawj8w7W1QTVyv4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 2e6d7b9e6c03..58fec09e2b9c 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -14,7 +14,7 @@ let pname = "nezha"; - version = "1.14.9"; + version = "1.14.10"; frontendName = lib.removePrefix "nezha-theme-"; @@ -58,7 +58,7 @@ buildGoModule { owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-q4LxqoelZ0Haz8rArINOPvopQQKGnkqIMZ2INo/2C3c="; + hash = "sha256-tgjLkNSNEQCJP1/Pcgfldl5DGQnzca6KMrqEjl45ex4="; }; proxyVendor = true; diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 862d32fd7960..282a0711f8d5 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -4,12 +4,13 @@ rustPlatform, installShellFiles, fetchFromGitHub, + fetchpatch, nix-update-script, buildPackages, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nh-unwrapped"; - version = "4.2.0"; + version = "4.2.0"; # Did you remove the patch below (and this comment)? src = fetchFromGitHub { owner = "nix-community"; @@ -18,6 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-6n5SVO8zsdVTD691lri7ZcO4zpqYFU8GIvjI6dbxkA8="; }; + patches = [ + (fetchpatch { + url = "https://github.com/nix-community/nh/commit/8bf323483166797a204579a43ed8810113eb128c.patch"; + hash = "sha256-hg0LgDPjiPWR+1DRzqORv6QPlrds7ys4PTDXFw6PUoI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ @@ -56,7 +64,9 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "nh"; maintainers = with lib.maintainers; [ NotAShelf + mdaniels5757 viperML + midischwarz12 ]; }; }) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 29032d5ce713..924c613dbc8b 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -13,7 +13,7 @@ let in symlinkJoin { pname = "nh"; - inherit (unwrapped) version meta; + inherit (unwrapped) version; paths = [ unwrapped @@ -27,4 +27,20 @@ symlinkJoin { wrapProgram $out/bin/nh \ --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; + + meta = { + inherit (unwrapped.meta) + changelog + description + homepage + license + mainProgram + maintainers + ; + + # To prevent builds on hydra + hydraPlatforms = [ ]; + # prefer wrapper over the package + priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1; + }; } diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index cd012dbd780b..8745ef3a950d 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; mainProgram = "nheko"; maintainers = with maintainers; [ - ekleog fpletz rebmit rnhmjoj diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix index 0f7d81484843..4c6aa006f3ba 100644 --- a/pkgs/by-name/ni/nix-serve/package.nix +++ b/pkgs/by-name/ni/nix-serve/package.nix @@ -12,7 +12,6 @@ let rev = "a7e046db4b29d422fc9aac60ea6b82b31399951a"; sha256 = "sha256-6ZQ0OLijq6UtOtUqRdFC19+helhU0Av6MvGCZf6XmcQ="; - inherit (nix.libs) nix-perl-bindings; in stdenv.mkDerivation { @@ -37,7 +36,7 @@ stdenv.mkDerivation { p.DBDSQLite p.Plack p.Starman - nix-perl-bindings + nix.libs.nix-perl-bindings or null ]) }/bin/starman $out/bin/nix-serve \ --prefix PATH : "${ diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index 56e628336b4f..94b4eae794fa 100644 --- a/pkgs/by-name/ni/nixbit/package.nix +++ b/pkgs/by-name/ni/nixbit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixbit"; - version = "0.4.0"; + version = "0.5.4"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-HUnMqrEJp7sg20DIcIIDGMVKghxlo7bp3NB8llfA54k="; + hash = "sha256-3zDRR8zaO0VViMI8gtAVJvpeNp1C/VNHUNMdqqxFlPY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nixos-icons/package.nix b/pkgs/by-name/ni/nixos-icons/package.nix index 8a9ed3d40a84..66522596a6ef 100644 --- a/pkgs/by-name/ni/nixos-icons/package.nix +++ b/pkgs/by-name/ni/nixos-icons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixos-icons"; - version = "0-unstable-2024-04-10"; + version = "0-unstable-2025-06-28"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-artwork"; - rev = "f84c13adae08e860a7c3f76ab3a9bef916d276cc"; - hash = "sha256-lO/2dLGK2f9pzLHudRIs4PUcGUliy7kfyt9r4CbhbVg="; + rev = "9d2cdedd73d64a068214482902adea3d02783ba8"; + hash = "sha256-//4BiRF1W5W2rEbw6MupiyDOjvcveqGtYjJ1mZfck9U="; }; sourceRoot = "${finalAttrs.src.name}/icons"; @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Icons of the Nix logo, in Freedesktop Icon Directory Layout"; homepage = "https://github.com/NixOS/nixos-artwork"; - license = licenses.cc-by-40; + license = lib.licenses.cc-by-40; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index 49c0d7bbfa2c..8f8ef5b8db7b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -1,39 +1,8 @@ # nixos-rebuild-ng -Work-in-Progress rewrite of -[`nixos-rebuild`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh). - -## Why the rewrite? - -The current state of `nixos-rebuild` is dire: it is one of the most critical -pieces of code we have in NixOS, but it has tons of issues: -- The code is written in Bash, and while this by itself is not necessarily bad, - it means that it is difficult to do refactorings due to the lack of tooling - for the language -- The code itself is a hacky mess. Changing even one line of code can cause - issues that affect dozens of people -- Lack of proper testing (we do have some integration tests, but no unit tests - and coverage is probably pitiful) -- The code predates some of the improvements `nix` had over the years, e.g., it - builds Flakes inside a temporary directory and reads the resulting symlink - since the code seems to predate `--print-out-paths` flag - -Given all of the above, improvements in the `nixos-rebuild` are difficult to -do. A full rewrite is probably the easier way to improve the situation since -this can be done in a separate package that will not break anyone. So this is -an attempt of the rewrite. - -## Why Python? - -- It is the language of choice for many critical things inside `nixpkgs`, like - the `NixOSTest` and `systemd-boot-builder.py` activation scripts -- It is a language with great tooling, e.g.: `mypy` for type checking, `ruff` - for linting, `pytest` for unit testing -- It is a scripting language that fits well with the scope of this project -- Python's standard library is great and it means we will need a low number of - external dependencies for this project. For example, `nixos-rebuild` - currently depends on `jq` for JSON parsing, while Python has `json` in - standard library +`nixos-rebuild-ng` is a command-line tool that builds and switches your NixOS +system to a new configuration based on your `configuration.nix` and related Nix +files. ## Development @@ -66,60 +35,3 @@ ruff check --fix . # format code ruff format . ``` - -## Breaking changes - -While `nixos-rebuild-ng` tries to be as much of a clone of the original as -possible, there are still some breaking changes that were done in order to -improve the user experience. If they break your workflow in some way that is -not possible to fix, please open an issue and we can discuss a solution. - -- For `--build-host` and `--target-host`, `nixos-rebuild-ng` does not allocate - a pseudo-TTY via SSH (e.g., `ssh -t`) anymore. The reason for this is that - pseudo-TTY breaks some expectations from SSH, like it mangles stdout and - stderr, and can - [break terminal output](https://github.com/NixOS/nixpkgs/issues/336967) in - some situations. - The issue is that `sudo` needs a TTY to ask for password, otherwise it will - fail. The solution for this is a new flag, `--ask-sudo-password`, that when - used with `--target-host` (`--build-host` doesn't need `sudo`), will ask for - the `sudo` password for the target host using Python's - [getpass](https://docs.python.org/3/library/getpass.html) and forward it to - every `sudo` request. Keep in mind that there is no check, so if you type - your password wrong, it will fail during activation (this can be improved - though) -- When `--build-host` and `--target-host` are used together, we will use `nix - copy` instead of SSH'ing to build host and using - `nix-copy-closure --to target-host`. The reason for this is documented in PR - [#364698](https://github.com/NixOS/nixpkgs/pull/364698). If you do need the - previous behavior, you can simulate it using `ssh build-host -- - nixos-rebuild-ng switch --target-host target-host`. If that is not the case, - please open an issue -- We do some additional validation of flags, like exiting with an error when - `--build-host` or `--target-host` is used with `repl`, since the user could - assume that the `repl` would be run remotely while it always runs the local - machine. `nixos-rebuild` silently ignored those flags, so this - [may cause some issues](https://github.com/NixOS/nixpkgs/pull/363922) for - wrappers - -## Caveats - -- Bugs in the profile manipulation can cause corruption of your profile that - may be difficult to fix, so right now I only recommend using - `nixos-rebuild-ng` if you are testing in a VM or in a filesystem with - snapshots like BTRFS or ZFS. Those bugs are unlikely to be unfixable but the - errors can be difficult to understand. If you want to go on, - `nix-collect-garbage -d` and `nix store repair` are your friends - -## TODON'T - -- Nix bootstrap: it is only used for non-Flake paths and it is basically - useless nowadays. It was created at a time when Nix was changing frequently - and there was a need to bootstrap a new version of Nix before evaluating the - configuration (otherwise the new Nixpkgs version may have code that is only - compatible with a newer version of Nix). Nixpkgs now has a policy to be - compatible with Nix 2.18, and even if this is bumped as long we don't do - drastic minimum version changes this should not be an issue. Also, the daemon - itself always run with the previous version since even we can replace Nix in - `PATH` (so Nix client), but we can't replace the daemon without switching to - a new version. diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 580172b3dac1..cf3f1eefc891 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -382,6 +382,9 @@ def get_nixpkgs_rev(nixpkgs_path: Path | None) -> str | None: if not nixpkgs_path: return None + if not (nixpkgs_path / ".git").exists(): + return None + try: # Get current revision r = run_wrapper( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 4c5f67196234..cb7c87ad74f3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -141,7 +141,7 @@ def test_parse_args() -> None: @patch("subprocess.run", autospec=True) def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" - nixpkgs_path.mkdir() + (nixpkgs_path / ".git").mkdir(parents=True) config_path = tmp_path / "test" config_path.touch() @@ -932,7 +932,7 @@ def test_execute_nix_switch_flake_build_host( @patch("subprocess.run", autospec=True) def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" - nixpkgs_path.touch() + (nixpkgs_path / ".git").mkdir(parents=True) def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix-instantiate": diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 20bba2e83818..c4b37bf0c32f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -345,7 +345,7 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: stdout=PIPE, ) - build_attr = m.BuildAttr(Path(tmp_path), "preAttr") + build_attr = m.BuildAttr(tmp_path, "preAttr") assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", @@ -404,31 +404,20 @@ def test_get_build_image_variants_flake(mock_run: Mock) -> None: ) -def test_get_nixpkgs_rev() -> None: +def test_get_nixpkgs_rev(tmpdir: Path) -> None: assert n.get_nixpkgs_rev(None) is None + assert n.get_nixpkgs_rev(tmpdir) is None - path = Path("/path/to/nix") - - with patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - side_effect=[CompletedProcess([], 0, "")], - ) as mock_run: - assert n.get_nixpkgs_rev(path) is None - mock_run.assert_called_with( - ["git", "-C", path, "rev-parse", "--short", "HEAD"], - check=False, - capture_output=True, - ) + (tmpdir / ".git").mkdir() expected_calls = [ call( - ["git", "-C", path, "rev-parse", "--short", "HEAD"], + ["git", "-C", tmpdir, "rev-parse", "--short", "HEAD"], check=False, capture_output=True, ), call( - ["git", "-C", path, "diff", "--quiet"], + ["git", "-C", tmpdir, "diff", "--quiet"], check=False, ), ] @@ -441,7 +430,7 @@ def test_get_nixpkgs_rev() -> None: CompletedProcess([], returncode=0), ], ) as mock_run: - assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6" + assert n.get_nixpkgs_rev(tmpdir) == ".git.0f7c82403fd6" mock_run.assert_has_calls(expected_calls) with patch( @@ -452,7 +441,7 @@ def test_get_nixpkgs_rev() -> None: CompletedProcess([], returncode=1), ], ) as mock_run: - assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6M" + assert n.get_nixpkgs_rev(tmpdir) == ".git.0f7c82403fd6M" mock_run.assert_has_calls(expected_calls) diff --git a/pkgs/by-name/nn/nnn/package.nix b/pkgs/by-name/nn/nnn/package.nix index 74e828d06e08..409978c3830d 100644 --- a/pkgs/by-name/nn/nnn/package.nix +++ b/pkgs/by-name/nn/nnn/package.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "nnn"; }; }) diff --git a/pkgs/by-name/no/noisetorch/package.nix b/pkgs/by-name/no/noisetorch/package.nix index af3824a164aa..cc8b045d806a 100644 --- a/pkgs/by-name/no/noisetorch/package.nix +++ b/pkgs/by-name/no/noisetorch/package.nix @@ -47,7 +47,6 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ panaeon - lom ]; mainProgram = "noisetorch"; }; diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 9a6daaada4f6..ef9f83ccbee5 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "nostui"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "akiomik"; repo = "nostui"; rev = "v${version}"; - hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; + hash = "sha256-7i76JPg6MAk4/sO8/JI4ody4iYFJPeLkD2SWncFhT4o="; }; GIT_HASH = "000000000000000000000000000000000000000000000000000"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { "--skip=widgets::text_note::tests::test_created_at" ]; - cargoHash = "sha256-tway75ZAP2cGdpn79VpuRd0q/h+ovDvkih1LKitM/EU="; + cargoHash = "sha256-X5VeL9oWjqoWmXQTCINvvFLdXqCyhO01ckDU7x42Teo="; meta = with lib; { homepage = "https://github.com/akiomik/nostui"; diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 5757eef4320c..15d33e5140b0 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.11.01"; + version = "2025.12.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-T7F8SUCbEEuJfgUYWk+/lDGuXn/df2DaGc+3hCuYhS0="; + hash = "sha256-XYamBsakiqfpwghuQan81ZNJTvcfua9hIbVXU4HWOqY="; }; outputs = [ diff --git a/pkgs/by-name/no/noxdir/package.nix b/pkgs/by-name/no/noxdir/package.nix index 1be47f9cac0b..f4117c1d8c65 100644 --- a/pkgs/by-name/no/noxdir/package.nix +++ b/pkgs/by-name/no/noxdir/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "noxdir"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "crumbyte"; repo = "noxdir"; tag = "v${finalAttrs.version}"; - hash = "sha256-FC2+tXsFu8VWgvAqo+DWWII9c9YhURwzM86S4oU92ms="; + hash = "sha256-V6tQ9ZERsbc4Hg/Yo5tkLPUu353m2Mu+kBYDuZ2fWCA="; }; vendorHash = "sha256-uRJP21bJ8NlJ0qOG81Gax9LJ+HdPfxLKj1Jjzbweync="; diff --git a/pkgs/by-name/np/nps/package.nix b/pkgs/by-name/np/nps/package.nix index 6b8b7f0a3579..df9afac22584 100644 --- a/pkgs/by-name/np/nps/package.nix +++ b/pkgs/by-name/np/nps/package.nix @@ -1,25 +1,28 @@ { lib, nix, + nix-update-script, fetchFromGitHub, rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "nps"; - version = "0.2.9"; + version = "0.2.12"; src = fetchFromGitHub { owner = "OleMussmann"; repo = "nps"; tag = "v${version}"; - hash = "sha256-q/PkigsNAI7MCmeDFBMGuZJFXVL95pQCNOVhNvBH9dc="; + hash = "sha256-kOVpn13lJYeO/99e39c0wbe7qcKHyMj5v4prBtZ3N7s="; }; - cargoHash = "sha256-MThyvhzZXRM4l0K8csLDldMVKiDxKZ5EIFATGVpGpVc="; + cargoHash = "sha256-dJA9fOU06txPAx5kMl7aGoFeKo7UXqB7X+viUfJqG/M="; nativeCheckInputs = [ nix ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Cache the nix package list, query and sort results by relevance"; longDescription = '' @@ -38,7 +41,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/OleMussmann/nps"; license = lib.licenses.mit; mainProgram = "nps"; - maintainers = with lib.maintainers; [ olemussmann ]; + maintainers = with lib.maintainers; [ + mdaniels5757 + olemussmann + ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/nt/ntfsprogs-plus/package.nix b/pkgs/by-name/nt/ntfsprogs-plus/package.nix new file mode 100644 index 000000000000..7d5282dd1a4f --- /dev/null +++ b/pkgs/by-name/nt/ntfsprogs-plus/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libgcrypt, + libuuid, + gettext, + gitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ntfsprogs-plus"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ntfsprogs-plus"; + repo = "ntfsprogs-plus"; + tag = finalAttrs.version; + hash = "sha256-vbK/lnNMHTycw5H9ijLfX7uRB7mgsI6KGg8gfO3OCGk="; + }; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + # We don't need GnuTLS despite the configure warning about its absence, + # because ntfsdecrypt from ntfs-3g is not used in ntfsprogs-plus and is not built. + # See: https://github.com/search?q=repo%3Antfsprogs-plus%2Fntfsprogs-plus%20gnutls&type=code + buildInputs = [ + # autoreconf will not succeed without libgcrypt, maybe due to leftover checks from ntfs-3g? + libgcrypt + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ] + ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ]; + + configureFlags = [ "--exec-prefix=\${prefix}" ]; + + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "NTFS filesystem userspace utilities"; + homepage = "https://github.com/ntfsprogs-plus/ntfsprogs-plus"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ccicnce113424 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index ee6cb304cf2c..4b165d5f8506 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-2025-11-26"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "248f65e7ba5661cc9f88b37e1a2f30f62f345657"; - hash = "sha256-w8jCv6QCdxuSyHjp4z7wYMCYUrvw+otppqfWPL9jGkQ="; + rev = "485a62c9a3522ef13abb1770523a2a566da721bd"; + hash = "sha256-+m4T1xSngA5z0OHQGyzhVg6kOyEzwOOX7VuWsluYP10="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 3761531bb62f..85d81b8e8953 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.3.3"; + version = "10.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-Hwllx+iJQo7FuX9q5yMu29ejjVsRmPnxvszcb324FO0="; + hash = "sha256-8bS7ZqNMXAggL5vq3k/sDlStVOr8hPme2tUFZ882Ge0="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index eb13bb875a3f..eea365cd5601 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-85gGcNDuARc7sMJcl3yVwuTYG0laQ5/Uk7qxcXFeViQ="; + hash = "sha256-jZInWfXHUuntdEKdaFV46/A7NTcCB77bLYaFSL9w+Os="; }; - vendorHash = "sha256-VKszu2WNLL2gSkgyAoA80HkYGD6kRdfj5fGLErjL86A="; + vendorHash = "sha256-jw6DhUCFz7dnWX3tMsj2fMX36YA5RwkQlONVQHg37dY="; proxyVendor = true; # hash mismatch between Linux and Darwin diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix similarity index 74% rename from pkgs/data/icons/numix-icon-theme/default.nix rename to pkgs/by-name/nu/numix-icon-theme/package.nix index 907e51a6e5cf..8438f544d88d 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/by-name/nu/numix-icon-theme/package.nix @@ -4,21 +4,21 @@ fetchFromGitHub, gtk3, adwaita-icon-theme, - breeze-icons, gnome-icon-theme, hicolor-icon-theme, gitUpdater, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "numix-icon-theme"; version = "25.10.26"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme"; - rev = version; - sha256 = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc="; + tag = finalAttrs.version; + hash = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -51,12 +51,12 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; # darwin cannot deal with file names differing only in case - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/nu/numr/package.nix b/pkgs/by-name/nu/numr/package.nix new file mode 100644 index 000000000000..a0001031e410 --- /dev/null +++ b/pkgs/by-name/nu/numr/package.nix @@ -0,0 +1,50 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "numr"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "nasedkinpv"; + repo = "numr"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FcvXhgao8l5vBggziAMmvmxKZ1uIr8UDyk64RTohYMg="; + }; + + cargoHash = "sha256-LHTAhGHc0hnq1lzYkQhAO3VhwbzVi0vN1D6VBgEV/Js="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; + + env.OPENSSL_NO_VENDOR = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Text calculator inspired by Numi - natural language expressions, variables, unit conversions"; + homepage = "https://github.com/nasedkinpv/numr"; + license = licenses.mit; + maintainers = with maintainers; [ + matthiasbeyer + ]; + mainProgram = "numr"; + }; +}) diff --git a/pkgs/by-name/nu/nuraft/package.nix b/pkgs/by-name/nu/nuraft/package.nix index 1176313a2805..d32e01202816 100644 --- a/pkgs/by-name/nu/nuraft/package.nix +++ b/pkgs/by-name/nu/nuraft/package.nix @@ -5,7 +5,7 @@ fetchpatch, cmake, boost, - asio, + asio_1_32_0, openssl, zlib, }: @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost - asio + # Depends on io_service + asio_1_32_0 openssl zlib ]; diff --git a/pkgs/by-name/nu/nuspell/package.nix b/pkgs/by-name/nu/nuspell/package.nix index bff48444c8b8..b21bc87e06ec 100644 --- a/pkgs/by-name/nu/nuspell/package.nix +++ b/pkgs/by-name/nu/nuspell/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, cmake, ctestCheckHook, + doxygen, buildPackages, pkg-config, icu, @@ -15,17 +16,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "nuspell"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; tag = "v${finalAttrs.version}"; - hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI="; + hash = "sha256-CAyM3bzIP0aYNEu94I7I1qlglPx9HJSnEkgEfjNGfvc="; }; nativeBuildInputs = [ cmake + doxygen pkg-config ] ++ lib.optional enableManpages buildPackages.pandoc; diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix index d135c3fb44b8..fbc804c23d05 100644 --- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix +++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nvidia-mig-parted"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "mig-parted"; tag = "v${finalAttrs.version}"; - hash = "sha256-oSoPgap/LFjJ1tW3KLlcQ/zdym9A9h5zownktVxdQfY="; + hash = "sha256-No8NzmjDjri77r7YzuSYsGMvHHMxsvxJaddarKcDMr0="; }; vendorHash = null; diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index f2e906297473..7c0d54187797 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "nvidia-modprobe"; - version = "580.105.08"; + version = "590.44.01"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = version; - hash = "sha256-orOFwL9mrmqPqMorUOZlBTMEraAqYCf+2XTD9DuMeSk="; + hash = "sha256-KEg5sLiCDKNmKtzqYXIDaCU8lbunQumrqlxHQ8F07fw="; }; nativeBuildInputs = [ gnum4 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Load the NVIDIA kernel module and create NVIDIA character device files "; + description = "Load the NVIDIA kernel module and create NVIDIA character device files"; homepage = "https://github.com/NVIDIA/nvidia-modprobe"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index 4e1fe6fb06f1..b26d69abe728 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-Ce92O0GfOIIwHHFLBYQdvYlQmAeeJ6xBfMVXps6+B5E="; + hash = "sha256-CPx69Gp0n715q7ZoL0s19+IUdS1+vjw+49es2vzEFWg="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/nv/nvs/package.nix b/pkgs/by-name/nv/nvs/package.nix index 72b63d069382..61cc599ca5ed 100644 --- a/pkgs/by-name/nv/nvs/package.nix +++ b/pkgs/by-name/nv/nvs/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "nvs"; - version = "1.10.7"; + version = "1.11.0"; src = fetchFromGitHub { owner = "y3owk1n"; repo = "nvs"; tag = "v${finalAttrs.version}"; - hash = "sha256-rmTSM4xoUn+Jk6nPPg2XQ094WFnUVzqdICjucNCwhZM="; + hash = "sha256-G4wCNIgJX46ziS4S54U3Jlhrt3cLJhwoCHvrsrOrQw4="; }; vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA="; diff --git a/pkgs/by-name/ny/nylon/package.nix b/pkgs/by-name/ny/nylon/package.nix index 3627cb2fdfeb..4ad702ff4bf9 100644 --- a/pkgs/by-name/ny/nylon/package.nix +++ b/pkgs/by-name/ny/nylon/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; mainProgram = "nylon"; }; diff --git a/pkgs/by-name/nz/nzbhydra2/lombok-compiler-annotation.patch b/pkgs/by-name/nz/nzbhydra2/lombok-compiler-annotation.patch new file mode 100644 index 000000000000..407f4c8c7908 --- /dev/null +++ b/pkgs/by-name/nz/nzbhydra2/lombok-compiler-annotation.patch @@ -0,0 +1,25 @@ +--- a/pom.xml 1970-01-01 01:00:01.000000000 +0100 ++++ b/pom.xml 2025-12-02 21:04:01.739489000 +0100 +@@ -74,12 +74,13 @@ + 3.10.1 + + + -parameters ++ -proc:full + + 17 + 17 + + + + + +@@ -108,7 +109,7 @@ + 3.1.5 + 3.1.0 + 2.15.0 +- 1.18.30 ++ 1.18.42 + 1.5.21 + 23.0 + 4.13.2 diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index f997f0661bff..c4d7ec57773e 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -1,39 +1,91 @@ { lib, - stdenv, - fetchzip, makeWrapper, - openjdk17, python3, - unzip, nixosTests, + maven, + fetchFromGitHub, + jdk, }: -stdenv.mkDerivation rec { - pname = "nzbhydra2"; - version = "8.1.0"; - src = fetchzip { - url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-00XlNTwn/7Ve6q0MrJyu/WzL1imbygHcWHb1Z4FiI6Y="; - stripRoot = false; +# Skip some plugins not required for NixOS packaging to reduce required dependencies. +# Also skip the integration tests because they don't work in the sandbox. +let + projectFilter = "--projects ${ + lib.concatMapStringsSep "," (x: "!org.nzbhydra:${x}") [ + "github-release-plugin" + "discordreleaser" + "releases" + "generic-release" + "linux-amd64-release" + "linux-arm64-release" + "windows-release" + "tests" + ] + },!org.nzbhydra.tests:system"; +in +maven.buildMavenPackage rec { + pname = "nzbhydra2"; + version = "8.1.2"; + + src = fetchFromGitHub { + owner = "theotherp"; + repo = pname; + tag = "v${version}"; + hash = "sha256-BD9bvbPaVz3MJam78EHqfFc9jbh1SpkIxTe0UK8Lh0w="; }; + patches = [ + # Older lombok versions are incompatible with newer JDK versions. + ./lombok-compiler-annotation.patch + ]; + + buildOffline = true; + + mvnJdk = jdk; + + mvnHash = "sha256-SXanl43Fpd7IdhuD1H2LpB5BwvzbbjRNyZYzBvV1XXY="; + + manualMvnArtifacts = [ + "org.springframework.boot:spring-boot-maven-plugin:4.0.0" + + "org.apache.maven.plugins:maven-antrun-plugin:3.1.0" + "org.apache.maven.plugins:maven-dependency-plugin:3.7.0" + "org.apache.maven.plugins:maven-release-plugin:3.0.1" + "org.apache.maven.plugins:maven-plugin-plugin:3.7.1" + "org.apache.maven.plugins:maven-install-plugin:3.1.4" + + # Dependencies for building and running tests are included below. + # The set of dependencies for successfully building and running the tests is different. + # For simplicity all dependencies are included here, independently of whether we're running the tests. + "org.apache.maven.plugins:maven-surefire-plugin:2.22.2" + "org.apache.maven.surefire:surefire-junit4:3.0.0-M2" + "org.apache.maven.surefire:surefire-junit-platform:2.22.2" + "org.apache.maven.surefire:surefire-junit-platform:3.0.0-M2" + "org.apache.maven.surefire:surefire-junit-platform:3.2.5" + "org.junit.platform:junit-platform-surefire-provider:1.3.2" + ]; + + doCheck = true; + + mvnDepsParameters = projectFilter; + mvnParameters = projectFilter; + nativeBuildInputs = [ - openjdk17 makeWrapper - unzip ]; installPhase = '' runHook preInstall - install -d -m 755 "$out/lib/nzbhydra2" - cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2" - install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" + install -d -m 755 "$out/lib/${pname}/lib" + cp -rt "$out/lib/${pname}/lib" core/target/*-exec.jar + touch "$out/lib/${pname}/readme.md" + install -D -m 755 "other/wrapper/nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" - makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \ + makeWrapper ${lib.getExe python3} "$out/bin/nzbhydra2" \ --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \ - --prefix PATH ":" ${openjdk17}/bin + --prefix PATH ":" ${lib.getBin jdk}/bin runHook postInstall ''; @@ -46,7 +98,10 @@ stdenv.mkDerivation rec { description = "Usenet meta search"; homepage = "https://github.com/theotherp/nzbhydra2"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ matteopacini ]; + maintainers = with lib.maintainers; [ + matteopacini + tmarkus + ]; platforms = lib.platforms.linux; mainProgram = "nzbhydra2"; }; diff --git a/pkgs/by-name/ob/obfs4/package.nix b/pkgs/by-name/ob/obfs4/package.nix index 79ec3631c7a1..31ac4a734c29 100644 --- a/pkgs/by-name/ob/obfs4/package.nix +++ b/pkgs/by-name/ob/obfs4/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "obfs4"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { # will collide with lyrebird Gtk3 program. repo = "lyrebird"; tag = "lyrebird-${finalAttrs.version}"; - hash = "sha256-JBYYMi80n9FlW1WNh1fa3G+stL4hX9XeJ2idLvtgylI="; + hash = "sha256-h4ZhjyWRovoEFEFjjJBHBWc3kup60MNFvaYN6UPPxOE="; }; vendorHash = "sha256-isquplrmgtR8Mn5M+XNRdeGJHrAm7V7h1etVmVmN60I="; diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 184dca446e8f..e5af2e599cb2 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -1,7 +1,10 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + fetchpatch2, + just, libcosmicAppHook, sqlite, nix-update-script, @@ -9,21 +12,45 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oboete"; - version = "0.1.13"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = finalAttrs.version; - hash = "sha256-C6ymeI1t0UaX9EzUEz/5mQNEU8vfHueU7kuu9waXV5k="; + hash = "sha256-yCIZl51Etv/vXJsIMTvUDPhCnkIuenvHjcP0KZXdAiE="; }; - cargoHash = "sha256-QMcB3+KCefffbmyvkDoO6UvwwQgiDPwvae/jg4/XSO0="; + cargoHash = "sha256-BWGUzGGm1u64bQLy1rg9+WYNlgeuxcHlKsdIb18yVZA="; - nativeBuildInputs = [ libcosmicAppHook ]; + # TODO: Remove in the next update + patches = [ + (fetchpatch2 { + name = "fix-oboete-justfile.patch"; + url = "https://patch-diff.githubusercontent.com/raw/mariinkys/oboete/pull/25.diff?full_index=1"; + hash = "sha256-GPrtL73EKQi5fIIWPYcuS3HRwJ4ZHFsHzRYN6pYuUVg="; + }) + ]; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; buildInputs = [ sqlite ]; + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 1eabe9359f10..a09fb90a91cc 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-cmd"; - version = "0.19.2"; + version = "0.20.1"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-a7GUv14iJLrgXu6y5uJalD1cx723aIlPLDPOOoemtIY="; + hash = "sha256-67kMAUwgrQcGipsbKo0kubkVJA4/T4nfqghEZlhnvHU="; }; - cargoHash = "sha256-ZWVNLI900SZhXLMV2/v3WT2eqv+4XofpIgm/f/0eE+U="; + cargoHash = "sha256-t0R2QMmNpLgqmqLVL4hgEcqN0xIUIK3gIwxZxzkupbQ="; meta = { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/tools/misc/ocs-url/default.nix b/pkgs/by-name/oc/ocs-url/package.nix similarity index 100% rename from pkgs/tools/misc/ocs-url/default.nix rename to pkgs/by-name/oc/ocs-url/package.nix diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 11618f1ef33c..6edd3fb4d9b0 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -130,6 +130,5 @@ stdenv.mkDerivation rec { homepage = "https://ohmyz.sh/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ nequissimus ]; }; } diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 16481f68de9c..d587cd4e95e4 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.13.4"; + version = "3.14.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-vC2X4iZLTUm0Tnc5zJDfKdmhn8wlFLbHRtNbqMmFAgQ="; + hash = "sha256-uxM4ejuzFNkD6a7PNKCsO9Gwft7nd99t9IhVPCTApoE="; }; - vendorHash = "sha256-8pfrp7eOsgpCB44TQXn98G8+5WSn4EnuGKt6JUajAQ8="; + vendorHash = "sha256-JBMpNxfobrdLZYsVs7mhjyrPfuDUfTsAiU4chfw2gog="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 819dd278609c..615d4e66b382 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -138,16 +138,16 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.13.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-VhBPYf/beWkeFCdBTC2UpxqQUgEX8TCkbiWBPg8gDb4="; + hash = "sha256-ffovCXdL/Ooo2Gi/G/A5d+vIwa9LFnaiV1931x2vyG8="; }; - vendorHash = "sha256-rKRRcwmon/3K2bN7iQaMap5yNYKMCZ7P0M1C2hv4IlQ="; + vendorHash = "sha256-NM0vtue0MFrAJCjmpYJ/rPEDWBxWCzBrWDb0MVOhY+Q="; env = lib.optionalAttrs enableRocm { diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 2e712f9739ee..7dd76f7043c1 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.11.23.01"; - buildId = "5322"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "d174daa9e53efda779c0fd131908e73306ff1dc5"; + version = "25.12.05.03"; + buildId = "5357"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "2959f60fc33a0bd5c3a6805f439bf69c02b3bbfe"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-TpInYM6QRDgCFAo8wYzKAUbBtjUCGcAwq63pSgiqhJE="; + hash = "sha256-CMCFri8vfcgcU0Hy1KVTbYM7TLwLlHOJ6VSiEhKuWrA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index 9962d89ca48d..cc67121c100b 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ bhipple ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index b661d83a551b..4a9bb6ffd4ff 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne kloenk ]; mainProgram = "onefetch"; diff --git a/pkgs/by-name/on/onnx/package.nix b/pkgs/by-name/on/onnx/package.nix index f911fa24b56e..4cc7471d7d67 100644 --- a/pkgs/by-name/on/onnx/package.nix +++ b/pkgs/by-name/on/onnx/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; pname = "onnx"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "onnx"; repo = "onnx"; tag = "v${finalAttrs.version}"; - hash = "sha256-lIw65HAaNE+pOiHPpbOxzX+gk8ueJfuAHxs+DV99Jh0="; + hash = "sha256-oWbrBx1jWznzeT2N+VrFH8LIqdzY/aXH5N0kb/vbg2M="; }; outputs = [ @@ -50,44 +50,16 @@ stdenv.mkDerivation (finalAttrs: { setuptools ]; - # NOTE: Most of these can be removed after bumping to 1.20. - # See: - # - https://github.com/onnx/onnx/issues/7472 - # - https://github.com/pytorch/pytorch/issues/167525 # NOTE: Darwin requires a static build, so this patch is unnecessary on that platform. prePatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - nixLog "patching $PWD/CMakeLists.txt to allow tests to build with shared libraries" - substituteInPlace "$PWD/CMakeLists.txt" \ - --replace-fail \ - 'message(FATAL_ERROR "Tests requires static build")' \ - "" - - nixLog "patching $PWD/CMakeLists.txt to correctly link onnx_cpp2py_export with shared libraries" - substituteInPlace "$PWD/CMakeLists.txt" \ - --replace-fail \ - 'target_link_libraries(onnx_cpp2py_export PRIVATE $)' \ - 'target_link_libraries(onnx_cpp2py_export PRIVATE $ $)' - nixLog "patching $PWD/CMakeLists.txt to fix symbol visibility" substituteInPlace "$PWD/CMakeLists.txt" \ --replace-fail \ - 'set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ - '# set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + 'set_target_properties(onnx_object PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + '# set_target_properties(onnx_object PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ --replace-fail \ - 'set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \ - '# set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \ - --replace-fail \ - 'set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ - '# set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ - --replace-fail \ - 'set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \ - '# set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' - - nixLog "patching $PWD/cmake/ONNXConfig.cmake.in to fix CMake discovery" - substituteInPlace "$PWD/cmake/ONNXConfig.cmake.in" \ - --replace-fail \ - 'if((NOT @@ONNX_USE_PROTOBUF_SHARED_LIBS@@) AND @@Build_Protobuf@@)' \ - 'if(NOT @ONNX_USE_PROTOBUF_SHARED_LIBS@)' + 'set_target_properties(onnx_object PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \ + '# set_target_properties(onnx_object PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' ''; # NOTE: python3Packages.protobuf does not propagate a dependency on protobuf's dev output, so we must bring it in @@ -112,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: { ONNX_ML = "0"; ONNX_NAMESPACE = "onnx"; ONNX_USE_PROTOBUF_SHARED_LIBS = "1"; + + nanobind_DIR = "${python3Packages.nanobind}/${python.sitePackages}/nanobind/cmake"; }; cmakeFlags = mapAttrsToList cmakeFeature finalAttrs.env; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index d6410b0b0c9e..bd9e9242239b 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -237,6 +237,10 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeBool "onnxruntime_USE_ROCM" rocmSupport) (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8")) ] + ++ lib.optionals (effectiveStdenv.cc.isClang || rocmSupport) [ + # Disable -Werror from COMPILE_WARNING_AS_ERROR target property + "--compile-no-warning-as-error" + ] ++ lib.optionals pythonSupport [ (lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true) ] @@ -249,8 +253,6 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") ] ++ lib.optionals rocmSupport [ - # Werror combines with rocprim header issues to cause errors (warp size const deprecation) - "--compile-no-warning-as-error" (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" ( builtins.concatStringsSep ";" rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets )) @@ -260,25 +262,21 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false) ]; - env = - lib.optionalAttrs effectiveStdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error"; - } - // lib.optionalAttrs rocmSupport { - MIOPEN_PATH = rocmPackages.miopen; - # HIP steps fail to find ROCm libs when not in HIPFLAGS, causing - # fatal error: 'rocrand/rocrand.h' file not found - HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [ - rocmPackages.hipblas - rocmPackages.hipcub - rocmPackages.hiprand - rocmPackages.hipsparse - rocmPackages.rocblas - rocmPackages.rocprim - rocmPackages.rocrand - rocmPackages.rocthrust - ]; - }; + env = lib.optionalAttrs rocmSupport { + MIOPEN_PATH = rocmPackages.miopen; + # HIP steps fail to find ROCm libs when not in HIPFLAGS, causing + # fatal error: 'rocrand/rocrand.h' file not found + HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [ + rocmPackages.hipblas + rocmPackages.hipcub + rocmPackages.hiprand + rocmPackages.hipsparse + rocmPackages.rocblas + rocmPackages.rocprim + rocmPackages.rocrand + rocmPackages.rocthrust + ]; + }; doCheck = !( diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix index e8014588aa33..fc68b05728ff 100644 --- a/pkgs/by-name/op/opam-publish/package.nix +++ b/pkgs/by-name/op/opam-publish/package.nix @@ -17,15 +17,15 @@ let ; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "opam-publish"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "ocaml-opam"; repo = "opam-publish"; - rev = version; - hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU="; + tag = finalAttrs.version; + hash = "sha256-yaFkR+MxkN6/skXx9euKVjTGXk9DraxDj+/2XQuHK4I="; }; buildInputs = [ @@ -38,14 +38,14 @@ buildDunePackage rec { github-unix ]; - meta = with lib; { + meta = { homepage = "https://github.com/ocaml-opam/opam-publish"; description = "Tool to ease contributions to opam repositories"; mainProgram = "opam-publish"; - license = with licenses; [ + license = with lib.licenses; [ lgpl21Only ocamlLgplLinkingException ]; - maintainers = with maintainers; [ niols ]; + maintainers = with lib.maintainers; [ niols ]; }; -} +}) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index de5f09711103..c863f751f5ea 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.40"; + version = "0.6.41"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-whQmHSnHWeAozNsWemZZXi3quqcY27PTO6/3lpxiy+c="; + hash = "sha256-/RpLiTz8WiI2fTJuLcksbB0pa5HOR13ci4G2LjdZu7Y="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-WL239S/XB+fZEOY2MQMMxbyJ5RoXfZJz94A8IOmyQ9c="; + npmDepsHash = "sha256-n31+P5QU0XsuyNvipUU2A9f7CE3jKQa8ZAfwFuS3SXg="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index b7a23b4a0a88..23b3f36f454d 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.27.1"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${version}"; - hash = "sha256-T8EC9wpkHVps7rNgwLx7VdIt1O7v021gUZHbVY6QT/Q="; + hash = "sha256-CxFadu6HaGw78GNAQegjC0ZVtpqaZtUOKLVWoMKkPl8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix index 31986058429a..200e80f5d9ca 100644 --- a/pkgs/by-name/op/opencbm/package.nix +++ b/pkgs/by-name/op/opencbm/package.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = "https://spiro.trikaliotis.net/opencbm"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index bbc6bcbdc89d..80085caa6e2b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -13,12 +13,12 @@ }: let pname = "opencode"; - version = "1.0.126"; + version = "1.0.138"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${version}"; - hash = "sha256-eW/+MoGh5V1t+4m+EDAm7dhTwJ+yqYmbLkZ9blYeXqQ="; + hash = "sha256-PdxkJXG+GYVpzChhUdgSUejrCg6yGY1R29BQfvByxYo="; }; node_modules = stdenvNoCC.mkDerivation { @@ -70,7 +70,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-/AP7wVUGO/LlYaQPglYIZ3/w0WKuO25PZNWEV7lKjGM="; + outputHash = "sha256-j3K0cSBQaOhjHQcfodxGV1FV35zhpELFE56TK/6uS5s="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 689f0e229072..428bad2816c1 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.11.1"; + version = "1.11.2"; in buildGoModule { @@ -17,7 +17,7 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-GI0ZII1PlZMTjgxoJJP45mHAUF4BAXGDqV3bNlFB5ec="; + hash = "sha256-L8rzLTMcE2tcXrYQdTlkuIrRzZ+gHBj/NYZaq9zpUik="; }; vendorHash = "sha256-pwEyPHQZ6XYa/HhopvY/hDFHIAbnC51d2IQBSpvMBY8="; diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix deleted file mode 100644 index 6795d1aa8563..000000000000 --- a/pkgs/by-name/op/openhmd/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - hidapi, - SDL2, - libGL, - glew, - withExamples ? true, -}: - -let - examplesOnOff = if withExamples then "ON" else "OFF"; -in - -stdenv.mkDerivation rec { - pname = "openhmd"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "OpenHMD"; - repo = "OpenHMD"; - rev = version; - sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg"; - }; - - # substitute for CMake 4 compat - # "OpenHMD is currently NOT ACTIVELY MAINTAINED" in upstream README - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - hidapi - ] - ++ lib.optionals withExamples [ - SDL2 - glew - libGL - ]; - - cmakeFlags = [ - "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON" - "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" - "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" - "-DOpenGL_GL_PREFERENCE=GLVND" - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - postInstall = lib.optionalString withExamples '' - mkdir -p $out/bin - install -D examples/simple/simple $out/bin/openhmd-example-simple - install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl - ''; - - meta = with lib; { - homepage = "http://www.openhmd.net"; # https does not work - description = "Library API and drivers immersive technology"; - longDescription = '' - OpenHMD is a very simple FLOSS C library and a set of drivers - for interfacing with Virtual Reality (VR) Headsets aka - Head-mounted Displays (HMDs), controllers and trackers like - Oculus Rift, HTC Vive, Windows Mixed Reality, and etc. - ''; - license = licenses.boost; - maintainers = with maintainers; [ oxij ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index a1878ede4a22..14d34a77043a 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-lwrQZsoO62H81MUG70s1axonibMQYufCTj0/HPEA0wQ="; + hash = "sha256-mLMZCnPco3UV6QkogTT/1GOgCvXuwtgpwFS7oT4Sghc="; }; proxyVendor = true; diff --git a/pkgs/by-name/op/opensmtpd/package.nix b/pkgs/by-name/op/opensmtpd/package.nix index 3304486a8919..f952a4b00361 100644 --- a/pkgs/by-name/op/opensmtpd/package.nix +++ b/pkgs/by-name/op/opensmtpd/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ obadz - ekleog vifino ]; }; diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index f2f33b9301ff..09e02154c2a8 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -15,13 +15,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-aCNXOEYA+6pKBrGLf/u6RkLw5YbKJHbVPltZko3aGgs="; + hash = "sha256-3Sl34tPRA2BF59bouPkuS/CiYcZfRivD+PozTT+srT0="; }; vendorHash = "sha256-rOSl5WE1/WcgCVpcAOXVl8cBSxjrlG7fxzpRO/5i5GA="; diff --git a/pkgs/by-name/op/openutau/deps.json b/pkgs/by-name/op/openutau/deps.json index 386647080e94..1db140be44f2 100644 --- a/pkgs/by-name/op/openutau/deps.json +++ b/pkgs/by-name/op/openutau/deps.json @@ -6,83 +6,93 @@ }, { "pname": "Avalonia", - "version": "11.0.4", - "hash": "sha256-YEqAwBRAhvhN5eT8GqOA8XsSwEF4ccwTMBWxBlIHLUo=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.0.2023020321", - "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks=" + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.0.4", - "hash": "sha256-Jp0j/58RF9Qooc7ATtq80FtX3TVLhi54JfgrbKdiDes=" + "version": "11.2.4", + "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.0.4", - "hash": "sha256-wlig5frBAO1DPH9GX0h8MZQq3U4F4K16EliC6N0NbII=" + "version": "11.2.4", + "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" }, { "pname": "Avalonia.Desktop", - "version": "11.0.4", - "hash": "sha256-fg7IV0dp7YIYOjBB/P5ky0u59k2hn2bBtCk0IjqmMoA=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.0.4", - "hash": "sha256-SkoODlaNJjTxrHaUUKJIY2QqJReYZ2L+Vvk7p7amvrc=" + "version": "11.2.4", + "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.0.4", - "hash": "sha256-2CjeOeLJxh3GO25wLchylzI1/uGJCHwjgKGcFZrRb+k=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" + }, + { + "pname": "Avalonia.Headless", + "version": "11.2.4", + "hash": "sha256-3XvLm+pu+s3gXJVyn8dl8teQX4ikNn+dvKXb18Owsn8=" + }, + { + "pname": "Avalonia.Headless.XUnit", + "version": "11.2.4", + "hash": "sha256-Oz4x6SRPgJx1oHVQAaPh+HE27oA4fNXc13zEE/UQSRM=" }, { "pname": "Avalonia.Native", - "version": "11.0.4", - "hash": "sha256-wHSJqh5rlhuvumnVkixdNS275M8kTZpP9p0srIfJ3oE=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.0.4", - "hash": "sha256-aywLGA/hN5UgHLRfdkOnyuEzWEJtSKA9bLhUuDZOQsM=" + "version": "11.2.4", + "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.0.4", - "hash": "sha256-13qXDjlWElmwQ0sb00+ny9gOgKuDOHKvALuQB6EZxCQ=" + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", - "version": "11.0.4", - "hash": "sha256-1XfPTcAaNj1926uYkvo7P62++ds5M2gHvkv1hRzBVfs=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.0.4", - "hash": "sha256-iuLlNuPjFvpITQY8DmLyGP+qfkOfiFs7q+SlamKP7Q8=" + "version": "11.2.4", + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.0.4", - "hash": "sha256-PXuQB/3EKiOQ3id+KNQpvm+oGgWNGuheYTIr7CJazOY=" + "version": "11.2.4", + "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" }, { "pname": "Avalonia.Win32", - "version": "11.0.4", - "hash": "sha256-ArhpMXygItqt1MZ8aW/2pV6Y0YoVzai73i+VD9edMh4=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.0.4", - "hash": "sha256-zWdkQyTW096IlPzqWEiG2ArkbiY67xs1Zo1zNhruBnc=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "BunLabs.NAudio.Flac", @@ -91,19 +101,29 @@ }, { "pname": "Concentus", - "version": "1.1.7", - "hash": "sha256-gAIsbANG/G38kG/TQRA5brlApapdC3+xrhSuzAkhv3g=" + "version": "2.2.1", + "hash": "sha256-5bHOXBUehjFiHfzRu4OjVGZith/325fYpK7xaTM/CZQ=" }, { "pname": "Concentus.Oggfile", - "version": "1.0.4", - "hash": "sha256-2ywfhtj+9o3mmWLuPLMOey54S2kGH2ofVi2kGB5bxYo=" + "version": "1.0.6", + "hash": "sha256-53sGUG/xm3EdMrwvpUAAom+/e4kEe4ShZhwYLYJAm9k=" }, { "pname": "coverlet.collector", "version": "6.0.2", "hash": "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo=" }, + { + "pname": "csharp-kana", + "version": "1.0.2", + "hash": "sha256-uMiG9GdxBhSB05qlnsXTIVGw0kVieKMmfCJ/MuhQ6Yw=" + }, + { + "pname": "csharp-pinyin", + "version": "1.0.0", + "hash": "sha256-URpLeUQHMr+5DQSkQ6CSrGx/O89CZjzdAOhDXhC8tBE=" + }, { "pname": "DotNet.Bundle", "version": "0.9.13", @@ -111,38 +131,43 @@ }, { "pname": "DynamicData", - "version": "7.9.5", - "hash": "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU=" + "version": "8.3.27", + "hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac=" + }, + { + "pname": "DynamicData", + "version": "8.4.1", + "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" }, { "pname": "Fody", - "version": "6.6.3", - "hash": "sha256-RtXZv0gPpWdZ0foabp6Td7KG7gLLS7Dhl/pjLCj5EAs=" + "version": "6.8.0", + "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg=" }, { "pname": "HarfBuzzSharp", - "version": "2.8.2.3", - "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2.3", - "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2.3", - "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2.3", - "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2.3", - "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "Ignore", @@ -156,8 +181,8 @@ }, { "pname": "Melanchall.DryWetMidi", - "version": "7.0.2", - "hash": "sha256-89uIWKqBRvuC0GOx1CnpVYmZl7BLyIlor5TvArna1gg=" + "version": "7.2.0", + "hash": "sha256-Fbm4okrXBvpdshBsWbAlW94fCNEbO/TBqFXWGqcex1U=" }, { "pname": "MicroCom.Runtime", @@ -169,45 +194,25 @@ "version": "5.0.0", "hash": "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "9.0.2", + "hash": "sha256-D+MR5Rzxn+aFPVJWF83pc0dTWnQes658xBM4bPZ6HPc=" + }, { "pname": "Microsoft.Bcl.HashCode", "version": "1.1.1", "hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=" }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.0.0", - "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "3.8.0", - "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "3.8.0", - "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "3.8.0", - "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA=" - }, - { - "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "3.8.0", - "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I=" - }, { "pname": "Microsoft.CodeCoverage", - "version": "17.9.0", - "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.3.0", - "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + "version": "17.11.1", + "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" }, { "pname": "Microsoft.Extensions.ObjectPool", @@ -216,29 +221,24 @@ }, { "pname": "Microsoft.ML.OnnxRuntime", - "version": "1.15.0", - "hash": "sha256-vGvv8ZhtRzd2Nclpg4SC/AmG2PVHED4L9b0/B+x1SvI=" + "version": "1.16.3", + "hash": "sha256-hNJH82UPoVwApFaKgPMEBQ4dpNylQLvm0XST2oNQJCo=" }, { "pname": "Microsoft.ML.OnnxRuntime.Managed", - "version": "1.15.0", - "hash": "sha256-KEPxS+STSiDn/gSdB4dtmKNQmJARY5J/+esFpEDXFho=" + "version": "1.16.3", + "hash": "sha256-BSTSolKosJjVX1ZQ+N2tLLvPXmJZRqgtOVlBd4b6r4g=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.9.0", - "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI=" + "version": "17.11.1", + "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", @@ -251,13 +251,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.9.0", - "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0=" + "version": "17.11.1", + "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.9.0", - "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU=" + "version": "17.11.1", + "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" }, { "pname": "Microsoft.Win32.Primitives", @@ -269,11 +269,6 @@ "version": "5.0.0", "hash": "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo=" }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" - }, { "pname": "NaCl.Net", "version": "0.1.13", @@ -346,13 +341,18 @@ }, { "pname": "ReactiveUI", - "version": "18.3.1", - "hash": "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M=" + "version": "19.5.41", + "hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk=" + }, + { + "pname": "ReactiveUI", + "version": "20.1.1", + "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" }, { "pname": "ReactiveUI.Fody", - "version": "18.3.1", - "hash": "sha256-/wcvCVCuhqBFzy6YR0MkztmHFx0h8oA2/koIpGkyuZs=" + "version": "19.5.41", + "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM=" }, { "pname": "runtime.any.System.Collections", @@ -561,28 +561,28 @@ }, { "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + "version": "4.1.0", + "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k=" }, { "pname": "Serilog.Sinks.Console", - "version": "5.0.1", - "hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" + "version": "6.0.0", + "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" }, { "pname": "Serilog.Sinks.Debug", - "version": "2.0.0", - "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" + "version": "3.0.0", + "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE=" }, { "pname": "Serilog.Sinks.File", - "version": "5.0.0", - "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" + "version": "6.0.0", + "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" }, { "pname": "SharpCompress", - "version": "0.36.0", - "hash": "sha256-8FIcC5b7A5gNqIwxBlolBuxilmSHCDpObpQ+MuGdkZg=" + "version": "0.38.0", + "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM=" }, { "pname": "SharpGen.Runtime", @@ -596,33 +596,38 @@ }, { "pname": "SkiaSharp", - "version": "2.88.3", - "hash": "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.3", - "hash": "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.3", - "hash": "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.3", - "hash": "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.3", - "hash": "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "Splat", - "version": "14.4.1", - "hash": "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8=" + "version": "14.8.12", + "hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU=" + }, + { + "pname": "Splat", + "version": "15.1.1", + "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" }, { "pname": "System.AppContext", @@ -634,6 +639,11 @@ "version": "4.5.1", "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, { "pname": "System.Collections", "version": "4.3.0", @@ -644,16 +654,6 @@ "version": "4.3.0", "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" - }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", @@ -676,8 +676,8 @@ }, { "pname": "System.Diagnostics.DiagnosticSource", - "version": "7.0.2", - "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" + "version": "8.0.1", + "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo=" }, { "pname": "System.Diagnostics.Tools", @@ -694,16 +694,6 @@ "version": "5.0.0", "hash": "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk=" }, - { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" - }, { "pname": "System.Formats.Asn1", "version": "5.0.0", @@ -751,13 +741,18 @@ }, { "pname": "System.IO.Packaging", - "version": "7.0.0", - "hash": "sha256-I8SG/IH1QjtAAWb5bSBIcFabATNRuwr1CSKyspSQz5k=" + "version": "9.0.2", + "hash": "sha256-633GG/fTf5MHhi5RrCiuD5q2JzWUUeuDashmYWIBrXo=" }, { "pname": "System.IO.Pipelines", - "version": "6.0.0", - "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.2", + "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" }, { "pname": "System.Linq", @@ -831,8 +826,13 @@ }, { "pname": "System.Reactive", - "version": "5.0.0", - "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + }, + { + "pname": "System.Reactive", + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { "pname": "System.Reflection", @@ -869,11 +869,6 @@ "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, - { - "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" - }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", @@ -909,11 +904,6 @@ "version": "4.7.0", "hash": "sha256-pORThFo85P8TrmfZCCPIXysVPcV2nW8hRlO6z4jVJps=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1034,11 +1024,6 @@ "version": "4.3.0", "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" - }, { "pname": "System.Text.Encoding.CodePages", "version": "4.7.0", @@ -1046,13 +1031,13 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "7.0.0", - "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + "version": "8.0.0", + "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" }, { "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" + "version": "9.0.2", + "hash": "sha256-BsCkg/4DXW+I5AoRACyOzeaPddX67xRKu9Is6ktToaI=" }, { "pname": "System.Text.Encoding.Extensions", @@ -1061,13 +1046,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + "version": "9.0.2", + "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8=" }, { "pname": "System.Text.Json", - "version": "8.0.4", - "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI=" + "version": "9.0.2", + "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" }, { "pname": "System.Text.RegularExpressions", @@ -1079,6 +1064,11 @@ "version": "4.3.0", "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, + { + "pname": "System.Threading.Channels", + "version": "8.0.0", + "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" + }, { "pname": "System.Threading.Tasks", "version": "4.3.0", @@ -1126,8 +1116,8 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.15.0", - "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU=" + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" }, { "pname": "UTF.Unknown", @@ -1156,8 +1146,13 @@ }, { "pname": "xunit", - "version": "2.7.1", - "hash": "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E=" + "version": "2.9.2", + "hash": "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo=" + }, + { + "pname": "xunit.abstractions", + "version": "2.0.2", + "hash": "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E=" }, { "pname": "xunit.abstractions", @@ -1166,33 +1161,48 @@ }, { "pname": "xunit.analyzers", - "version": "1.12.0", - "hash": "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo=" + "version": "1.16.0", + "hash": "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU=" }, { "pname": "xunit.assert", - "version": "2.7.1", - "hash": "sha256-RisnpE0ov99xyrxFywIctzzVnxwXb/HEp9E0dOAq4Ns=" + "version": "2.9.2", + "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4=" }, { "pname": "xunit.core", - "version": "2.7.1", - "hash": "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M=" + "version": "2.4.0", + "hash": "sha256-dt59aoFjpqlbcPFGwPrzOSEBSPIn33tLcLraK8xEntE=" + }, + { + "pname": "xunit.core", + "version": "2.9.2", + "hash": "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8=" }, { "pname": "xunit.extensibility.core", - "version": "2.7.1", - "hash": "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI=" + "version": "2.4.0", + "hash": "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE=" + }, + { + "pname": "xunit.extensibility.core", + "version": "2.9.2", + "hash": "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c=" }, { "pname": "xunit.extensibility.execution", - "version": "2.7.1", - "hash": "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk=" + "version": "2.4.0", + "hash": "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4=" + }, + { + "pname": "xunit.extensibility.execution", + "version": "2.9.2", + "hash": "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80=" }, { "pname": "xunit.runner.visualstudio", - "version": "2.5.8", - "hash": "sha256-71EXxeR3yiZTAWCVnjIx9o4Lme6MVY04KXch9qZETQU=" + "version": "2.8.2", + "hash": "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60=" }, { "pname": "YamlDotNet", @@ -1201,7 +1211,7 @@ }, { "pname": "ZstdSharp.Port", - "version": "0.7.4", - "hash": "sha256-z39r5ekafRbZAsKbOtAlL7ymW5SLosb0NUlStqvPBwE=" + "version": "0.8.1", + "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg=" } ] diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix index a060d6688c66..bfa05887b2aa 100644 --- a/pkgs/by-name/op/openutau/package.nix +++ b/pkgs/by-name/op/openutau/package.nix @@ -1,4 +1,5 @@ { + alsa-lib, lib, stdenv, buildDotnetModule, @@ -7,19 +8,20 @@ dbus, fontconfig, portaudio, + libXi, copyDesktopItems, makeDesktopItem, }: buildDotnetModule rec { pname = "OpenUtau"; - version = "0.1.529"; + version = "0.1.565"; src = fetchFromGitHub { owner = "stakira"; repo = "OpenUtau"; - rev = "build/${version}"; - hash = "sha256-HE0KxPKU7tYZbYiCL8sm6I/NZiX0MJktt+5d6qB1A2E="; + tag = version; + hash = "sha256-tjW1xmt409AlEmw/N1RG46oigP4mWAoTecQGV/hwMo4="; }; nativeBuildInputs = [ copyDesktopItems ]; @@ -33,7 +35,10 @@ buildDotnetModule rec { genericName = "Utau"; comment = "Open source UTAU successor"; exec = "OpenUtau"; - categories = [ "Music" ]; + categories = [ + "AudioVideo" + "Music" + ]; }) ]; @@ -52,6 +57,11 @@ buildDotnetModule rec { runtimeDeps = [ dbus portaudio + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + fontconfig + libXi ]; dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; @@ -59,17 +69,6 @@ buildDotnetModule rec { # socket cannot bind to localhost on darwin for tests doCheck = !stdenv.hostPlatform.isDarwin; - # net8.0 replacement needed until upstream bumps to dotnet 8 - postPatch = '' - substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \ - 'net6.0' \ - 'net8.0' - - substituteInPlace OpenUtau/Program.cs --replace \ - '/usr/bin/fc-match' \ - '${lib.getExe' fontconfig "fc-match"}' - ''; - # need to make sure proprietary worldline resampler is copied postInstall = let diff --git a/pkgs/by-name/op/openutau/update.sh b/pkgs/by-name/op/openutau/update.sh index b129cca96e06..aec2230a8763 100755 --- a/pkgs/by-name/op/openutau/update.sh +++ b/pkgs/by-name/op/openutau/update.sh @@ -40,4 +40,4 @@ if [ "$updated" -eq 0 ]; then exit 0 fi -(cd "$(dirname "$pkgpath")" && "$(nixbuildscript "$attr.fetch-deps")" "$(dirname "$pkgpath")/deps.nix") +(cd "$(dirname "$pkgpath")" && "$(nixbuildscript "$attr.fetch-deps")" "$(dirname "$pkgpath")/deps.json") diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix index 10560959b300..c4223f7a93d3 100644 --- a/pkgs/by-name/op/openvpn3/package.nix +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - asio, + asio_1_32_0, glib, jsoncpp, libcap_ng, @@ -81,7 +81,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - asio + # Depends on io_service + asio_1_32_0 glib jsoncpp libcap_ng @@ -101,7 +102,7 @@ stdenv.mkDerivation rec { (lib.mesonOption "bash-completion" "enabled") (lib.mesonOption "test_programs" "disabled") (lib.mesonOption "unit_tests" "disabled") - (lib.mesonOption "asio_path" "${asio}") + (lib.mesonOption "asio_path" "${asio_1_32_0}") (lib.mesonOption "dbus_policy_dir" "${placeholder "out"}/share/dbus-1/system.d") (lib.mesonOption "dbus_system_service_dir" "${placeholder "out"}/share/dbus-1/system-services") (lib.mesonOption "systemd_system_unit_dir" "${placeholder "out"}/lib/systemd/system") diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix index f313846b1bba..fe558b2531fc 100644 --- a/pkgs/by-name/op/opsdroid/package.nix +++ b/pkgs/by-name/op/opsdroid/package.nix @@ -68,9 +68,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://opsdroid.dev"; changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - globin - ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "opsdroid"; }; diff --git a/pkgs/by-name/op/optnix/package.nix b/pkgs/by-name/op/optnix/package.nix index 7a629c3dbb9e..7bb7cd1408a5 100644 --- a/pkgs/by-name/op/optnix/package.nix +++ b/pkgs/by-name/op/optnix/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromSourcehut, buildGoModule, installShellFiles, nix-update-script, @@ -10,8 +10,8 @@ buildGoModule (finalAttrs: { pname = "optnix"; version = "0.3.0"; - src = fetchFromGitHub { - owner = "water-sucks"; + src = fetchFromSourcehut { + owner = "~watersucks"; repo = "optnix"; tag = "v${finalAttrs.version}"; hash = "sha256-kPCRCnjuKZd6RE5pkQJMYWpexnMyhUy9jrBFSztkiLM="; diff --git a/pkgs/by-name/oq/oq/package.nix b/pkgs/by-name/oq/oq/package.nix index a44e86fd5d28..b54098bb3428 100644 --- a/pkgs/by-name/oq/oq/package.nix +++ b/pkgs/by-name/oq/oq/package.nix @@ -42,7 +42,6 @@ crystal.buildCrystalPackage rec { mainProgram = "oq"; homepage = "https://blacksmoke16.github.io/oq/"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 6553aedaff30..a9fb90161a85 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "orchard"; rev = version; - hash = "sha256-4kWpMN92DWwWE53e9oZ4++MH1LI9327YFNqCBm9ZXGQ="; + hash = "sha256-fjPaCgHf2cZ24DXc8pNxaD8wOQWs6KWuBE57a9YxdZw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-qjOWsvG3qldBkYso0M71ZeciiUQK7I9wA56zBt+kIRk="; + vendorHash = "sha256-vRvRWYbDpZ6WJlCJqZOCOprypymfrddv3UC1uDL3J48="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix index eaf697b913c9..0e5bb9ee5193 100644 --- a/pkgs/by-name/os/os-agent/package.nix +++ b/pkgs/by-name/os/os-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "os-agent"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "home-assistant"; repo = "os-agent"; tag = "${version}"; - hash = "sha256-fPIoAtZJHn3eQsdDbSwyQRam9LZHzGCK+Tw+O8gSKME="; + hash = "sha256-x0bVY476Gm5D1drRmyszdshrO0Vi/baDsG3ulysu0Kg="; }; vendorHash = "sha256-9boWe/mvJ/C/I8B7b4hJgz2dEDgpKCNTE/8pVAsNTxg="; diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 39d4926eef6e..9a7755a399f0 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ hrdinka ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix index 0900aa4a1250..62a0e16fc3fe 100644 --- a/pkgs/by-name/os/ospd-openvas/package.nix +++ b/pkgs/by-name/os/ospd-openvas/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.9.0"; + version = "22.9.1"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; tag = "v${version}"; - hash = "sha256-09AQQGi9uTlAsy5vEkVaz5T8j2zYnQ7GnzSh5N61VkA="; + hash = "sha256-4Lu9HVLxROEBDzkHgm4iH778QFwaLkM6qiOEq8OTcIU="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 5ce5be4cd8f4..f9728d698c9b 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.1029.1"; + version = "2025.1209.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip"; - hash = "sha256-Asqz0jiiHTtLcBzvibNzlaRe0jAop5YU4gmooZf/8gw="; + hash = "sha256-qzmW9STCoIoz2+UGkybvB9AE536r3VghMahPFT020to="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip"; - hash = "sha256-2ZAZ3CnYz/6VJxqpDNvx6jGcNV/9oo8Eb5/GkSidiv0="; + hash = "sha256-421KNsV4Nb3JSjJb0OMkdAEsb/YnI/st7Vio29WAtZs="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage"; - hash = "sha256-lx+RN20sPiG++pLS0gW6ixIYw3+g1KGCMrAhgW+yZIw="; + hash = "sha256-42Fx3CxLcW97cxRXXCqPJ8NzRBnpi62IjxGLnSRkO4g="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 712ff49146d1..6c34baef122c 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -626,8 +626,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.1028.0", - "hash": "sha256-np5O4DOajO/UB2ihWUYYo81q+he4HWG1AAtn/P5rFgw=" + "version": "2025.1209.0", + "hash": "sha256-Eb0v6kdXelZnuZ+aW7lGz/lUKiL88kaX/M2/UYhJnYo=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -636,13 +636,13 @@ }, { "pname": "ppy.osu.Framework.SourceGeneration", - "version": "2024.1128.0", - "hash": "sha256-7ovye7QXFeFr68IxmwIAWA9Fgm686NTYVTUXGQWtKPM=" + "version": "2025.1121.1", + "hash": "sha256-B4uPnJYYtQiuqAEDRbCtW4jJboPE0sRVSfle8eZGYn4=" }, { "pname": "ppy.osu.Game.Resources", - "version": "2025.1006.0", - "hash": "sha256-ZHwi8l8JVu+wTEtAkgoLSFmt8z8vVJIIsTR29gRbrCA=" + "version": "2025.1125.0", + "hash": "sha256-jJHpti142HgEBFhTDl5iThM05mQypVEF0J7JIVskVQ0=" }, { "pname": "ppy.osuTK.NS20", @@ -656,8 +656,8 @@ }, { "pname": "ppy.SDL3-CS", - "version": "2025.920.0", - "hash": "sha256-gNy0f95tR3hXkagzLH/mngGSsDA7UqIMKYyTf00nsCI=" + "version": "2025.1205.0", + "hash": "sha256-Mu5kn/yC7afo3+Nz755UzspUmOOEKtZ6/N4ENCzshtM=" }, { "pname": "ppy.Veldrid", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 523924e1cd2a..41f6e053df4d 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -22,13 +22,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.1029.1"; + version = "2025.1209.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = "${version}-lazer"; - hash = "sha256-zIeeZVyI//uTZDH3i7FyuKRDDRcVRaT/43/4F5/Lamw="; + hash = "sha256-uxC+3M2KMnG292Ab1Sa/QnkxQXNogSqE7Tij/moDzkE="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/ov/overcommit/package.nix b/pkgs/by-name/ov/overcommit/package.nix index 8100ba20db42..3e9b9915bb16 100644 --- a/pkgs/by-name/ov/overcommit/package.nix +++ b/pkgs/by-name/ov/overcommit/package.nix @@ -34,7 +34,6 @@ bundlerApp { license = licenses.mit; mainProgram = "overcommit"; maintainers = with maintainers; [ - Br1ght0ne anthonyroussel ]; platforms = platforms.unix; diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 242170ef674d..696d58b7ad2b 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2025-12-01"; + version = "0.2-unstable-2025-12-08"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "92403520c3ad8ea1a57d734772e2c4c22589eca3"; + rev = "b35dafd51853b40f6b403cc5c460bed8dd2c8027"; fetchSubmodules = true; - hash = "sha256-cVkHaXBeTgfHKLCIB3sTEIqu2kvYmo3gi42tRn2DcaA="; + hash = "sha256-qYSn47I6slnJ6brXGc5KcbR2rlSwuTyqdPyNKs1uTsQ="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 4a3ff525461b..b8a682040b5f 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -5,7 +5,7 @@ }: rustPlatform.buildRustPackage rec { - version = "9.1.5"; + version = "10.0.0"; pname = "oxipng"; # do not use fetchCrate (only repository includes tests) @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { owner = "shssoichiro"; repo = "oxipng"; tag = "v${version}"; - hash = "sha256-UjiGQSLiUMuYm62wF7Xwhp2MRzCaQ9pbBBkvHnuspVw="; + hash = "sha256-c8NNTO+6GuFb5BBPpdyDSHbtmojq+9ceOic54Zq3nwE="; }; - cargoHash = "sha256-sdhyxJDUlb6+SJ/kvfqsplHOeCEbA3ls66eur3eeVVA="; + cargoHash = "sha256-YStZ2j2gjC5uVUnHaQIk6xtSbnPm0IoNONRr/nFOOUg="; # don't require qemu for aarch64-linux tests # error: linker `aarch64-linux-gnu-gcc` not found diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 4fdff16bd581..47dabbea41c3 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -28,13 +28,13 @@ xorg, }: let - version = "2.19.6"; + version = "2.20.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-nHLsA5hmAFkOAEQU/xD+hllwtc2SyBtns5auCNm9KNg="; + hash = "sha256-uf6/cl41lp2zEp3+gTbTYQlJcM3bdLTtOo+vEUrGIco="; }; python = python3.override { @@ -80,7 +80,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-lxZOwt+/ReU7m7he0iJSt5HqaPkRksveCgvDG7uodjA="; + hash = "sha256-JqFkA8t5D0SmhlKwhiKIztzWGXf+vO0Ro1ABVGXVzS8="; }; nativeBuildInputs = [ @@ -167,12 +167,13 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "celery" "django-allauth" - "django-cors-headers" - "drf-spectacular-sidecar" - "filelock" - "ocrmypdf" + "python-dotenv" + "gotenberg-client" "redis" + # requested by maintainer + "ocrmypdf" ]; dependencies = @@ -185,18 +186,7 @@ python.pkgs.buildPythonApplication rec { concurrent-log-handler dateparser django - # django-allauth version 65.9.X not yet supported - # See https://github.com/paperless-ngx/paperless-ngx/issues/10336 - (django-allauth.overrideAttrs ( - new: prev: rec { - version = "65.7.0"; - src = prev.src.override { - tag = version; - hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w="; - }; - patches = [ ]; - } - )) + django-allauth django-auditlog django-cachalot django-celery-results diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix similarity index 96% rename from pkgs/data/icons/papirus-maia-icon-theme/default.nix rename to pkgs/by-name/pa/papirus-maia-icon-theme/package.nix index 3d68f98572f5..09d47a182a21 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix @@ -4,10 +4,10 @@ fetchFromGitHub, cmake, gtk3, - breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme, + libsForQt5, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme papirus-icon-theme hicolor-icon-theme diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index f5bb6aefcede..d3ccb069dcd9 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "par-lang"; - version = "0-unstable-2025-12-02"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "faiface"; repo = "par-lang"; - rev = "aa01ca58034b91f64b3ad5c849bb0e97762221af"; - hash = "sha256-W68fareSkbnHnFy0IFIShOebC0cCcWqRWoaez3drsYI="; + rev = "9056718048a5c8d1ff32c60f9fc5db5af36a0259"; + hash = "sha256-uerYlhUqwpt3BbYiN6+CubhZAcMRXTFKqKSqyqh5WYY="; }; cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo="; diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index 96875107cf5c..47d382df5070 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "parca-agent"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-RSVeb40KQA/F8tj329Vis4pSVsJL9PlA69iA+RJwdt8="; + hash = "sha256-CMX6Cl46pHRdVOv/EmMfqN5sdLmRUbU3gR6iwqkx1bg="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-98Ndx9eIVIJA9Zox/9fQ80MZwVjuAtInRWbFncQRz/4="; + vendorHash = "sha256-VvO2sDgr+MlKcHDQzcZPpxyIBO/NrkdfF8ntA/SCb2Y="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pa/parca-debuginfo/package.nix b/pkgs/by-name/pa/parca-debuginfo/package.nix index ca69726aae46..5ad9563bffbb 100644 --- a/pkgs/by-name/pa/parca-debuginfo/package.nix +++ b/pkgs/by-name/pa/parca-debuginfo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "parca-debuginfo"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-debuginfo"; tag = "v${version}"; - hash = "sha256-tJ3Xc5b9XnTL460u11RkCmbIc41vHKql/oZ7enTaPgQ="; + hash = "sha256-aFG4lMwiVZuuNq1+Q4Jz1+OywSy0oIF+VO7ZjDGQvi4="; }; vendorHash = "sha256-bH7Y1y9BDMQJGtYfEaSrq+sWVLnovvV/uGbutJUXV2w="; diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index e2cb1d62730f..cc62c5066068 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -11,21 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "parseable"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "parseablehq"; repo = "parseable"; tag = "v${version}"; - hash = "sha256-0PyXrwFh2YroxeAPL2GCZiOUfzFLThN0ZnL0a7BDnfw="; + hash = "sha256-+KTSpkrMlIu24YvHvLOLHZiqRZua3D7/kprFqtRuNOQ="; }; LOCAL_ASSETS_PATH = fetchzip { url = "https://parseable-prism-build.s3.us-east-2.amazonaws.com/v${version}/build.zip"; - hash = "sha256-7uJvWAGDexzWhnm1ofPHzoRD8Q70fQ+eyUPpQHcWv4o="; + hash = "sha256-tSH9gyB9T2ywut+joLIp55Us2ALKvgsyiG/gBQgYLfI="; }; - cargoHash = "sha256-VAdivS7zxoFrjeTnRGbUqtEgCj73iF29ZiCUfzdP1Yo="; + cargoHash = "sha256-3hMGiQmXxar4n4cGPrj4UUznNi8V5YokH+29UGmz34Y="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix index b62666463f8d..2da668d73ac7 100644 --- a/pkgs/by-name/pa/pastel/package.nix +++ b/pkgs/by-name/pa/pastel/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "pastel"; rev = "v${version}"; - sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; + sha256 = "sha256-ISzZZNh9X91vBbVOpYXnYpO3ztGgIhMJTZmoY2T0FRw="; }; - cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; + cargoHash = "sha256-r0QiooMrTqFaXq2Y9wVW45zjtHT7qQ6XTWPRhlLpVQ8="; meta = { description = "Command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/pkgs/by-name/pa/pavucontrol/package.nix b/pkgs/by-name/pa/pavucontrol/package.nix index cc388685d8ee..d2daf3b76af5 100644 --- a/pkgs/by-name/pa/pavucontrol/package.nix +++ b/pkgs/by-name/pa/pavucontrol/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; - version = "6.1"; + version = "6.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pulseaudio"; repo = "pavucontrol"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-cru4I+LljYKIpIr7gSolnuLuUIXgc8l+JUmPrme4+YA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-If76Qt2BFgGMYt2PSzDQWmNPsbzneZ6zW9yYnS3lo84="; }; buildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "--prefix=${placeholder "out"}" - (lib.mesonBool "lynx" false) + (lib.mesonEnable "lynx" false) ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/pc/pc-ble-driver/package.nix b/pkgs/by-name/pc/pc-ble-driver/package.nix index 24b6ae8b58ae..cfa299a04036 100644 --- a/pkgs/by-name/pc/pc-ble-driver/package.nix +++ b/pkgs/by-name/pc/pc-ble-driver/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, cmake, git, - asio, + asio_1_32_0, catch2, spdlog, udev, @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { git ]; buildInputs = [ - asio + # Depends on io_service + asio_1_32_0 catch2 spdlog ]; diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index daddd2f377eb..fec0b683025d 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -160,7 +160,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { mainProgram = "pcsx2-qt"; maintainers = with lib.maintainers; [ _0david0mp - hrdinka govanify matteopacini ]; diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index db82e1efbf15..1ef086381c0a 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; tag = finalAttrs.version; - hash = "sha256-W3HTgdLHzETfmp/DZ5s9pWXQeBaic4/O55ckGzDDtxs="; + hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y="; }; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { disabledTests = [ # Tests failing due to TileDB library implementation, disabled also # by upstream CI. - # See: https://github.com/PDAL/PDAL/blob/2.9.2/.github/workflows/linux.yml#L81 + # See: https://github.com/PDAL/PDAL/blob/2.9.3/.github/workflows/linux.yml#L81 "pdal_io_tiledb_writer_test" "pdal_io_tiledb_reader_test" "pdal_io_tiledb_time_writer_test" diff --git a/pkgs/by-name/pd/pdf2djvu/package.nix b/pkgs/by-name/pd/pdf2djvu/package.nix deleted file mode 100644 index 2d617b6664f6..000000000000 --- a/pkgs/by-name/pd/pdf2djvu/package.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - autoreconfHook, - gettext, - libtool, - pkg-config, - djvulibre, - exiv2, - fontconfig, - graphicsmagick, - libjpeg, - libuuid, - poppler, -}: - -stdenv.mkDerivation rec { - version = "0.9.19"; - pname = "pdf2djvu"; - - src = fetchFromGitHub { - owner = "jwilk"; - repo = "pdf2djvu"; - rev = version; - sha256 = "sha256-j4mYdmLZ56qTA1KbWBjBvyTyLaeuIITKYsALRIO7lj0="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - djvulibre - exiv2 - fontconfig - graphicsmagick - libjpeg - libuuid - poppler - ]; - - postPatch = '' - substituteInPlace private/autogen \ - --replace /usr/share/gettext ${gettext}/share/gettext \ - --replace /usr/share/libtool ${libtool}/share/libtool - - substituteInPlace configure.ac \ - --replace '$djvulibre_bin_path' ${djvulibre.bin}/bin - ''; - - preAutoreconf = '' - private/autogen - ''; - - enableParallelBuilding = true; - - # Required by Poppler - CXXFLAGS = "-std=c++20"; - - meta = with lib; { - description = "Creates djvu files from PDF files"; - homepage = "https://jwilk.net/software/pdf2djvu"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ pSub ]; - mainProgram = "pdf2djvu"; - }; -} diff --git a/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch b/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch deleted file mode 100644 index b9b1372e56bd..000000000000 --- a/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 298cdca..8894db3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -55,7 +55,15 @@ endif() - qt_standard_project_setup() - - find_package(OpenSSL REQUIRED) --find_package(lcms2 REQUIRED) -+SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static) -+FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} ) -+FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h) -+add_library(lcms2::lcms2 UNKNOWN IMPORTED) -+set_target_properties(lcms2::lcms2 PROPERTIES -+ IMPORTED_LOCATION ${LCMS2_LIBRARY} -+ INTERFACE_INCLUDE_DIRECTORIES ${LCMS2_INCLUDE_DIR} -+ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1") -+set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP lcms2::lcms2) - find_package(ZLIB REQUIRED) - find_package(Freetype REQUIRED) - find_package(OpenJPEG CONFIG REQUIRED) diff --git a/pkgs/by-name/pd/pdf4qt/migrated_to_blend2d_0.21.x.patch b/pkgs/by-name/pd/pdf4qt/migrated_to_blend2d_0.21.x.patch new file mode 100644 index 000000000000..19797e808ce0 --- /dev/null +++ b/pkgs/by-name/pd/pdf4qt/migrated_to_blend2d_0.21.x.patch @@ -0,0 +1,445 @@ +diff --git a/Pdf4QtLibCore/sources/pdfblpainter.cpp b/Pdf4QtLibCore/sources/pdfblpainter.cpp +index 6ccedc625239bfeccf938d1ff78f71abd4c8c914..59a90a7e165c7ba161d23043b7d834c945a37242 100644 +--- a/Pdf4QtLibCore/sources/pdfblpainter.cpp ++++ b/Pdf4QtLibCore/sources/pdfblpainter.cpp +@@ -222,19 +222,19 @@ bool PDFBLPaintEngine::begin(QPaintDevice*) + if (m_isMultithreaded) + { + info.flags = BL_CONTEXT_CREATE_FLAG_FALLBACK_TO_SYNC; +- info.threadCount = QThread::idealThreadCount(); ++ info.thread_count = QThread::idealThreadCount(); + } + +- m_blContext->setHint(BL_CONTEXT_HINT_RENDERING_QUALITY, BL_RENDERING_QUALITY_MAX_VALUE); ++ m_blContext->set_hint(BL_CONTEXT_HINT_RENDERING_QUALITY, BL_RENDERING_QUALITY_MAX_VALUE); + +- m_blOffscreenBuffer->createFromData(m_qtOffscreenBuffer.width(), m_qtOffscreenBuffer.height(), BL_FORMAT_PRGB32, m_qtOffscreenBuffer.bits(), m_qtOffscreenBuffer.bytesPerLine()); ++ m_blOffscreenBuffer->create_from_data(m_qtOffscreenBuffer.width(), m_qtOffscreenBuffer.height(), BL_FORMAT_PRGB32, m_qtOffscreenBuffer.bits(), m_qtOffscreenBuffer.bytesPerLine()); + if (m_blContext->begin(m_blOffscreenBuffer.value(), info) == BL_SUCCESS) + { +- m_blContext->clearAll(); ++ m_blContext->clear_all(); + + qreal devicePixelRatio = m_qtOffscreenBuffer.devicePixelRatioF(); + m_blContext->scale(devicePixelRatio); +- m_blContext->userToMeta(); ++ m_blContext->user_to_meta(); + + setBLPen(m_blContext.value(), m_currentPen); + setBLBrush(m_blContext.value(), m_currentBrush); +@@ -296,18 +296,18 @@ void PDFBLPaintEngine::updateState(const QPaintEngineState& updatedState) + + if (updatedState.state().testFlag(QPaintEngine::DirtyCompositionMode)) + { +- m_blContext->setCompOp(getBLCompOp(updatedState.compositionMode())); ++ m_blContext->set_comp_op(getBLCompOp(updatedState.compositionMode())); + } + + if (updatedState.state().testFlag(QPaintEngine::DirtyOpacity)) + { +- m_blContext->setGlobalAlpha(updatedState.opacity()); ++ m_blContext->set_global_alpha(updatedState.opacity()); + } + + if (updatedState.state().testFlag(QPaintEngine::DirtyTransform)) + { + m_currentTransform = updatedState.transform(); +- m_blContext->setTransform(getBLMatrix(updatedState.transform())); ++ m_blContext->set_transform(getBLMatrix(updatedState.transform())); + } + + if (updatedState.state().testFlag(QPaintEngine::DirtyFont)) +@@ -381,12 +381,12 @@ void PDFBLPaintEngine::drawRects(const QRect* rects, int rectCount) + + if (isFillActive()) + { +- m_blContext->fillRectArray(blRects.view()); ++ m_blContext->fill_rect_array(blRects.view()); + } + + if (isStrokeActive()) + { +- m_blContext->strokeRectArray(blRects.view()); ++ m_blContext->stroke_rect_array(blRects.view()); + } + } + +@@ -427,12 +427,12 @@ void PDFBLPaintEngine::drawRects(const QRectF* rects, int rectCount) + + if (isFillActive()) + { +- m_blContext->fillRectArray(blRects.view()); ++ m_blContext->fill_rect_array(blRects.view()); + } + + if (isStrokeActive()) + { +- m_blContext->strokeRectArray(blRects.view()); ++ m_blContext->stroke_rect_array(blRects.view()); + } + } + +@@ -482,7 +482,7 @@ void PDFBLPaintEngine::drawLines(const QLine* lines, int lineCount) + } + } + +- m_blContext->strokeLine(line.x1(), line.y1(), line.x2(), line.y2()); ++ m_blContext->stroke_line(line.x1(), line.y1(), line.x2(), line.y2()); + } + } + +@@ -531,7 +531,7 @@ void PDFBLPaintEngine::drawLines(const QLineF* lines, int lineCount) + } + } + +- m_blContext->strokeLine(line.x1(), line.y1(), line.x2(), line.y2()); ++ m_blContext->stroke_line(line.x1(), line.y1(), line.x2(), line.y2()); + } + } + +@@ -585,8 +585,8 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke, + if (!fillPath.isEmpty()) + { + m_blContext->save(); +- m_blContext->resetTransform(); +- m_blContext->fillPath(getBLPath(fillPath)); ++ m_blContext->reset_transform(); ++ m_blContext->fill_path(getBLPath(fillPath)); + m_blContext->restore(); + } + } +@@ -601,9 +601,9 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke, + if (!finalTransformedStrokedPath.isEmpty()) + { + m_blContext->save(); +- m_blContext->resetTransform(); ++ m_blContext->reset_transform(); + setBLBrush(m_blContext.value(), m_currentPen.brush()); +- m_blContext->fillPath(getBLPath(finalTransformedStrokedPath)); ++ m_blContext->fill_path(getBLPath(finalTransformedStrokedPath)); + m_blContext->restore(); + } + } +@@ -616,19 +616,19 @@ void PDFBLPaintEngine::drawPathImpl(const QPainterPath& path, bool enableStroke, + + if ((isFillActive() && enableFill) || forceFill) + { +- m_blContext->fillPath(blPath); ++ m_blContext->fill_path(blPath); + } + + if (isStrokeActive() && enableStroke) + { +- m_blContext->strokePath(blPath); ++ m_blContext->stroke_path(blPath); + } + } + + void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount) + { + m_blContext->save(); +- m_blContext->setFillStyle(BLRgba32(m_currentPen.color().rgba())); ++ m_blContext->set_fill_style(BLRgba32(m_currentPen.color().rgba())); + + for (int i = 0; i < pointCount; ++i) + { +@@ -640,7 +640,7 @@ void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount) + } + + BLEllipse blEllipse(c.x(), c.y(), m_currentPen.widthF() * 0.5, m_currentPen.widthF() * 0.5); +- m_blContext->fillEllipse(blEllipse); ++ m_blContext->fill_ellipse(blEllipse); + } + + m_blContext->restore(); +@@ -649,7 +649,7 @@ void PDFBLPaintEngine::drawPoints(const QPointF* points, int pointCount) + void PDFBLPaintEngine::drawPoints(const QPoint* points, int pointCount) + { + m_blContext->save(); +- m_blContext->setFillStyle(BLRgba32(m_currentPen.color().rgba())); ++ m_blContext->set_fill_style(BLRgba32(m_currentPen.color().rgba())); + + for (int i = 0; i < pointCount; ++i) + { +@@ -661,7 +661,7 @@ void PDFBLPaintEngine::drawPoints(const QPoint* points, int pointCount) + } + + BLEllipse blEllipse(c.x(), c.y(), m_currentPen.widthF() * 0.5, m_currentPen.widthF() * 0.5); +- m_blContext->fillEllipse(blEllipse); ++ m_blContext->fill_ellipse(blEllipse); + } + + m_blContext->restore(); +@@ -716,10 +716,10 @@ void PDFBLPaintEngine::drawTiledPixmap(const QRectF& r, const QPixmap& pixmap, c + int tilesY = qCeil(r.height() / pixmap.height()); + + BLImage blImage; +- blImage.createFromData(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine()); ++ blImage.create_from_data(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine()); + + BLImage blDrawImage; +- blDrawImage.assignDeep(blImage); ++ blDrawImage.assign_deep(blImage); + + for (int x = 0; x < tilesX; ++x) + { +@@ -730,7 +730,7 @@ void PDFBLPaintEngine::drawTiledPixmap(const QRectF& r, const QPixmap& pixmap, c + + if (tilePos.x() < r.right() && tilePos.y() < r.bottom()) + { +- m_blContext->blitImage(getBLPoint(tilePos), blDrawImage); ++ m_blContext->blit_image(getBLPoint(tilePos), blDrawImage); + } + } + } +@@ -776,12 +776,12 @@ void PDFBLPaintEngine::drawImage(const QRectF& r, const QImage& pm, const QRectF + } + + BLImage blImage; +- blImage.createFromData(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine()); ++ blImage.create_from_data(image.width(), image.height(), BL_FORMAT_PRGB32, image.bits(), image.bytesPerLine()); + + BLImage blDrawImage; +- blDrawImage.assignDeep(blImage); ++ blDrawImage.assign_deep(blImage); + +- m_blContext->blitImage(BLRect(r.x(), r.y(), r.width(), r.height()), ++ m_blContext->blit_image(BLRect(r.x(), r.y(), r.width(), r.height()), + blDrawImage, + BLRectI(sr.x(), sr.y(), sr.width(), sr.height())); + } +@@ -838,11 +838,11 @@ BLPath PDFBLPaintEngine::getBLPath(const QPainterPath& path) + switch (element.type) + { + case QPainterPath::MoveToElement: +- blPath.moveTo(element.x, element.y); ++ blPath.move_to(element.x, element.y); + break; + + case QPainterPath::LineToElement: +- blPath.lineTo(element.x, element.y); ++ blPath.line_to(element.x, element.y); + break; + + case QPainterPath::CurveToElement: +@@ -851,7 +851,7 @@ BLPath PDFBLPaintEngine::getBLPath(const QPainterPath& path) + const QPainterPath::Element& ctrlPoint1 = path.elementAt(i++); + const QPainterPath::Element& ctrlPoint2 = path.elementAt(i++); + const QPainterPath::Element& endPoint = path.elementAt(i); +- blPath.cubicTo(ctrlPoint1.x, ctrlPoint1.y, ctrlPoint2.x, ctrlPoint2.y, endPoint.x, endPoint.y); ++ blPath.cubic_to(ctrlPoint1.x, ctrlPoint1.y, ctrlPoint2.x, ctrlPoint2.y, endPoint.x, endPoint.y); + } + break; + +@@ -875,20 +875,20 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen) + const QList customDashPattern = pen.dashPattern(); + const Qt::PenStyle penStyle = pen.style(); + +- context.setStrokeAlpha(pen.color().alphaF()); +- context.setStrokeWidth(width); +- context.setStrokeMiterLimit(miterLimit); ++ context.set_stroke_alpha(pen.color().alphaF()); ++ context.set_stroke_width(width); ++ context.set_stroke_miter_limit(miterLimit); + + switch (capStyle) + { + case Qt::FlatCap: +- context.setStrokeCaps(BL_STROKE_CAP_BUTT); ++ context.set_stroke_caps(BL_STROKE_CAP_BUTT); + break; + case Qt::SquareCap: +- context.setStrokeCaps(BL_STROKE_CAP_SQUARE); ++ context.set_stroke_caps(BL_STROKE_CAP_SQUARE); + break; + case Qt::RoundCap: +- context.setStrokeCaps(BL_STROKE_CAP_ROUND); ++ context.set_stroke_caps(BL_STROKE_CAP_ROUND); + break; + } + +@@ -899,69 +899,69 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen) + dashArray.append(value); + } + +- context.setStrokeDashOffset(dashOffset); +- context.setStrokeDashArray(dashArray); ++ context.set_stroke_dash_offset(dashOffset); ++ context.set_stroke_dash_array(dashArray); + + switch (joinStyle) + { + case Qt::MiterJoin: +- context.setStrokeJoin(BL_STROKE_JOIN_MITER_CLIP); ++ context.set_stroke_join(BL_STROKE_JOIN_MITER_CLIP); + break; + case Qt::BevelJoin: +- context.setStrokeJoin(BL_STROKE_JOIN_BEVEL); ++ context.set_stroke_join(BL_STROKE_JOIN_BEVEL); + break; + case Qt::RoundJoin: +- context.setStrokeJoin(BL_STROKE_JOIN_ROUND); ++ context.set_stroke_join(BL_STROKE_JOIN_ROUND); + break; + case Qt::SvgMiterJoin: +- context.setStrokeJoin(BL_STROKE_JOIN_MITER_CLIP); ++ context.set_stroke_join(BL_STROKE_JOIN_MITER_CLIP); + break; + } + +- context.setStrokeStyle(BLRgba32(color.rgba())); ++ context.set_stroke_style(BLRgba32(color.rgba())); + +- BLStrokeOptions strokeOptions = context.strokeOptions(); ++ BLStrokeOptions strokeOptions = context.stroke_options(); + + switch (penStyle) + { + case Qt::SolidLine: +- strokeOptions.dashArray.clear(); +- strokeOptions.dashOffset = 0.0; ++ strokeOptions.dash_array.clear(); ++ strokeOptions.dash_offset = 0.0; + break; + + case Qt::DashLine: + { + constexpr double dashPattern[] = {4, 4}; +- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern)); ++ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern)); + break; + } + + case Qt::DotLine: + { + constexpr double dashPattern[] = {1, 3}; +- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern)); ++ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern)); + break; + } + + case Qt::DashDotLine: + { + constexpr double dashPattern[] = {4, 2, 1, 2}; +- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern)); ++ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern)); + break; + } + + case Qt::DashDotDotLine: + { + constexpr double dashPattern[] = {4, 2, 1, 2, 1, 2}; +- strokeOptions.dashArray.assignData(dashPattern, std::size(dashPattern)); ++ strokeOptions.dash_array.assign_data(dashPattern, std::size(dashPattern)); + break; + } + + case Qt::CustomDashLine: + { + auto dashPattern = pen.dashPattern(); +- strokeOptions.dashArray.assignData(dashPattern.data(), dashPattern.size()); +- strokeOptions.dashOffset = pen.dashOffset(); ++ strokeOptions.dash_array.assign_data(dashPattern.data(), dashPattern.size()); ++ strokeOptions.dash_offset = pen.dashOffset(); + break; + } + +@@ -969,7 +969,7 @@ void PDFBLPaintEngine::setBLPen(BLContext& context, const QPen& pen) + break; + } + +- context.setStrokeOptions(strokeOptions); ++ context.set_stroke_options(strokeOptions); + } + + void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush) +@@ -981,7 +981,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush) + { + stops.append(BLGradientStop(stop.first, BLRgba32(stop.second.red(), stop.second.green(), stop.second.blue(), stop.second.alpha()))); + } +- blGradient.assignStops(stops.constData(), stops.size()); ++ blGradient.assign_stops(stops.constData(), stops.size()); + }; + + switch (brush.style()) +@@ -991,7 +991,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush) + { + QColor color = brush.color(); + BLRgba32 blColor = BLRgba32(color.red(), color.green(), color.blue(), color.alpha()); +- context.setFillStyle(blColor); ++ context.set_fill_style(blColor); + break; + } + case Qt::LinearGradientPattern: +@@ -1007,7 +1007,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush) + blLinearGradient.y1 = linearGradient->finalStop().y(); + BLGradient blGradient(blLinearGradient); + setGradientStops(blGradient, *gradient); +- context.setFillStyle(blGradient); ++ context.set_fill_style(blGradient); + } + break; + } +@@ -1025,7 +1025,7 @@ void PDFBLPaintEngine::setBLBrush(BLContext& context, const QBrush& brush) + blRadialGradientValues.r0 = radialGradient->radius(); + BLGradient blGradient(blRadialGradientValues); + setGradientStops(blGradient, *gradient); +- context.setFillStyle(blGradient); ++ context.set_fill_style(blGradient); + } + break; + } +@@ -1037,12 +1037,12 @@ bool PDFBLPaintEngine::loadBLFont(BLFont& font, QString fontName, PDFReal fontSi + QByteArray data = PDFSystemFont::getFontData(fontName.toLatin1()); + + BLFontData blFontData; +- if (blFontData.createFromData(data.data(), data.size()) == BL_SUCCESS) ++ if (blFontData.create_from_data(data.data(), data.size()) == BL_SUCCESS) + { + BLFontFace fontFace; +- if (fontFace.createFromData(blFontData, 0) == BL_SUCCESS) ++ if (fontFace.create_from_data(blFontData, 0) == BL_SUCCESS) + { +- if (font.createFromFace(fontFace, fontSize) == BL_SUCCESS) ++ if (font.create_from_face(fontFace, fontSize) == BL_SUCCESS) + { + return true; + } +@@ -1154,7 +1154,7 @@ void PDFBLPaintEngine::updateClipping(std::optional clipRegion, + m_finalClipPath.reset(); + m_finalClipPathBoundingBox = QRectF(); + m_clipSingleRect = false; +- m_blContext->restoreClipping(); ++ m_blContext->restore_clipping(); + return; + + case Qt::ReplaceClip: +@@ -1188,14 +1188,14 @@ void PDFBLPaintEngine::updateClipping(std::optional clipRegion, + + if (m_clipSingleRect) + { +- BLMatrix2D matrix = m_blContext->userTransform(); +- m_blContext->resetTransform(); +- m_blContext->clipToRect(getBLRect(m_finalClipPath->boundingRect())); +- m_blContext->setTransform(matrix); ++ BLMatrix2D matrix = m_blContext->user_transform(); ++ m_blContext->reset_transform(); ++ m_blContext->clip_to_rect(getBLRect(m_finalClipPath->boundingRect())); ++ m_blContext->set_transform(matrix); + } + else + { +- m_blContext->restoreClipping(); ++ m_blContext->restore_clipping(); + } + } + +@@ -1312,7 +1312,7 @@ void PDFBLPaintEngine::setFillRule(Qt::FillRule fillRule) + break; + } + +- m_blContext->setFillRule(blFillRule); ++ m_blContext->set_fill_rule(blFillRule); + } + + } // namespace pdf diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 62408e84b2c8..b9f61091c42f 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -10,24 +10,23 @@ openjpeg, onetbb, blend2d, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "pdf4qt"; - version = "1.5.1.0"; + version = "1.5.2.0"; src = fetchFromGitHub { owner = "JakubMelka"; repo = "PDF4QT"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ysrz/uCSTFK5wGNdTXhpq6QVf7Ju1xWisNVUtBtdEjc="; + hash = "sha256-pY1PM3H9vANxogRzQvuIohIi9d8TL093kMAl49trTho="; }; patches = [ - # lcms2 cmake module only appears when built with vcpkg. - # We directly search for the corresponding libraries and - # header files instead. - ./find_lcms2_path.patch + # https://github.com/JakubMelka/PDF4QT/pull/322 + ./migrated_to_blend2d_0.21.x.patch ]; nativeBuildInputs = [ @@ -50,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: { blend2d ]; + # `blend2d.h` moved to `blend2d/blend2d.h` in blend2d >= 0.21.2 + NIX_CFLAGS_COMPILE = "-I${blend2d.dev}/include/blend2d"; + cmakeFlags = [ (lib.cmakeBool "PDF4QT_INSTALL_TO_USR" false) ]; @@ -60,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=(''${gappsWrapperArgs[@]}) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Open source PDF editor"; longDescription = '' diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/by-name/pe/pe-bear/package.nix similarity index 65% rename from pkgs/applications/misc/pe-bear/default.nix rename to pkgs/by-name/pe/pe-bear/package.nix index 16fc1b48f442..aa4793209a9c 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/by-name/pe/pe-bear/package.nix @@ -3,48 +3,47 @@ stdenv, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pe-bear"; version = "0.7.1"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jWRO0vO601IijFo7nu0SMF8inEXWLzv+Ni1nlJfGqhQ="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; - meta = with lib; { + meta = { description = "Portable Executable reversing tool with a friendly GUI"; mainProgram = "PE-bear"; homepage = "https://hshrzd.wordpress.com/pe-bear/"; - license = [ + license = with lib.licenses; [ # PE-Bear - licenses.gpl2Only + gpl2Only # Vendored capstone - licenses.bsd3 + bsd3 # Vendored bearparser - licenses.bsd2 + bsd2 ]; - maintainers = with maintainers; [ blitz ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.blitz ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 3c85c4259532..17e66ab4253a 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "peazip"; - version = "10.7.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "peazip"; repo = "peazip"; rev = finalAttrs.version; - hash = "sha256-JVSr4ztDHjJF+vzhaMSSAWt6PEtxNzfCRBQBlfLA4xs="; + hash = "sha256-A95rFW5kZ+gUbaLkAXRKu8jaBb43ONX+2wZXDWfT2G4="; }; sourceRoot = "${finalAttrs.src.name}/peazip-sources"; diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix index f9c9a874fe48..344c7a844278 100644 --- a/pkgs/by-name/pe/perfect_dark/package.nix +++ b/pkgs/by-name/pe/perfect_dark/package.nix @@ -22,13 +22,13 @@ assert lib.assertOneOf "romID" romID roms; stdenv.mkDerivation (finalAttrs: { pname = "perfect_dark"; - version = "0-unstable-2025-11-23"; + version = "0-unstable-2025-12-07"; src = fetchFromGitHub { owner = "fgsfdsfgs"; repo = "perfect_dark"; - rev = "7f68c46959d755d5fd4c9444f01e08303d306a2f"; - hash = "sha256-JyZat+60jjcN3Y9RpUL9O4waw96ck6nrGmSUnLbbP1c="; + rev = "a6374b016ded42dd28fee886cac0d647f807b2a5"; + hash = "sha256-+wkWBgGtVd9ipRu8xI3FTpjsptHapoTXkVJgUlCgUq8="; postFetch = '' pushd $out diff --git a/pkgs/by-name/pg/pg_flame/package.nix b/pkgs/by-name/pg/pg_flame/package.nix index 7781dfc31ea2..b5f32f7d0b8a 100644 --- a/pkgs/by-name/pg/pg_flame/package.nix +++ b/pkgs/by-name/pg/pg_flame/package.nix @@ -21,7 +21,6 @@ buildGoModule rec { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; homepage = "https://github.com/mgartner/pg_flame"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "pg_flame"; }; } diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 94870c728d6c..e875ce712b6f 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.4.4"; + version = "12.5.1"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-J57kK1wtiNJ54pAwnQNxvqdmA/omVyZKrnRJSeNX0Tg="; + hash = "sha256-fbHHoqCHL3KizoVRWm+Dj+nfb5CLF8SGfMc1D2OjbHY="; }; - vendorHash = "sha256-xaOM6BHaW4aEm5tAv3zFRg4QpV8L3p8y7KoipWtnqKI="; + vendorHash = "sha256-CuH86qqKVIQSRgTslKWBt8c9G06Ti6hbFw3bQ0ouL3k="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json index 6f154a0f9e57..9e8f69dc75b7 100644 --- a/pkgs/by-name/pi/piliplus/git-hashes.json +++ b/pkgs/by-name/pi/piliplus/git-hashes.json @@ -1,17 +1,19 @@ { "auto_orientation": "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=", - "canvas_danmaku": "sha256-V7o8NonNWo07PvWu8BI/ZugLZU6i3u45DuALg9UYtTE=", + "canvas_danmaku": "sha256-RYzzXg+nV9jT+OrPnR/popIkvbyDQRj7FLM6hOdxcJY=", "chat_bottom_container": "sha256-um9KwZUDxWBhFsGHfv00TjPzxDHmp43TLRF0GwuV1xs=", "extended_nested_scroll_view": "sha256-Vjv5zp5c0Xob1H8/U0+lUueLqOKo7qwusOCchdt3Z7M=", - "floating": "sha256-TJ2i3hTOQ4euHWr+lfQU44L3vVehmWVdZuAzNyVaEfA=", + "file_picker": "sha256-V2tLEkvwVa8BfcdnVBJkwVbcrTs6Rd5XAEw04eJOM1E=", + "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=", "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=", + "get": "sha256-aJJyQAFWFLS2dIUTITkRHOeW9IFQOcEsMuQOkBDhGu8=", "material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=", - "media_kit": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", - "media_kit_libs_android_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", - "media_kit_libs_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", - "media_kit_libs_windows_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", - "media_kit_native_event_loop": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", - "media_kit_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=", + "media_kit": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", + "media_kit_libs_android_video": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", + "media_kit_libs_video": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", + "media_kit_libs_windows_video": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", + "media_kit_native_event_loop": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", + "media_kit_video": "sha256-M8z6KGoKrhYFpnXnP+5sHjHMGJe04djKTxnkvLVtBtU=", "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 be6706c00a97..ad0ca313d0d2 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter335, + flutter338, makeDesktopItem, copyDesktopItems, alsa-lib, @@ -14,7 +14,7 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; in -flutter335.buildFlutterApplication { +flutter338.buildFlutterApplication { pname = "piliplus"; inherit (srcInfo) version; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index 50e6eec4085d..3334170c131e 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b", + "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "90.0.0" + "version": "92.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f", + "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "9.0.0" }, "ansicolor": { "dependency": "transitive", @@ -34,11 +34,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8", + "sha256": "3462d9defc61565fde4944858b59bec5be2b9d5b05f20aed190adb3ad08a7abc", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "7.0.0" }, "app_links_linux": { "dependency": "transitive", @@ -161,6 +161,26 @@ "source": "git", "version": "2.3.1" }, + "battery_plus": { + "dependency": "direct main", + "description": { + "name": "battery_plus", + "sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "battery_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "battery_plus_platform_interface", + "sha256": "e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, "boolean_selector": { "dependency": "transitive", "description": { @@ -185,11 +205,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9", + "sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.3" }, "build_config": { "dependency": "transitive", @@ -205,21 +225,21 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" + "version": "4.1.1" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1", + "sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.0" + "version": "2.10.4" }, "built_collection": { "dependency": "transitive", @@ -235,11 +255,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.0" + "version": "8.12.1" }, "cached_network_image": { "dependency": "direct main", @@ -276,7 +296,7 @@ "description": { "path": ".", "ref": "main", - "resolved-ref": "454790117e05e96782b05ee3d28d0283741b3cde", + "resolved-ref": "e13ec72d2406b1ede94bbeec64dd0941a7dd9ac2", "url": "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git" }, "source": "git", @@ -293,7 +313,7 @@ "version": "2.1.5" }, "characters": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "characters", "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", @@ -417,21 +437,21 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+2" + "version": "0.3.5+1" }, "crypto": { "dependency": "direct main", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "csslib": { "dependency": "transitive", @@ -457,11 +477,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", + "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "dbus": { "dependency": "transitive", @@ -477,11 +497,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6", + "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.1.0" + "version": "12.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -523,6 +543,16 @@ "source": "hosted", "version": "2.1.1" }, + "dlna_dart": { + "dependency": "direct main", + "description": { + "name": "dlna_dart", + "sha256": "8a4f0e4f378615c99f2af679dc9f0c72fe4a0fb2f3eea96b637fe691dfcf0649", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, "dynamic_color": { "dependency": "direct main", "description": { @@ -627,52 +657,53 @@ "file_picker": { "dependency": "direct main", "description": { - "name": "file_picker", - "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", - "url": "https://pub.dev" + "path": ".", + "ref": "mod", + "resolved-ref": "4c03c3413a915fa82f58d4591bfe3b62709a6edf", + "url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git" }, - "source": "hosted", - "version": "10.3.3" + "source": "git", + "version": "10.3.7" }, "file_selector_linux": { "dependency": "transitive", "description": { "name": "file_selector_linux", - "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", + "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+2" + "version": "0.9.4" }, "file_selector_macos": { "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c", + "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+4" + "version": "0.9.5" }, "file_selector_platform_interface": { "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.2" + "version": "2.7.0" }, "file_selector_windows": { "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+4" + "version": "0.9.3+5" }, "fixnum": { "dependency": "direct main", @@ -698,18 +729,18 @@ "dependency": "direct main", "description": { "name": "flex_seed_scheme", - "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", + "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.1" + "version": "4.0.1" }, "floating": { "dependency": "direct main", "description": { "path": ".", "ref": "version-3", - "resolved-ref": "929e9ec1312d9d1b4755d7589dd53db5b4d6d50d", + "resolved-ref": "a66ec0b9dabde6b5880a3f4f3425e57842a38e51", "url": "https://github.com/bggRGjQaUbCoE/floating.git" }, "source": "git", @@ -871,21 +902,21 @@ "dependency": "direct dev", "description": { "name": "flutter_native_splash", - "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc", + "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.7" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.31" + "version": "2.0.33" }, "flutter_smart_dialog": { "dependency": "direct main", @@ -912,11 +943,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.3" }, "flutter_test": { "dependency": "direct dev", @@ -928,11 +959,11 @@ "dependency": "direct main", "description": { "name": "flutter_volume_controller", - "sha256": "15f2c25bc4632ac5e8d42a208fe07c3224a4ee66b155d1ac86945b3db2bb58d9", + "sha256": "22edb0993ad03ecbc8d1164daeb5b39d798d409625db692675a86889403b1532", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.3" + "version": "1.3.4" }, "flutter_web_plugins": { "dependency": "transitive", @@ -963,11 +994,12 @@ "get": { "dependency": "direct main", "description": { - "name": "get", - "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425", - "url": "https://pub.dev" + "path": ".", + "ref": "version_4.7.2", + "resolved-ref": "579a8978a922e6c57cebd001320f78674e040418", + "url": "https://github.com/bggRGjQaUbCoE/getx.git" }, - "source": "hosted", + "source": "git", "version": "4.7.2" }, "glob": { @@ -1044,11 +1076,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "http2": { "dependency": "direct main", @@ -1124,41 +1156,41 @@ "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041", + "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.1" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "dd7a61daaa5896cc34b7bc95f66c60225ae6bee0d167dde0e21a9d9016cac0dc", + "sha256": "5e9bf126c37c117cf8094215373c6d561117a3cfb50ebc5add1a61dc6e224677", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13+4" + "version": "0.8.13+10" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6", + "sha256": "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e", + "sha256": "997d100ce1dda5b1ba4085194c5e36c9f8a1fb7987f6a36ab677a344cd2dc986", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13" + "version": "0.8.13+2" }, "image_picker_linux": { "dependency": "transitive", @@ -1174,21 +1206,21 @@ "dependency": "transitive", "description": { "name": "image_picker_macos", - "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04", + "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.2" + "version": "0.2.2+1" }, "image_picker_platform_interface": { "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665", + "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.11.1" }, "image_picker_windows": { "dependency": "transitive", @@ -1324,11 +1356,11 @@ "dependency": "transitive", "description": { "name": "mailer", - "sha256": "db61f51ea301e8dcbfe5894e037ccd30a6246eb0a7bcfa007aefa2fc11a8f96e", + "sha256": "c3b934c0e800ddc946167c0123a900eba5acd009abb73648d0191a742542f2b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.0" }, "matcher": { "dependency": "transitive", @@ -1366,7 +1398,7 @@ "description": { "path": "media_kit", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1377,7 +1409,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1418,7 +1450,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1429,7 +1461,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1440,7 +1472,7 @@ "description": { "path": "media_kit_native_event_loop", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1451,7 +1483,7 @@ "description": { "path": "media_kit_video", "ref": "version_1.2.5", - "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2", + "resolved-ref": "bc999bf181ddf12d60891f76e41359e4177b93a7", "url": "https://github.com/bggRGjQaUbCoE/media-kit.git" }, "source": "git", @@ -1471,11 +1503,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "direct main", @@ -1571,21 +1603,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.19" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", + "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1721,11 +1753,11 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "826d6a306be26f29e5cd9faeb0c97aad5897270341dab6dbd7b8acd675937006", + "sha256": "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "6.0.0" }, "pub_semver": { "dependency": "transitive", @@ -1791,11 +1823,11 @@ "dependency": "direct main", "description": { "name": "saver_gallery", - "sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c", + "sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.1" + "version": "4.1.0" }, "screen_brightness_android": { "dependency": "direct overridden", @@ -1881,21 +1913,21 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59", + "sha256": "10a0bc25f5f21468e3beeae44e561825aaa02cdc6829438e73b9b64658ff88d9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.7.0" + "version": "9.8.0" }, "share_plus": { "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6", + "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.0" + "version": "12.0.1" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1921,21 +1953,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713", + "sha256": "46a46fd64659eff15f4638bbe19de43f9483f0e0bf024a9fb6b3582064bacc7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.4.17" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -2023,16 +2055,6 @@ "source": "hosted", "version": "1.10.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "sqflite": { "dependency": "transitive", "description": { @@ -2158,21 +2180,21 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6" + "version": "0.7.7" }, "tray_manager": { "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a", + "sha256": "c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.5.2" }, "tuple": { "dependency": "transitive", @@ -2198,11 +2220,21 @@ "dependency": "transitive", "description": { "name": "universal_io", - "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.1" + }, + "upower": { + "dependency": "transitive", + "description": { + "name": "upower", + "sha256": "cf042403154751180affa1d15614db7fa50234bc2373cd21c3db666c38543ebf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" }, "uri_parser": { "dependency": "transitive", @@ -2228,41 +2260,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.24" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.4" + "version": "6.3.6" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.3" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2288,21 +2320,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vector_graphics": { "dependency": "transitive", @@ -2508,7 +2540,7 @@ } }, "sdks": { - "dart": ">=3.9.0 <4.0.0", - "flutter": "3.35.5" + "dart": ">=3.10.0 <4.0.0", + "flutter": "3.38.3" } } diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index 320d88eef710..8a509adc027b 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,7 +1,7 @@ { - "version": "1.1.4.10", - "rev": "4cf1c25b36d2d3bb7b1efa1b00b1d33c593ce4b0", - "revCount": 4215, - "commitDate": 1760358940, - "hash": "sha256-sToT5saB/cPSvyrOG4XfMianXXLfg3iQlvJvwtAf6b8=" + "version": "1.1.5", + "rev": "a48f6b1ca52e20fb459c070a9f72d62019136350", + "revCount": 4403, + "commitDate": 1764474094, + "hash": "sha256-KviltS9IC0cYl2+FKDQ535ot+ieZ21KrxRTBPxuDoe0=" } diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 80e40c73ba77..dcd5dfe01ec3 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pimsync"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "pimsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-LHdm6CeaGrlTNzN4h9XzYCG5aRG2lk3ZqqZLd37q7is="; + hash = "sha256-VMdSATq0W0dCqllmiwzZ7knWD1qKQbsJLNATptGneIs="; }; - cargoHash = "sha256-6n7kjmLWzG5rttYak65gmu5KM/W4bN4FS1MaEnCELV8="; + cargoHash = "sha256-mev/ipxAmD0MvG1lrNYzcphg4rp5+ET6nnnaTYX5T/4="; PIMSYNC_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/pi/pinsel/package.nix b/pkgs/by-name/pi/pinsel/package.nix index 4699aabe70b6..e976ce4096de 100644 --- a/pkgs/by-name/pi/pinsel/package.nix +++ b/pkgs/by-name/pi/pinsel/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "pinsel"; - version = "unstable-2021-09-13"; + version = "0-unstable-2022-03-27"; src = fetchFromGitHub { owner = "Nooo37"; repo = "pinsel"; - rev = "24b0205ca041511b3efb2a75ef296539442f9f54"; - sha256 = "sha256-w+jiKypZODsmZq3uWGNd8PZhe1SowHj0thcQTX8WHfQ="; + rev = "4955b93365a1816bffbddc3d2ddfe3f4b3d60107"; + hash = "sha256-H5DCAb8lJx2W4LNeGV+WOIiLUHsRVv1gSU2YMegkDFM="; }; strictDeps = true; @@ -40,9 +40,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Minimal screenshot annotation tool with lua config"; homepage = "https://github.com/Nooo37/pinsel"; - # no license - license = licenses.unfree; - maintainers = with maintainers; [ lom ]; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.linux; mainProgram = "pinsel"; }; } diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 2f4e7b3d56d3..2aa4d3b6d471 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -2,18 +2,19 @@ lib, fetchFromGitHub, python3, + writableTmpDirAsHomeHook, }: python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "pip-audit"; tag = "v${version}"; - hash = "sha256-j8ZKqE7PEwaCTUNnJunqM0A2eyuWfx8zG5i3nmZERow="; + hash = "sha256-fnIwtXFswKcfz/8VssL4UVukwkq6CC63NCyqqbqziO8="; }; pythonRelaxDeps = [ "cyclonedx-python-lib" ]; @@ -31,21 +32,19 @@ python3.pkgs.buildPythonApplication rec { pip-requirements-parser platformdirs rich - toml + tomli + tomli-w ] ++ cachecontrol.optional-dependencies.filecache; nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "pip_audit" ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - disabledTestPaths = [ # Tests require network access "test/dependency_source/test_requirement.py" @@ -54,11 +53,12 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # Tests requrire network access + # Tests require network access + "test_esms" "test_get_pip_cache" - "test_virtual_env" - "test_pyproject_source" "test_pyproject_source_duplicate_deps" + "test_pyproject_source" + "test_virtual_env" ]; meta = with lib; { diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b1701712472d..374e56e76f46 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-aDwuMRceMxRCh9w89Q2ktpNWwmStg3KzggwhZUAAauk="; + hash = "sha256-JFXa72bPRYkNb/7XbBOnI1ay0WFVAoAssoNtGjSsW/s="; }; - cargoHash = "sha256-BbPX+ZKMfLtKWBnrGBRfrl6d40rBQaWJLBg0Vv5UnZE="; + cargoHash = "sha256-aDWDJ0uGAa/gdV6aelBd6tlRssd75EzeGbnw7qPzLDY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 982dca5a53ec..1042e78d1ba4 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-11-20"; + version = "0-unstable-2025-11-28"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "84333735ffe124f7bd904805fd488b93841de49f"; - hash = "sha256-XYySnVvnNZr1tg46AoYBsmeT5y/StByWcQhnNOdoLJo="; + rev = "d74adeade195e94064b1dc38fd14b93037ad7694"; + hash = "sha256-Rlm5XwOLjGYOtg12tlUtkd2+upY2EP7x5dI+Nx2JAF0="; }; vendorHash = "sha256-Zv9kyBGLicSJlWD0/wv6ggteA+DttOb18/P5s91tJxE="; diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix index dab7c6e06394..8d4cd13755aa 100644 --- a/pkgs/by-name/pl/plakar/package.nix +++ b/pkgs/by-name/pl/plakar/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "plakar"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "PlakarKorp"; repo = "plakar"; tag = "v${finalAttrs.version}"; - hash = "sha256-cuPz0xg/cGKczHLpFqSBfFD7KlygCX6fnfrigv0K2Zs="; + hash = "sha256-X8m2dXMb+cxWBbKm0MhhY2pNSBTUONyHoPnGlDG9jOg="; }; - vendorHash = "sha256-ySzDtj8EdGcWl6H1q44+QR5ebSC76leVygl+c8fa7sk="; + vendorHash = "sha256-6MdwUJTu9QvqZ3iGEg39L5B5mce7JssFTF3ZmoTuH3M="; buildInputs = [ fuse diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 07f6105e5f43..203f7b53c668 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 = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Bh3Dn7hnPlaPSDxrdZKCQRfMsfiT3pwS6TGt8CyLDk="; + hash = "sha256-Bx4TS6j5smI4SbkxJK7oiLIu72ClArUcZSB+MKf0kfM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 554fea30290e..878abf44286b 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.28.2"; + version = "1.28.3"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA="; + hash = "sha256-9deO1SXhQ3/oZg2BC/IWbHb5KKQ7qAklrR956lj8IFY="; }; vendorHash = "sha256-6zsX7rU+D+RUHwXfFZzLQftQ6nSYJhvKIDdsO2vow4A="; diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix index 608b9bc1ae9f..c257ea350a83 100644 --- a/pkgs/by-name/pn/pngout/package.nix +++ b/pkgs/by-name/pn/pngout/package.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation { license = lib.licenses.unfreeRedistributable; homepage = "http://advsys.net/ken/utils.htm"; platforms = lib.attrNames platforms; - maintainers = [ lib.maintainers.sander ]; mainProgram = "pngout"; }; } diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index fed07269f3b0..066fbb150356 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.34.0"; + version = "0.34.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-kMj/JXPBsu30K0P7rCnAqb8xBTmBctGvVucDVwgKjjY="; + hash = "sha256-Ytvti0RBpbpFIaoqR6+YBYkFydcDKGbDGUapmy6TdHU="; }; - vendorHash = "sha256-Ri9fgCMfWqc/TBteSm8gAUkjserhfg4ZZ8CpofQJOdI="; + vendorHash = "sha256-Oo0zfS7WLrF6hpphuWMV6Of7k6ezcWp3MtfQgCiSuo8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 74d743260233..6ec4a19e901c 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -11,7 +11,7 @@ libapparmor, libseccomp, libselinux, - systemd, + systemdMinimal, go-md2man, nixosTests, python3, @@ -21,6 +21,7 @@ extraPackages ? [ ], crun, runc, + krunkit, conmon, extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki fuse-overlayfs, @@ -83,7 +84,7 @@ buildGoModule (finalAttrs: { libseccomp libselinux lvm2 - systemd + systemdMinimal ]; env = { @@ -134,7 +135,7 @@ buildGoModule (finalAttrs: { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) - patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped + patchelf --set-rpath "${lib.makeLibraryPath [ systemdMinimal ]}":$RPATH $out/bin/.podman-wrapped substituteInPlace "$out/share/systemd/user/podman-user-wait-network-online.service" \ --replace-fail sleep '${coreutils}/bin/sleep' \ --replace-fail /bin/sh '${runtimeShell}' @@ -166,9 +167,8 @@ buildGoModule (finalAttrs: { iproute2 nftables ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - vfkit - ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform vfkit) vfkit + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit ++ extraPackages ); diff --git a/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix b/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix index fd9c56acfea7..c4af20a8a753 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, poetry, @@ -11,26 +10,20 @@ buildPythonPackage rec { pname = "poetry-audit-plugin"; - version = "0.4.0"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "opeco17"; repo = "poetry-audit-plugin"; - rev = "refs/tags/${version}"; - hash = "sha256-kiNtzEup2ygCTk0zk8YV2jxAj6ZzOhP8v0U4FbV15hI="; + tag = version; + hash = "sha256-aAQzgxzBJa/pK+hQj0tN4Zg1MG/sT0rbaMNMIxnhxdU="; }; build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "poetry" - ]; - buildInputs = [ poetry ]; @@ -50,6 +43,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/opeco17/poetry-audit-plugin/releases/tag/${src.tag}"; description = "Poetry plugin for checking security vulnerabilities in dependencies"; homepage = "https://github.com/opeco17/poetry-audit-plugin"; license = lib.licenses.mit; diff --git a/pkgs/by-name/po/poezio/package.nix b/pkgs/by-name/po/poezio/package.nix index f6146e5e8b85..846af28d28db 100644 --- a/pkgs/by-name/po/poezio/package.nix +++ b/pkgs/by-name/po/poezio/package.nix @@ -53,6 +53,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://poez.io"; changelog = "https://codeberg.org/poezio/poezio/src/tag/v${version}/CHANGELOG"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ lsix ]; }; } diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 442bb7884028..ba8f490fece9 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-11-24"; + version = "latest-unstable-2025-11-28"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "c04a05ebaf7488a44d227c66a53b17c7f670f9ad"; - hash = "sha256-DKHaHVuxq/ZjOa0jz/2mMiqptELx+h671M20eByrBHY="; + rev = "93721a14f3d473a2b8367e76c301780f863343d0"; + hash = "sha256-oLoYRs0tqsRcoB8IuiV+LVdTMH1qnilE75uH+Th8jJY="; }; cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A="; diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index d6657073c5f8..baa382045aa8 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ afldcr - Br1ght0ne moni ]; mainProgram = "polybar"; diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index 45f5e211d3b1..4fbf258da2a5 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; tag = "v${finalAttrs.version}"; - hash = "sha256-DFJfuDOzcVdiXLv5EzO5TL3UJLCZPM1bTZharp2ww5U="; + hash = "sha256-3JcE963GSAUs82OF59Yf7PjQV0FHKsCYx+q3TWQsHpY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/po/portfolio_rs/package.nix b/pkgs/by-name/po/portfolio_rs/package.nix index c322f0d49b21..40dcef68800c 100644 --- a/pkgs/by-name/po/portfolio_rs/package.nix +++ b/pkgs/by-name/po/portfolio_rs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "portfolio_rs"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "MarkusZoppelt"; repo = "portfolio_rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-WCz41eJciYwvljiyg5MESiz4eUXBpot7+j81PPyG+fY="; + hash = "sha256-9EMhDbco+NmYRPuPFox05FO2JIVNFdWjwix0/gBusNA="; }; - cargoHash = "sha256-s+/IaajmdKu49nQ49RdjudgKW9KdAix0Ryj+N+wnuZU="; + cargoHash = "sha256-sfq1wiysNCkUVCMus4J/hekiv31MzbYQRUom2YOH+1Y="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index 909d03d98691..a3f0d364c033 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.11.0-234"; + version = "2025.12.0-167"; in stdenv.mkDerivation { inherit version pname; @@ -31,17 +31,17 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg"; - hash = "sha256-C9OUYvO+bNpiObbTHdtYmcTNM31Ff5dO5tMI4+OvkNs="; + hash = "sha256-GrABm5PJFZ1ugb4Lj3y/Ynnt/RTkY0DMk3GZKqVAlk0="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb"; - hash = "sha256-yhbDTpvfGPbCzRQZ7Ih6QE42fy+bBHaSKeS+molYiEU="; + hash = "sha256-WP8ULCMY268av8W0Op0j6P6ry8MwTjNsjV1iJV50wTg="; } else fetchurl { url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb"; - hash = "sha256-rIs0LnwK6QcUMI8CbkBwf+uuqAJXpNHRBNpWpBgd3Po="; + hash = "sha256-3Z4mRN5WOV0wj51TzoyC0wfU1Zu6wEAb1gTH5IFQRIg="; }; buildInputs = [ diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index 08a0f53ed9e2..b97a6e4a6357 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.10.6"; + version = "3.10.7"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-cbOD9X1Ms2MgG+ijAby6/jBKrb5/OOveQc1blSJIRls="; + hash = "sha256-/NP/cIBq5/CoLntcMB4vT8+mpomi27Oz8bXlIIEVeIo="; }; nativeBuildInputs = [ @@ -199,7 +199,6 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - globin dotlambda lewo ]; diff --git a/pkgs/by-name/pr/praat/package.nix b/pkgs/by-name/pr/praat/package.nix index 5c46bd5bc2d7..f5cec0dd132c 100644 --- a/pkgs/by-name/pr/praat/package.nix +++ b/pkgs/by-name/pr/praat/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.fon.hum.uva.nl/praat/"; changelog = "https://github.com/praat/praat.github.io/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index bd4dbfcfcfae..1a75ac6c5e06 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -5,27 +5,21 @@ git, uv, python312, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.18"; + version = "0.2.20"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ddLtXIBf6WrjN+gxm0g3Wkmyps2resWsd1cH0F99Ii8="; + hash = "sha256-AZyYjgUd2dGnBUHwo/cPagFE8IJmzsgMLwebTypLAgE="; }; - cargoHash = "sha256-E+t7bwKDnuZO/4WJEBaN+e5+P/Nbo14WWxgTLxDE7Jw="; - - preBuild = '' - version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])') - - substituteInPlace ./tests/languages/python.rs \ - --replace '(3, 12, 11)' "$version312_str" - ''; + cargoHash = "sha256-a1yBu4MuyR0veBSQAUdaE/9rB04i6RVJ/NdWNmpRzmM="; nativeCheckInputs = [ git @@ -68,6 +62,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "run_worktree" "try_repo_relative_path" "languages::tests::test_native_tls" + "rust::additional_dependencies_cli" + "rust::rustup_installer" + "rust::remote_hooks" + "rust::remote_hooks_with_lib_deps" + "unsupported::unsupported_language" # "meta_hooks" "reuse_env" "docker::docker" @@ -146,6 +145,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "run_in_non_git_repo" ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/j178/prek"; description = "Better `pre-commit`, re-engineered in Rust "; diff --git a/pkgs/by-name/pr/present/package.nix b/pkgs/by-name/pr/present/package.nix index 190245e4db3e..e137fe0b50a2 100644 --- a/pkgs/by-name/pr/present/package.nix +++ b/pkgs/by-name/pr/present/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonPackage rec { description = "Terminal-based presentation tool with colors and effects"; homepage = "https://github.com/vinayak-mehta/present"; license = licenses.asl20; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; mainProgram = "present"; }; } diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index f74ea8ffd78f..16422945d960 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -24,26 +24,16 @@ let }; build-system = with final; [ uv-build ]; }); - - django-tables2 = prev.django-tables2.overridePythonAttrs (oldAttrs: rec { - version = "2.7.0"; - src = fetchFromGitHub { - owner = "jieter"; - repo = "django-tables2"; - tag = "v${version}"; - hash = "sha256-Cb8XhCLqhc2Dx/5uAHnN9zTVL6/1+WekC4qTloBurzM="; - }; - }); }; }; - version = "2025.2.0"; + version = "2025.2.2"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; tag = "v${version}"; - hash = "sha256-em5bPKKlT3qUAv4zGGjOkjDPY7U8vbuqMZ8NQXwZg4k="; + hash = "sha256-2qru52/ZALBAdRh0I+3VimVsiRl71YZgbSUD/LdoA/0="; }; meta = { @@ -57,8 +47,8 @@ let platforms = lib.platforms.linux; }; - frontend = buildNpmPackage { - pname = "pretalx-frontend"; + pretix-schedule-editor = buildNpmPackage { + pname = "pretalx-schedule-editor"; inherit version src; sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; @@ -67,6 +57,15 @@ let npmBuildScript = "build"; + installPhase = '' + runHook preInstall + + mkdir -p $out + cp dist/** $out/ + + runHook postInstall + ''; + inherit meta; }; in @@ -80,10 +79,11 @@ python.pkgs.buildPythonApplication rec { "static" ]; - postPatch = '' - substituteInPlace src/pretalx/common/management/commands/rebuild.py \ - --replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' "" - ''; + patches = [ + # don't run npm during rebuild command, we already use a separate derivation + # to build static assets + ./rebuild-no-npm.patch + ]; nativeBuildInputs = [ gettext @@ -169,8 +169,8 @@ python.pkgs.buildPythonApplication rec { }; postBuild = '' - rm -r ./src/pretalx/frontend/schedule-editor - ln -s ${frontend}/lib/node_modules/@pretalx/schedule-editor ./src/pretalx/frontend/schedule-editor + # link schedule-editor so it can be picked up in staticfiles lookups + ln -s ${pretix-schedule-editor}/** ./src/pretalx/static/ # Generate all static files, see https://docs.pretalx.org/administrator/commands.html#python-m-pretalx-rebuild PYTHONPATH=$PYTHONPATH:./src python -m pretalx rebuild @@ -180,19 +180,14 @@ python.pkgs.buildPythonApplication rec { mkdir -p $out/bin cp ./src/manage.py $out/bin/pretalx-manage - # The processed source files are in the static output, except for fonts, which are duplicated. - # See for more details. - find $out/${python.sitePackages}/pretalx/static \ - -mindepth 1 \ - -not -path "$out/${python.sitePackages}/pretalx/static/fonts*" \ - -delete - - # Copy generated static files into dedicated output + # Copy and merge static files mkdir -p $static cp -r ./src/static.dist/** $static/ + cp -r ${pretix-schedule-editor}/** $static/ - # Copy frontend files - ln -s ${frontend}/lib/node_modules/@pretalx/schedule-editor/dist/* $static + # And link them into the package for staticfiles lookups + rm -rf $out/${python.sitePackages}/pretalx/static + ln -s $static/ $out/${python.sitePackages}/pretalx/static ''; preCheck = '' diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index ce8225a2d3d7..1a3fd290702c 100644 --- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.4.1"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-76hxS9cYvaRcToD8ooW0Fnp36+7n17j3UR1VD9v2zR8="; + hash = "sha256-QyX/hmDom2QHiaTH0EFg2jxzochQaFQ4AOQ2vM6yofU="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix index 20ac7ccbae9d..39df7b787153 100644 --- a/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -5,16 +5,16 @@ setuptools, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.7.0-unstable-2025-10-10"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-pages"; - rev = "58cfe9b227a5cf5597c30285500546d2d3d84b8a"; - hash = "sha256-kfGdb7vcUvK4yXqJd1XftTNWPLvjE4zrZSy4xgrmkMg="; + tag = "v${version}"; + hash = "sha256-iRmDYjq08UkA/2pyUUK/DUuNbLNn/KSNQGiU1o1gTWw="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index b1dd574b98da..eed5f89b46f0 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.7.1"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-8l+ugonT0WTHyyMJnU3Vi2QVD2Xxpl286m3YEKu+Ij4="; + hash = "sha256-VslvZkmRy7f+rBd9re46WlmASyk01//N9+jajaSfKG4="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix index 7c138f07f651..65e8ab7d00b6 100644 --- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix +++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pretalx-venueless"; - version = "1.5.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-venueless"; rev = "v${version}"; - hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8="; + hash = "sha256-oV7J5ndhrhrI5UXTDexLMRo7Gud4SyppCKhoUtom54E="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix index a6037ca3e8fa..fed9fd0da260 100644 --- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix +++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-vimeo"; - version = "2.4.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-vimeo"; rev = "v${version}"; - hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE="; + hash = "sha256-qj0z6sLIJz0Ug+MN7wGTDZli0CdArhdeGSpp4n/EaHk="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix index b2b89acbd6a9..2620c5e80a4b 100644 --- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix +++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-youtube"; - version = "2.3.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-youtube"; rev = "v${version}"; - hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0="; + hash = "sha256-vOgzYxF3MHzzcUb8TMLRSyuRc6RHcxvCWxAFRFAf1Cs="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch b/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch new file mode 100644 index 000000000000..579a630cda5f --- /dev/null +++ b/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch @@ -0,0 +1,21 @@ +diff --git a/src/pretalx/common/management/commands/rebuild.py b/src/pretalx/common/management/commands/rebuild.py +index 45c83aab3..8c8c1e590 100644 +--- a/src/pretalx/common/management/commands/rebuild.py ++++ b/src/pretalx/common/management/commands/rebuild.py +@@ -45,16 +45,6 @@ def handle(self, *args, **options): + call_command( + "collectstatic", verbosity=silent, interactive=False, clear=options["clear"] + ) +- with override_settings(VITE_IGNORE=True): +- frontend_dir = ( +- Path(__file__).parent.parent.parent.parent / "frontend/schedule-editor/" +- ) +- env = os.environ.copy() +- env["OUT_DIR"] = str(settings.STATIC_ROOT) +- env["BASE_URL"] = settings.STATIC_URL +- if options["npm_install"] or not (frontend_dir / "node_modules").exists(): +- subprocess.check_call(["npm", "ci"], cwd=frontend_dir) +- subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env) + + # This fails if we don't have db access, which is fine + with suppress(Exception): diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 0287b863ae2b..7a53ae82c1d0 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -82,6 +82,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "beautifulsoup4" + "bleach" "celery" "css-inline" "django-bootstrap3" diff --git a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix new file mode 100644 index 000000000000..13c7ed9ef140 --- /dev/null +++ b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "prettier-plugin-jinja-template"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "davidodenwald"; + repo = "prettier-plugin-jinja-template"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qAmN4VJCJana7YbrQC/51JKCbP2DN10HpIt+S88yvPE="; + }; + + npmDepsHash = "sha256-/m0+z2fSwX77zRY4Yg4xdyI/ZEzAKNUuicaqz0b8f5w="; + + passthru.update-script = nix-update-script { }; + + meta = { + description = "Formatter plugin for Jinja2 template files"; + homepage = "https://github.com/davidodenwald/prettier-plugin-jinja-template"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ adamperkowski ]; + mainProgram = "prettier-plugin-jinja-template"; + }; +}) diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix index 29094642be14..ede6cb1637ca 100644 --- a/pkgs/by-name/pr/prisma-language-server/package.nix +++ b/pkgs/by-name/pr/prisma-language-server/package.nix @@ -6,17 +6,17 @@ buildNpmPackage (finalAttrs: { pname = "prisma-language-server"; - version = "6.19.0"; + version = "31.1.0"; src = fetchFromGitHub { owner = "prisma"; repo = "language-tools"; tag = "${finalAttrs.version}"; - hash = "sha256-v+gCxUuwrLdl2rlvB2HGZvXZEdSxmdUrY1YE58iBKRQ="; + hash = "sha256-hcLjvIi7EZQSr99OLHGWesziBc5HhkvD+dmGOTgOY/c="; }; sourceRoot = "${finalAttrs.src.name}/packages/language-server"; - npmDepsHash = "sha256-4NQO48a2f4k6CSWmIc/7UavNPNkAVIg0OyYArt/+vxI="; + npmDepsHash = "sha256-lt/xIm7brU9itYhVdmmts5WpcZtQbWYcxXaRYKYp9H0="; meta = { description = "Language server for Prisma"; diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix index 190feb5513c3..8a1d42700356 100644 --- a/pkgs/by-name/pr/procs/package.nix +++ b/pkgs/by-name/pr/procs/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Br1ght0ne sciencentistguy ]; mainProgram = "procs"; diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix index 2857daa8551e..4421c831e585 100644 --- a/pkgs/by-name/pr/proj/package.nix +++ b/pkgs/by-name/pr/proj/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.7.0"; + version = "9.7.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; - rev = finalAttrs.version; - hash = "sha256-Vdznj9WGuws1p+owDNHlVERjOM3fS1+RBtqe01q500E="; + tag = finalAttrs.version; + hash = "sha256-xXtqbLPS2Hu9gC06b72HDjnNRh4m0ism97hP8FFYOMo="; }; patches = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS.md"; + changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.tag}/NEWS.md"; description = "Cartographic Projections Library"; homepage = "https://proj.org/"; license = licenses.mit; diff --git a/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix index f3ddde0e40e4..08b3c0e5969c 100644 --- a/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix @@ -6,17 +6,17 @@ }: buildGoModule (finalAttrs: { pname = "prometheus-qbittorrent-exporter"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "martabal"; repo = "qbittorrent-exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-9J4nGG52M7SSeXigLBJK/dqXRvSpPqOGRJ8BQx7+1eU="; + hash = "sha256-ivHTGj2+6c23KW5aT5a8NFzUxV13u0y9UnHttZYTkuA="; }; sourceRoot = "${finalAttrs.src.name}/src"; - vendorHash = "sha256-jJmhRnjioeTq9Uol0lYLChPi4O1D9JnGqN7q1XK36yE="; + vendorHash = "sha256-FHKt2QpvianVVbAJUcaou/+Ok69a8NbkM7ymVgxUi0I="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 05781511931e..7b75b0b7bff7 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -1,5 +1,6 @@ { stdenv, + buildPackages, lib, go, buildGoModule, @@ -33,7 +34,7 @@ buildGoModule (finalAttrs: { pname = "prometheus"; - version = "3.7.2"; + version = "3.8.0"; outputs = [ "out" @@ -45,14 +46,16 @@ buildGoModule (finalAttrs: { owner = "prometheus"; repo = "prometheus"; tag = "v${finalAttrs.version}"; - hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0="; + hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk="; }; - vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE="; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8="; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz"; - hash = "sha256-NFv6zNpMacd0RgVYBlWKbXKNCEh7WijpREg0bNojisM="; + hash = "sha256-oOEvNZFlYtTNBsn+B2pAWXi0A2oJ6IAo7V8bOLtjfCM="; }; excludedPackages = [ @@ -96,7 +99,9 @@ buildGoModule (finalAttrs: { ''; preBuild = '' - if [[ -d vendor ]]; then GOARCH= make -o assets assets-compress plugins; fi + if [[ -d vendor ]]; then + GOARCH= CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" make -o assets assets-compress plugins + fi ''; tags = [ "builtinassets" ]; @@ -107,7 +112,6 @@ buildGoModule (finalAttrs: { in [ "-s" - "-w" "-X ${t}.Version=${finalAttrs.version}" "-X ${t}.Revision=unknown" "-X ${t}.Branch=unknown" @@ -129,19 +133,24 @@ buildGoModule (finalAttrs: { # Test mock data uses 64 bit data without an explicit (u)int64 doCheck = !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); - checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ + checkFlags = [ + # Skip for issue during TSDB compaction + "-skip=TestBlockRanges" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-skip=TestEvaluations/testdata/aggregators.test" ]; passthru.tests = { inherit (nixosTests) prometheus; }; - meta = with lib; { + meta = { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fpletz Frostman ]; + mainProgram = "prometheus"; }; }) diff --git a/pkgs/by-name/pr/properties-cpp/package.nix b/pkgs/by-name/pr/properties-cpp/package.nix index 46b608a71189..9bf4adab7d9b 100644 --- a/pkgs/by-name/pr/properties-cpp/package.nix +++ b/pkgs/by-name/pr/properties-cpp/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp"; description = "Very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; pkgConfigModules = [ "properties-cpp" diff --git a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix index ffab717e5540..95069389899e 100644 --- a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix @@ -2,27 +2,32 @@ buildGoModule, fetchFromGitHub, lib, + testers, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "protoc-gen-go-grpc"; - version = "1.5.1"; + version = "1.6.0"; modRoot = "cmd/protoc-gen-go-grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-go"; - rev = "cmd/protoc-gen-go-grpc/v${version}"; - hash = "sha256-PAUM0chkZCb4hGDQtCgHF3omPm0jP1sSDolx4EuOwXo="; + rev = "cmd/protoc-gen-go-grpc/v${finalAttrs.version}"; + hash = "sha256-Ay8X7NoS81ubMtFMrvQINhGAFV/Yh75AXh7/Y9lCJDo="; }; - vendorHash = "sha256-yn6jo6Ku/bnbSX8FL0B/Uu3Knn59r1arjhsVUkZ0m9g="; + vendorHash = "sha256-s26T7pht7YU1LJIM3edtuPb+KVezqG3m+8CxM+l1ty4="; ldflags = [ "-s" "-w" ]; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { description = "Go language implementation of gRPC. HTTP/2 based RPC"; homepage = "https://grpc.io/"; @@ -30,4 +35,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "protoc-gen-go-grpc"; }; -} +}) diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index f9463a49fd19..4856ee653078 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -1,5 +1,6 @@ { lib, + protobuf, rustPlatform, fetchFromGitHub, }: @@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-q3GMizdBupQSMVCuRqLjuw0Mof1q3UYOdUBugmrTDMU="; + env.FALLBACK_INCLUDE_PATH = "${protobuf}/include"; + meta = { description = "Protocol Buffers language server written in Rust"; homepage = "https://github.com/coder3101/protols"; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 7c9edd97cee6..a00ccd3dc2f8 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-25"; + version = "GE-Proton10-26"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k="; + hash = "sha256-Q5bKTDn3sTgp4mbsevOdN3kcdRsyKylghXqM2I2cYq8="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/protonup-qt/package.nix b/pkgs/by-name/pr/protonup-qt/package.nix index 46203590227a..a2387798bb07 100644 --- a/pkgs/by-name/pr/protonup-qt/package.nix +++ b/pkgs/by-name/pr/protonup-qt/package.nix @@ -7,13 +7,13 @@ appimageTools.wrapAppImage rec { pname = "protonup-qt"; - version = "2.13.0"; + version = "2.14.0"; src = appimageTools.extractType2 { inherit pname version; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-cyYuLwQqMAx5vMN9efceMNtDqzapNlJKBqWDSAYL2zI="; + hash = "sha256-OdogpqqNZiwKqj2ELfmAw/601iVHMsTqxl5CUjqRQBs="; }; }; diff --git a/pkgs/by-name/pr/proxypin/gitHashes.json b/pkgs/by-name/pr/proxypin/gitHashes.json new file mode 100644 index 000000000000..3111e216e5c0 --- /dev/null +++ b/pkgs/by-name/pr/proxypin/gitHashes.json @@ -0,0 +1,4 @@ +{ + "desktop_multi_window": "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ=", + "flutter_code_editor": "sha256-B9aJh6e6iLBZAcacucsT9szWWBwWVBBPDhbKQfnxc6I=" +} diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix index 2680de0769dd..eb326baa4bbe 100644 --- a/pkgs/by-name/pr/proxypin/package.nix +++ b/pkgs/by-name/pr/proxypin/package.nix @@ -3,25 +3,28 @@ flutter332, fetchFromGitHub, autoPatchelfHook, + writeShellScript, + nix-update, + yq-go, }: -flutter332.buildFlutterApplication rec { +let + version = "1.2.2"; +in +flutter332.buildFlutterApplication { pname = "proxypin"; - version = "1.2.0"; + inherit version; src = fetchFromGitHub { owner = "wanghongenpin"; repo = "proxypin"; tag = "v${version}"; - hash = "sha256-PRknUOCaaDE4Ri70EAROx1K3g2bLKI/HKIvo1W1D8ko="; + hash = "sha256-aMBUQkG/sZ7M9GzxKpO56MuGPRFLRGjrFpvsIUGDgkA="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - desktop_multi_window = "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ="; - flutter_code_editor = "sha256-B9aJh6e6iLBZAcacucsT9szWWBwWVBBPDhbKQfnxc6I="; - }; + gitHashes = lib.importJSON ./gitHashes.json; postPatch = '' substituteInPlace linux/my_application.cc \ @@ -34,11 +37,23 @@ flutter332.buildFlutterApplication rec { substituteInPlace linux/proxy-pin.desktop \ --replace-fail "/opt/proxypin/data/flutter_assets/assets/icon.png" "proxypin" \ --replace-fail "/opt/proxypin/" "" - install -Dm0644 linux/proxy-pin.desktop $out/share/applications/proxypin.desktop - install -Dm0644 assets/icon.png $out/share/pixmaps/proxypin.png + install -D --mode=0644 linux/proxy-pin.desktop $out/share/applications/proxypin.desktop + install -D --mode=0644 assets/icon.png $out/share/icons/hicolor/256x256/apps/proxypin.png ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = writeShellScript "update-proxypin" '' + ${lib.getExe nix-update} --use-github-releases proxypin + export HOME=$(mktemp -d) + src=$(nix build --no-link --print-out-paths .#proxypin.src) + WORKDIR=$(mktemp -d) + cp --recursive --no-preserve=mode $src/* $WORKDIR + PACKAGE_DIR=$(dirname $(EDITOR=echo nix edit --file . proxypin)) + pushd $WORKDIR + ${lib.getExe flutter332} pub get + ${lib.getExe yq-go} eval --output-format=json --prettyPrint pubspec.lock > $PACKAGE_DIR/pubspec.lock.json + popd + $PACKAGE_DIR/update-gitHashes.py + ''; meta = { description = "Capture HTTP(S) traffic software"; diff --git a/pkgs/by-name/pr/proxypin/pubspec.lock.json b/pkgs/by-name/pr/proxypin/pubspec.lock.json index ee8a469c2e3d..adb857de7988 100644 --- a/pkgs/by-name/pr/proxypin/pubspec.lock.json +++ b/pkgs/by-name/pr/proxypin/pubspec.lock.json @@ -104,11 +104,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "sha256": "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+2" + "version": "0.3.5" }, "crypto": { "dependency": "transitive", @@ -225,11 +225,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.1" + "version": "10.3.3" }, "fixnum": { "dependency": "transitive", @@ -308,11 +308,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab", + "sha256": "c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.29" + "version": "2.0.31" }, "flutter_qr_reader_plus": { "dependency": "direct main", @@ -490,11 +490,21 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" + }, + "macos_window_utils": { + "dependency": "direct main", + "description": { + "name": "macos_window_utils", + "sha256": "d4df3501fd32ac0d2d7590cb6a8e4758337d061c8fa0db816fdd636be63a8438", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" }, "matcher": { "dependency": "transitive", @@ -570,21 +580,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.19" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "path_provider_linux": { "dependency": "transitive", @@ -690,11 +700,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -850,11 +860,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e", + "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.11" + "version": "2.4.13" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -922,16 +932,6 @@ "source": "hosted", "version": "1.10.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "stack_trace": { "dependency": "transitive", "description": { @@ -1036,21 +1036,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656", + "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.17" + "version": "6.3.20" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.4" }, "url_launcher_linux": { "dependency": "transitive", @@ -1066,11 +1066,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1106,11 +1106,11 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vclibs": { "dependency": "direct main", @@ -1156,11 +1156,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.14.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", @@ -1192,16 +1192,6 @@ "source": "hosted", "version": "0.5.1" }, - "windows_single_instance": { - "dependency": "direct main", - "description": { - "name": "windows_single_instance", - "sha256": "50d5dcd6bec90b4a5ed588b1822b1aad21b39fc96da843e61c734b3caccfd2fc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, "xdg_directories": { "dependency": "transitive", "description": { @@ -1216,91 +1206,91 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "zstandard": { "dependency": "direct main", "description": { "name": "zstandard", - "sha256": "f1635a33fedc97ea4140fb7f41ae0f591f23c171079ed1054a2a99423bbb21cd", + "sha256": "d2cae71d34dfdd014525259be2f84ebc2a738c94cc4232515df44a1415dde9d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_android": { "dependency": "transitive", "description": { "name": "zstandard_android", - "sha256": "e345f280c23fa6d679797a7c5ad93862f02109ee3039b27262a82af574abae23", + "sha256": "7d85d814f147faa7a33d5cd5b5610dea451a57f95b34f98c93723bb2f2efbf98", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_ios": { "dependency": "transitive", "description": { "name": "zstandard_ios", - "sha256": "824319352d9a88259e43a8e344b9ef4db54cf09cd6053792563a8ad9257e38f9", + "sha256": "50e6b3d05ad6ecf8def65c9fae46d4b786edd89150fd2bb207cdcef918946f0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_linux": { "dependency": "transitive", "description": { "name": "zstandard_linux", - "sha256": "65bf0d25e7e930866615b9a22c16ad36603b6800f8030fcd5538b2f1ce8c6ac0", + "sha256": "66a61f7839016671a18448b73dab1910f7390bd9ab15bc118c8591381103f5b2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_macos": { "dependency": "transitive", "description": { "name": "zstandard_macos", - "sha256": "876a9eaacbf4a94392e8514b56305c1b6bea042dd17891e7527a7c859a3ab984", + "sha256": "f4e02dc613f9d0c960edad8a330b41c4e0f0a548aea26668a12f45eebacd6aa1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_platform_interface": { "dependency": "transitive", "description": { "name": "zstandard_platform_interface", - "sha256": "0b82c4a43552eccc92033a6504ab2ac442d9456f20132b08296bafd41a807e2f", + "sha256": "0261e2ce3520eace49e5d1e766e69a8c2613d24f0805c94e08544a139ad20e48", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_web": { "dependency": "transitive", "description": { "name": "zstandard_web", - "sha256": "a72a265fd5f1092ff916e49fa7669c306dbaf161454780d446f88e626d55804c", + "sha256": "ed0d385dab253fefbe7c42e4eb7b58d3f2425713420402cc3f3b281d5a49e8a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" }, "zstandard_windows": { "dependency": "transitive", "description": { "name": "zstandard_windows", - "sha256": "2095eae95f774973088fcbddc094a4ed11d2cac6d731911c987a0c06e743dddd", + "sha256": "86bbd10b9d563dd22eedd4df94904078ac443d8f941b79a72c4fda534da76461", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.27" + "version": "1.3.29" } }, "sdks": { diff --git a/pkgs/by-name/pr/proxypin/update-gitHashes.py b/pkgs/by-name/pr/proxypin/update-gitHashes.py new file mode 100755 index 000000000000..ffa6feb66653 --- /dev/null +++ b/pkgs/by-name/pr/proxypin/update-gitHashes.py @@ -0,0 +1,51 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix-prefetch-git + +import json +import subprocess +import sys +from pathlib import Path + +THIS_FOLDER = Path(__file__).parent.resolve() +PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json" +GIT_HASHES = THIS_FOLDER / "gitHashes.json" + + +def fetch_git_hash(url: str, rev: str) -> str: + result = subprocess.run( + ["nix-prefetch-git", "--url", url, "--rev", rev], + capture_output=True, + text=True, + check=True, + ) + return json.loads(result.stdout)["hash"] + + +def main() -> None: + if not PUBSPEC_LOCK.exists(): + sys.exit(1) + try: + data = json.loads(PUBSPEC_LOCK.read_text()) + except json.JSONDecodeError: + sys.exit(1) + output: dict[str, str] = {} + for name, info in data.get("packages", {}).items(): + if info.get("source") != "git": + continue + desc = info.get("description") + if not isinstance(desc, dict): + continue + url = desc.get("url") + rev = desc.get("resolved-ref") + if not (isinstance(url, str) and isinstance(rev, str)): + continue + try: + package_hash = fetch_git_hash(url, rev) + except subprocess.CalledProcessError: + continue + output[name] = package_hash + GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n") + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/pr/proxypin/update.sh b/pkgs/by-name/pr/proxypin/update.sh deleted file mode 100755 index a9c584fe312d..000000000000 --- a/pkgs/by-name/pr/proxypin/update.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter - -set -eou pipefail - -PACKAGE_DIR="$(realpath "$(dirname "$0")")" -cd "$PACKAGE_DIR"/.. -while ! test -f flake.nix; do cd ..; done -NIXPKGS_DIR="$PWD" - -latestVersion=$( - list-git-tags --url=https://github.com/wanghongenpin/proxypin | - rg '^v(.*)' -r '$1' | - sort --version-sort | - tail -n1 -) - -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; proxypin.version or (lib.getVersion proxypin)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "package is up-to-date: $currentVersion" - exit 0 -fi - -nix-update --version=$latestVersion proxypin - -export HOME="$(mktemp -d)" -src="$(nix-build --no-link "$NIXPKGS_DIR" -A proxypin.src)" -TMPDIR="$(mktemp -d)" -cp --recursive --no-preserve=mode "$src"/* $TMPDIR -cd $TMPDIR -flutter pub get -yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json -rm -rf $TMPDIR diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 2ab24eefb6f4..2e9226e5453d 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.264.0"; + version = "0.266.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-qpnBC8bjF59RMXXpfTWfihiwXnGIxsx2aiQZarU9VxE="; + sha256 = "sha256-9ctonJGiXRJtOzW28ZPfS2kj83fk29cWjOdLveciiXg="; }; - vendorHash = "sha256-L4hFH5w8e7c+4LK3LFE3CeMDbuljhew7XhYJ4NkQCs0="; + vendorHash = "sha256-i0yiDekaiIrbdGn2yzmbechOY9WPPU5FvZbw3WL/4KI="; ldflags = [ "-s" diff --git a/pkgs/by-name/ps/psst/make-build-reproducible.patch b/pkgs/by-name/ps/psst/make-build-reproducible.patch index 51c13958a58c..17a7e2f1095c 100644 --- a/pkgs/by-name/ps/psst/make-build-reproducible.patch +++ b/pkgs/by-name/ps/psst/make-build-reproducible.patch @@ -10,11 +10,11 @@ index 4e899af..0000000 - -fn main() { - let outdir = env::var("OUT_DIR").unwrap(); -- let outfile = format!("{}/build-time.txt", outdir); +- let outfile = format!("{outdir}/build-time.txt"); - - let mut fh = fs::File::create(outfile).unwrap(); - let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); -- write!(fh, r#""{}""#, now).ok(); +- write!(fh, r#""{now}""#).ok(); - - let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!"); - // Get Git's 'Origin' URL @@ -43,9 +43,9 @@ index 4e899af..0000000 - let trimmed_url = remote_url.trim_end_matches(".git"); - remote_url.clone_from(&String::from(trimmed_url)); - -- let outfile = format!("{}/remote-url.txt", outdir); +- let outfile = format!("{outdir}/remote-url.txt"); - let mut file = fs::File::create(outfile).unwrap(); -- write!(file, r#""{}""#, remote_url).ok(); +- write!(file, r#""{remote_url}""#).ok(); -} diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs index 2faa317..b890a2d 100644 diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix index 836c58053e58..cb051dd9c29a 100644 --- a/pkgs/by-name/ps/psst/package.nix +++ b/pkgs/by-name/ps/psst/package.nix @@ -33,16 +33,16 @@ let in rustPlatform.buildRustPackage { pname = "psst"; - version = "0-unstable-2025-04-20"; + version = "0-unstable-2025-11-16"; src = fetchFromGitHub { owner = "jpochyla"; repo = "psst"; - rev = "86169f8b05c1b3502261cfe1fae9af2487b8f1bb"; - hash = "sha256-BkGoaYflCTiElTj47r2j/ngUrZ9wIe0q4pl+zhoattA="; + rev = "cae05c43f4aee2c5936375225c4586ea35594835"; + hash = "sha256-iCm5lvZq64Dmbe/stkZO0XvX0mWfmzFgl3MeCTI6/hM="; }; - cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw="; + cargoHash = "sha256-Q4xMsX6lJK3Or+oKuPOTCec2pe+oBWC33peCE1x7QRg="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index bd79e8724b3d..56802bc73c62 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-TsYMGPL4Lru7T1p4v/gaql665JO2LIKayb3GupxYbiI="; + hash = "sha256-ZS5mwRua/IYAhA5W+EEZxttArTm+vLArA1RM8SFOK60="; }; subPackages = "cmd/esc"; diff --git a/pkgs/by-name/pw/pwninit/package.nix b/pkgs/by-name/pw/pwninit/package.nix index df48f1beac5f..0cf24cdfeff2 100644 --- a/pkgs/by-name/pw/pwninit/package.nix +++ b/pkgs/by-name/pw/pwninit/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "pwninit"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "io12"; repo = "pwninit"; rev = version; - sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE="; + sha256 = "sha256-WKOndOkaKr+dUnx61LW6ZZxUFUESerjE5W6hgLA3n1o="; }; buildInputs = [ @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; doCheck = false; # there are no tests to run - cargoHash = "sha256-N0vje5ZU7B++f71BJKwkEfpbInpermH241f6oP1/fQE="; + cargoHash = "sha256-KMvaKTNC84K6N0NAZizK9M1nP4rV4cfwlOTI/HidQYc="; meta = { description = "Automate starting binary exploit challenges"; diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index 0bb32969e0ca..b2765ada8ccb 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pyenv/pyenv"; changelog = "https://github.com/pyenv/pyenv/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ tjni ]; platforms = platforms.all; mainProgram = "pyenv"; }; diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 2a7762fded35..27699d68bda7 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, - fetchpatch, python3Packages, nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.4.7"; + version = "2.5.0"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -17,19 +16,9 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; tag = version; - hash = "sha256-rtAw6tdZY0BKb6Qjk/LHYYMB9nCPzkmw95wdjhJ191s="; + hash = "sha256-k/7Z5QGRIpGZjPeO1Em3wYcX27nxR0V2UeKZaPwAM40="; }; - patches = [ - # Remove this patch from versions higher than 2.4.7-17. - # Fixes integration with pyprland 0.52.0+. - (fetchpatch { - url = "https://github.com/hyprland-community/pyprland/commit/21c0479a52df41f15bb798e28f67daab8b1ad0e3.patch"; - hash = "sha256-QwEGdraSZmz9goCBTKQLArqQse1TP8b188uiIISshWc="; - includes = [ "pyprland/plugins/pyprland.py" ]; - }) - ]; - nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = with python3Packages; [ aiofiles ]; diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index f9aeaf438985..d3691243be57 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.43.1"; + version = "0.44.2"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-KVeuDK5f0VIMnhAMJvGMJ08tHOuuIBDPrTqO1YjsHXI="; + hash = "sha256-d0aZQkCt2Yypj2CSav585M6TuoUEwPXpz1oKLjFo6NI="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-Cc3bLBP9SxMbXQmJJVIfItOzy0iUkxLMgk4fbzNP1yw="; + cargoHash = "sha256-gXKLzD5JbG62pc0pW5sRQJvBwr1ftu/ZOOXsQ7ZdWIU="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/ql/qlementine/package.nix b/pkgs/by-name/ql/qlementine/package.nix index 836be3972496..b459f218b6f2 100644 --- a/pkgs/by-name/ql/qlementine/package.nix +++ b/pkgs/by-name/ql/qlementine/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qlementine"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "oclero"; repo = "qlementine"; tag = "v${finalAttrs.version}"; - hash = "sha256-sQp6geH0PqthSVbC+AmQfKRVykZZoAfDMjhIviYJ4RI="; + hash = "sha256-GSI77bpxPEGBajU5z92/yGkPbeImobd4EvZDf6A8+Z0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qm/qmk-udev-rules/package.nix b/pkgs/by-name/qm/qmk-udev-rules/package.nix index 5f4efb3b8593..95a9f117e287 100644 --- a/pkgs/by-name/qm/qmk-udev-rules/package.nix +++ b/pkgs/by-name/qm/qmk-udev-rules/package.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { description = "Official QMK udev rules list"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ ekleog ]; }; } diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix index 39c130310768..bb55ca9ae9c2 100644 --- a/pkgs/by-name/qm/qmk/package.nix +++ b/pkgs/by-name/qm/qmk/package.nix @@ -77,10 +77,7 @@ python3.pkgs.buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ - bhipple - ekleog - ]; + maintainers = [ ]; mainProgram = "qmk"; }; } diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/by-name/qo/qogir-kde/package.nix similarity index 100% rename from pkgs/data/themes/qogir-kde/default.nix rename to pkgs/by-name/qo/qogir-kde/package.nix diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 355fc6247757..f49da3ab9d61 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "qovery-cli"; - version = "1.55.1"; + version = "1.56.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-E/OjQkaO1ecB9o3boInBOamuY8CoXb1JAp7G9NuiQqE="; + hash = "sha256-IeK0GcYi3J86IABYfKvE3ict8AOnpuwuecqadNYcVrY="; }; vendorHash = "sha256-owsLDP2ufW0kXmWOFtAiXKx/YiKEGL0QXkRQy1uA2Uw="; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 52ff85df8297..9b0ce165c873 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.11.5"; + version = "25.12.0"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-wXPrYcIAH4X4BP3RfWtVrgHPcc+IWPZcbOFdWdV57Ec="; + hash = "sha256-NfAxTtjiLnxsamqaWluRxDcJFdtcMR8tELYcyf4C6AY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix index 4ec27077d532..162b546d2589 100644 --- a/pkgs/by-name/qp/qperf/package.nix +++ b/pkgs/by-name/qp/qperf/package.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linux-rdma/qperf"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 1b4f720e9821..813e1db6d940 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,12 +1,12 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-11-15 +# Last updated: 2025-12-03 { fetchurl }: let any-darwin = { - version = "6.9.85-2025-11-14"; + version = "6.9.86-2025-12-03"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.85_251114_01.dmg"; - hash = "sha256-1m9Kc9ejDZaCCaI/ea/7C1wHz/pX46p9VmlRb8JNv4I="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.86_251203_01.dmg"; + hash = "sha256-QzH3XYbARAgNi6WCB/9KZbON9BqpH2eWzYo6n0usCzI="; }; }; in @@ -14,17 +14,17 @@ in aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; aarch64-linux = { - version = "3.2.21-2025-11-14"; + version = "3.2.22-2025-12-03"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251114_arm64_01.deb"; - hash = "sha256-g42PDUobpnajM85ykDUVajJKfGsOGqz2EX3pA9a/fY4="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.22_251203_arm64_01.deb"; + hash = "sha256-3HBpnLkO/an/E876Q0A2mG5JNBafxUdm33DL6KLjeZk="; }; }; x86_64-linux = { - version = "3.2.21-2025-11-14"; + version = "3.2.22-2025-12-03"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251114_amd64_01.deb"; - hash = "sha256-GZyvzkCxDPzrA9TDgO9V+eaTharEGPPsfq6TuOk2KSI="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.22_251203_amd64_01.deb"; + hash = "sha256-PwBL2yRrMZTSdsY26pbLQKfguBP+pHCVfRMx6AMyvVQ="; }; }; } diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index 9c28248321ff..a1b75c8e6295 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -15,7 +15,7 @@ withUi ? true, buildFeatures ? # enable all features except self_update by default - # https://github.com/dathere/qsv/blob/10.0.0/Cargo.toml#L370 + # https://github.com/dathere/qsv/blob/11.0.2/Cargo.toml#L370 [ "apply" "feature_capable" @@ -33,7 +33,7 @@ let pname = "qsv"; - version = "10.0.0"; + version = "11.0.2"; in rustPlatform.buildRustPackage { inherit pname version buildFeatures; @@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "dathere"; repo = "qsv"; rev = version; - hash = "sha256-Jo2pC+zs3wQAaeQzg6MLySVtI0bB7hLczT62Xpb4L14="; + hash = "sha256-EuNDwzO4tVjJUz8mXI0fDczoPLD89zmbSyfFI8ZrgwU="; }; - cargoHash = "sha256-05jJslguUFLZtugozv/jn7CDie47WnvrFnjC3SUYxxo="; + cargoHash = "sha256-l8hkDr3CtpyXWDTS8oje6W0iu5O28j4rLIXprxTEwHc="; buildInputs = [ file diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix index c513a190740c..aba0d222c3a4 100644 --- a/pkgs/by-name/qt/qtappinstancemanager/package.nix +++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtappinstancemanager"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "oclero"; repo = "qtappinstancemanager"; tag = "v${finalAttrs.version}"; - hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M="; + hash = "sha256-+YkvWv5ss4O1WLDmwpueuRY72tTdXTLZeg8pVL4R3Ag="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/by-name/qt/qtpass/package.nix similarity index 76% rename from pkgs/applications/misc/qtpass/default.nix rename to pkgs/by-name/qt/qtpass/package.nix index 60cfc60bd138..702caa5e6578 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/by-name/qt/qtpass/package.nix @@ -1,29 +1,25 @@ { + stdenv, fetchFromGitHub, lib, - stdenv, + libsForQt5, git, gnupg, pass, pwgen, qrencode, - qtbase, - qtsvg, - qttools, - qmake, - wrapQtAppsHook, makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtpass"; version = "1.4.0"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; - rev = "v${version}"; - sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; }; postPatch = '' @@ -35,20 +31,20 @@ stdenv.mkDerivation rec { git gnupg pass - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook makeWrapper ]; qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: - "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + "QMAKE_LUPDATE=${libsForQt5.qttools.dev}/bin/lupdate" ]; qtWrapperArgs = [ @@ -76,12 +72,11 @@ stdenv.mkDerivation rec { install -D qtpass.1 -t $out/share/man/man1 ''; - meta = with lib; { + meta = { description = "Multi-platform GUI for pass, the standard unix password manager"; mainProgram = "qtpass"; homepage = "https://qtpass.org"; - license = licenses.gpl3; - maintainers = [ maintainers.hrdinka ]; - platforms = platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index ff7ca8eae73b..e2496d6f5a96 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.29.4"; + version = "3.30.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-ApMv7nHYBaW/L0Gvs6M8rJc3n/9yhSRtSAnWda06iak="; + hash = "sha256-1iHzvgw4xSJPldeRI50rLO/b1YVk8NuSdnU9atG0VRA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index cb5764d17f34..90fe6b5fa63f 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -11,12 +11,12 @@ }: buildGoModule (finalAttrs: { pname = "qui"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-1cIKbP+c2Tqs4uoBWvfAQGDBLqmXh17rFZDuGRYWrYA="; + hash = "sha256-PcJl9nxHPWv17AqtEok0qHhrTQ1WInUKAtxrxoSeMSw="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { sourceRoot ; fetcherVersion = 2; - hash = "sha256-4adyjeQI2+deJPgwA81FmYZCY0QEEUjVP2lF/BeXr4Q="; + hash = "sha256-bDaMax5RS+ot6vaJmNJm6p4gFaCD9aslJXI/58ua9DI="; }; postBuild = '' @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { ''; }); - vendorHash = "sha256-GaLilaRnVEIItb0yIdnf7F6KCDRPc7Gy3mgtuMwf7j4="; + vendorHash = "sha256-UF6V737MF2la24oW8oPp+0N8nv0uEykMrTbzvx/gtec="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist diff --git a/pkgs/by-name/qu/quickfix/package.nix b/pkgs/by-name/qu/quickfix/package.nix index 3dad4044a99c..6cb9c1b0c3ff 100644 --- a/pkgs/by-name/qu/quickfix/package.nix +++ b/pkgs/by-name/qu/quickfix/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { description = "C++ Fix Engine Library"; homepage = "http://www.quickfixengine.org"; license = licenses.free; # similar to BSD 4-clause - maintainers = with maintainers; [ bhipple ]; broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix index ecf3371104b7..4de8be29a192 100644 --- a/pkgs/by-name/qu/quiet/package.nix +++ b/pkgs/by-name/qu/quiet/package.nix @@ -13,7 +13,7 @@ let pname = "quiet"; - version = "6.3.0"; + version = "6.4.1"; meta = { description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS"; @@ -39,7 +39,7 @@ let src = fetchurl { url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage"; - hash = "sha256-LRUm2QMYg2oD6USOUYRyNUDf1VHu2txsaCUhbi1Ar5o="; + hash = "sha256-CAJgd7d0Fq6pEKLNAojE7krKJCpBBjhyOTsgYEPz0DY="; }; meta = meta // { @@ -52,7 +52,7 @@ let src = fetchurl { url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.dmg"; - hash = "sha256-T3EDgQ2DhYttbRjAklhw/C4paUzkdEx6i6Gi+Jx1N+w="; + hash = "sha256-wg2WyQ6y/wBcRuhhY8EyacKy4Xwfo1SKdeTJw/OIjMc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index d3ed2b227290..57ed53114e6c 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quill-log"; - version = "11.0.1"; + version = "11.0.2"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; tag = "v${finalAttrs.version}"; - hash = "sha256-h5vjHyhAVPcVZJFKbXFm2eUbesI088XkA7HZCCx9jzc="; + hash = "sha256-b5kHxvjmTea5HU9gTvizFwhG2zwOJSPlf30XKEhxe8w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index 5dbda57817f2..ee074b4be32d 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -35,7 +35,7 @@ let stripRoot = false; }; - version = "3.6.2"; + version = "3.6.3"; in python3.pkgs.buildPythonApplication { @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-GfSkVluSwcCAvLPlW49QLmyWblTrnW9Qgqne0Qy8JJM="; + hash = "sha256-bb4oieYevWMAOuQLMZ4egfMG6SToMWxnla5IhAIcL68="; }; # Needs tox @@ -168,7 +168,6 @@ python3.pkgs.buildPythonApplication { mainProgram = "qutebrowser"; platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms; maintainers = with lib.maintainers; [ - jagajaga rnhmjoj ebzzry dotlambda diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index eb2806e34b2d..53f9d474bc31 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-RMnsT+5X8LhtuGVNG5Dfgamj+oWCZNgNbyJn78HH3gI="; + hash = "sha256-B7dL0pWSCPwPKwwTHycgC3/qHB66AUWZc62sen7U/7c="; }; - npmDepsHash = "sha256-qVQ6akW6OhBCnOc5f0Tej9YzvRjNfhxonovLydv9Jvc="; + npmDepsHash = "sha256-SPb+TSi4MCiAr9ruS1Idg3KfTbX6gtMK7f/+vdnabt8="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index 95845b49ffff..c2ad46d75b4c 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-93P4rKBSbs31uofl4AuVQQWVSRVOsKsykIG13p8zIkI="; + hash = "sha256-soOu6JyS/SEdwUngOUd0suImr70naZms9Zy2pRwBn5E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index 24eaa117f690..dbb63965acde 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-rnW8itUsP2a09gQU3IXZI7kSVKIxxCgbt15NoH/g0a8="; + hash = "sha256-Z+KCeRTkbHi1vRU/MkkOgaYVQikFkX0OgkncOLsgsQc="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index 82afd09abc68..686830ac1118 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rabbitmqadmin-ng"; - version = "2.15.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "rabbitmqadmin-ng"; tag = "v${version}"; - hash = "sha256-OaSCqK3VwR5b6tQUfGFM/clHynwG0TgMy2ZEcFsLFx0="; + hash = "sha256-Qz6wfATt7BU1IlrThQpu3UetUWuLz/Y1WKBvsqisUxY="; }; - cargoHash = "sha256-dynUbe6UCVdPEpy+fXABhzSsrF/OV5z1eMvrXtzKs70="; + cargoHash = "sha256-spGJUY99jF/aZPDxoplPJ+1XHIreqDzxzlD0Ti4IZ68="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix index c0c3590450c7..90f60bb6d22c 100644 --- a/pkgs/by-name/ra/radarr/package.nix +++ b/pkgs/by-name/ra/radarr/package.nix @@ -194,7 +194,6 @@ buildDotnetModule { changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - edwtjo purcell nyanloutre ]; diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index 56c779ae0459..e9215823f40c 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -7,20 +7,21 @@ gitMinimal, sqlite, radicle-node, + writableTmpDirAsHomeHook, versionCheckHook, nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-ci-broker"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "zwTxygwuz5LDGBq255RA2CbNGrz8"; node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLsrn8a+lBH0PM8Wp7UmUcT+sd4NS/CJk/Bd70Hs9i8="; + hash = "sha256-E9i5EhzI+9PX2Sm2nNyB5SMi6F/EmjifeD0futPBi6k="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head @@ -28,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-F2OG4bV5q4k1bi4NFqxaDPw0UnAM15kNH2u2Qp/kauk="; + cargoHash = "sha256-RlqomX4XiKn/YuCdBh6H/y+8JFBwC06eDEAmhz71UXs="; postPatch = '' substituteInPlace build.rs \ @@ -41,6 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: { preCheck = '' ln -s "$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType" target/debug + + rad auth --alias alice --stdin =3.0.0 || insiders || >=4.0.0-alpha.20' + +- '@tauri-apps/api@2.0.3': +- resolution: {integrity: sha512-840qk6n8rbXBXMA5/aAgTYsg5JAubKO0nXw5wf7IzGnUuYKGbB4oFBIZtXOIWy+E0kNTDI3qhq5iqsoMJfwp8g==} ++ '@tauri-apps/api@2.2.0': ++ resolution: {integrity: sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg==} + + '@tauri-apps/cli-darwin-arm64@2.0.4': + resolution: {integrity: sha512-siH7rOHobb16rPbc11k64p1mxIpiRCkWmzs2qmL5IX21Gx9K5onI3Tk67Oqpf2uNupbYzItrOttaDT4NHFC7tw==} +@@ -582,23 +582,23 @@ packages: + engines: {node: '>= 10'} + hasBin: true + +- '@tauri-apps/plugin-autostart@2.0.0': +- resolution: {integrity: sha512-NEwOQWVasZ8RczXkMLNJokRDujneuMH/UFA5t84DLkbNZUmiD3G7HZWhgSd1YQ0BFU9h9w+h2B/py3y6bzWg4Q==} ++ '@tauri-apps/plugin-autostart@2.2.0': ++ resolution: {integrity: sha512-TzVcDZdOvdot0avkpstUWJKKEl4cyxLpFB9DZZRW5zH8k+Bv8IVJmO0zyYuw+7oKlGdHOINbD/7Je7GHMViw5w==} + +- '@tauri-apps/plugin-clipboard-manager@2.0.0': +- resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==} ++ '@tauri-apps/plugin-clipboard-manager@2.2.3': ++ resolution: {integrity: sha512-myZTLyBpJ9gnDsywtdgRpAYLxEtSVaJa11s1xoiB6w8cjFtG2/znas4Cz3vqYigJkY0A57tyZUE6tjxavIAzgw==} + +- '@tauri-apps/plugin-dialog@2.0.1': +- resolution: {integrity: sha512-fnUrNr6EfvTqdls/ufusU7h6UbNFzLKvHk/zTuOiBq01R3dTODqwctZlzakdbfSp/7pNwTKvgKTAgl/NAP/Z0Q==} ++ '@tauri-apps/plugin-dialog@2.2.2': ++ resolution: {integrity: sha512-Pm9qnXQq8ZVhAMFSEPwxvh+nWb2mk7LASVlNEHYaksHvcz8P6+ElR5U5dNL9Ofrm+uwhh1/gYKWswK8JJJAh6A==} + +- '@tauri-apps/plugin-notification@2.0.0': +- resolution: {integrity: sha512-6qEDYJS7mgXZWLXA0EFL+DVCJh8sJlzSoyw6B50pxhLPVFjc5Vr5DVzl5W3mUHaYhod5wsC984eQnlCCGqxYDA==} ++ '@tauri-apps/plugin-notification@2.2.3': ++ resolution: {integrity: sha512-IlMdSVFsrKg0eIHBloFFosnWbbz6JdwBywfZrYZnE1+acgXvNS3T1YB5w9R6UXw+KKQ94ODBu7JF7a1YUiAK6A==} + +- '@tauri-apps/plugin-shell@2.0.1': +- resolution: {integrity: sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==} ++ '@tauri-apps/plugin-shell@2.2.2': ++ resolution: {integrity: sha512-fg9XKWfzRQsN8p+Zrk82WeHvXFvGVnG0/mTlujQdLWNnO5cM6WD9qCrHbFytScVS+WhmRAkuypQPcxeKKl3VBg==} + +- '@tauri-apps/plugin-store@2.1.0': +- resolution: {integrity: sha512-GADqrc17opUKYIAKnGHIUgEeTZ2wJGu1ZITKQ1WMuOFdv8fvXRFBAqsqPjE3opgWohbczX6e1NpwmZK1AnuWVw==} ++ '@tauri-apps/plugin-store@2.2.1': ++ resolution: {integrity: sha512-/hPafeliMe0tMc8NB9tSlkAH+Ww3H7BGD8NycjfY6QBM//0jSoqCO1QGdngPxugeF5NgUNspsVkpvpTz1lLAVQ==} + + '@types/cacheable-request@6.0.3': + resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} +@@ -2671,7 +2671,7 @@ snapshots: + postcss-selector-parser: 6.0.10 + tailwindcss: 3.4.14 + +- '@tauri-apps/api@2.0.3': {} ++ '@tauri-apps/api@2.2.0': {} + + '@tauri-apps/cli-darwin-arm64@2.0.4': + optional: true +@@ -2716,29 +2716,29 @@ snapshots: + '@tauri-apps/cli-win32-ia32-msvc': 2.0.4 + '@tauri-apps/cli-win32-x64-msvc': 2.0.4 + +- '@tauri-apps/plugin-autostart@2.0.0': ++ '@tauri-apps/plugin-autostart@2.2.0': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + +- '@tauri-apps/plugin-clipboard-manager@2.0.0': ++ '@tauri-apps/plugin-clipboard-manager@2.2.3': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + +- '@tauri-apps/plugin-dialog@2.0.1': ++ '@tauri-apps/plugin-dialog@2.2.2': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + +- '@tauri-apps/plugin-notification@2.0.0': ++ '@tauri-apps/plugin-notification@2.2.3': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + +- '@tauri-apps/plugin-shell@2.0.1': ++ '@tauri-apps/plugin-shell@2.2.2': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + +- '@tauri-apps/plugin-store@2.1.0': ++ '@tauri-apps/plugin-store@2.2.1': + dependencies: +- '@tauri-apps/api': 2.0.3 ++ '@tauri-apps/api': 2.2.0 + + '@types/cacheable-request@6.0.3': + dependencies: diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 6bc5c93307d0..27e1afea57ec 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -27,7 +27,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA="; }; - patches = [ ./fix-pnpm-outdated-lockfile.patch ]; + patches = [ + ./fix-pnpm-outdated-lockfile.patch + ./fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch + ]; # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -45,7 +48,7 @@ rustPlatform.buildRustPackage rec { ; postPatch = "cd ${pnpmRoot}"; fetcherVersion = 1; - hash = "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE="; + hash = "sha256-VbdMaIEL1e+0U+ny4qbk1Mmkuc3cahKakKKYowCBK5Q="; }; cargoRoot = "app/main/src-tauri"; @@ -89,8 +92,9 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Plus; mainProgram = "rquickshare"; maintainers = with lib.maintainers; [ - perchun + PerchunPak luftmensch-luftmensch + sarunint ]; }; } diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 86ebff4bccfd..98d94aabdf7e 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ avnik fpletz - globin lewo ]; platforms = with platforms; linux; diff --git a/pkgs/by-name/rs/rss2email/package.nix b/pkgs/by-name/rs/rss2email/package.nix index 3ad52d6d5d7d..5e31a86deb2d 100644 --- a/pkgs/by-name/rs/rss2email/package.nix +++ b/pkgs/by-name/rs/rss2email/package.nix @@ -75,7 +75,6 @@ python3Packages.buildPythonApplication rec { description = "Tool that converts RSS/Atom newsfeeds to email"; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; - maintainers = with maintainers; [ ekleog ]; mainProgram = "r2e"; }; passthru.tests = { diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 9fcf2f051d1c..96cae1777c00 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -87,13 +87,13 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2025.09.1+401"; + version = "2025.09.2+418"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-FVK/1trMVFEv17HbUpaISC9gyE2HBKtdZWjxbgdXALc="; + hash = "sha256-UFhvNLamKZQ9IBjEtDvSPOUILqGphDDOVb7ZZ8dnfVU="; }; # sources fetched into _deps via cmake's FetchContent @@ -244,7 +244,7 @@ stdenv.mkDerivation rec { name = "rstudio-${version}-npm-deps"; inherit src; postPatch = "cd ${npmRoot}"; - hash = "sha256-HfJsm/UauA5Vdi22WfTJGiI9K979Sw7RYApYdZU0AUs="; + hash = "sha256-/5GgRusDRyBMr5581ypTMzhqkvjpzYBaniFos524bEw="; }; preConfigure = '' diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix index 2667bdc92663..572a115a1734 100644 --- a/pkgs/by-name/rt/rtg-tools/package.nix +++ b/pkgs/by-name/rt/rtg-tools/package.nix @@ -11,14 +11,14 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtg-tools"; version = "3.13"; src = fetchFromGitHub { owner = "RealTimeGenomics"; repo = "rtg-tools"; - rev = version; + rev = finalAttrs.version; hash = "sha256-vPzKrgnX6BCQmn9aOVWWpFLC6SbPBHZhZ+oL1LCbvmo="; }; @@ -59,11 +59,12 @@ stdenv.mkDerivation rec { ant runalltests ''; - meta = with lib; { + meta = { homepage = "https://github.com/RealTimeGenomics/rtg-tools"; description = "Useful utilities for dealing with VCF files and sequence data, especially vcfeval"; - license = licenses.bsd2; + license = lib.licenses.bsd2; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ apraga ]; + maintainers = with lib.maintainers; [ apraga ]; + mainProgram = "rtg"; }; -} +}) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 295fcbc57c35..d74c1298fb9d 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtorrent"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-ut1R73UfkpDk/Y5Fq8kSavxIB3Y2jbYEQ8J/559Ech0="; + hash = "sha256-zncal17A4/+WGU3L8iJVSMJtKTKNmMHCXJ2O7Za2VOE="; }; outputs = [ diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 381ad6acfb35..cc2c53592271 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.14.7"; + version = "0.14.8"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-7ZgA5e2Cd2xb/jlo0CrEJYKWAAsvyml2KBnhHRimduo="; + hash = "sha256-jL3zQS2F9pxsWolNKgw8Tn53DHragGwonNmNV8t8h80="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-2RXFT3ERzw1VpwGnLrS8bsrx4B5xLU6yQkwXAQuR/iM="; + cargoHash = "sha256-GEf/gU2DXz+u7kPHAB1NRqkmn0f7NV3M5U9u17adtkI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 6c86e78d6450..5abc7a0d04dd 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2025-11-29"; + version = "0.2.0-nightly-2025-12-06"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-CGeLCbmACKDKfnqbrqfOSc1MNVL14rHjFMl3ZbS7/Co="; + hash = "sha256-p+PmU08XY6RCGKPgoViEXPUlDwWmXnrdkLGxrLtzYx8="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-B4q2OhzAc5zy0BUPlK+ABBCbW1nea4azu057h3F1KZo="; + cargoHash = "sha256-mPy6wEhWfhUyJ9euqbEcATZt8cr21t+J+atpBt7ixUo="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = diff --git a/pkgs/by-name/ru/run/package.nix b/pkgs/by-name/ru/run/package.nix index 759f97102aca..438826b60a05 100644 --- a/pkgs/by-name/ru/run/package.nix +++ b/pkgs/by-name/ru/run/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ rawkode - Br1ght0ne ]; }; } diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix index c4db2753e748..0b58f28124cd 100644 --- a/pkgs/by-name/ru/runme/package.nix +++ b/pkgs/by-name/ru/runme/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "runme"; - version = "3.16.1"; + version = "3.16.4"; src = fetchFromGitHub { owner = "runmedev"; repo = "runme"; rev = "v${version}"; - hash = "sha256-cIlX2RvZ5jIdh7+EvjIb8KC4b/3rhkinUsomkJIBYMw="; + hash = "sha256-2uJl7lfYS3b4SgiXLYmf6UcNnYDQMaVkfkhlLDqCukE="; }; - vendorHash = "sha256-cGoeRjUB5py8yMvWrw2NaRaVb0kcYxXC1eD4cJNsqz8="; + vendorHash = "sha256-msRPjX3oYRLRwK4j7WDtERYh+6b67QQEw/EDS3+bY8k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 1fed18c9ee50..ba519b5d56a8 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "runpodctl"; - version = "1.14.14"; + version = "1.14.15"; src = fetchFromGitHub { owner = "runpod"; repo = "runpodctl"; rev = "v${version}"; - hash = "sha256-BwXHwVdR3C/3SSxGbFfB79I3FKDbbiIzl592KqfESVc="; + hash = "sha256-D1B5j1HYSXDgr1vW8kHzCohu3HiDljTEhQhzfa5q/Us="; }; - vendorHash = "sha256-SaaHVaN2r3DhUk7sVizhRggYZRujd+e8qbpq0xOVD88="; + vendorHash = "sha256-/0kNURJHIRS1thqEe8d+SAsm8NPOEJa//g9tyswrvFg="; postInstall = '' rm $out/bin/docs # remove the docs binary diff --git a/pkgs/by-name/ru/ruplacer/package.nix b/pkgs/by-name/ru/ruplacer/package.nix index 6bfe29ef0827..796bd3a57cda 100644 --- a/pkgs/by-name/ru/ruplacer/package.nix +++ b/pkgs/by-name/ru/ruplacer/package.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { mainProgram = "ruplacer"; homepage = "https://github.com/TankerHQ/ruplacer"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/by-name/ru/rust-paddle-ocr/package.nix b/pkgs/by-name/ru/rust-paddle-ocr/package.nix new file mode 100644 index 000000000000..a683d19eae39 --- /dev/null +++ b/pkgs/by-name/ru/rust-paddle-ocr/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cmake, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rust-paddle-ocr"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "zibo-chen"; + repo = "rust-paddle-ocr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sDr7oTt9m02u52tuZzuSqKO8s4rIdhMRirzif8Lp2+g="; + }; + + cargoHash = "sha256-fNtKnAPcJrjnbl7wqn+iDmf/HRQzex1oCfY3h11rrSM="; + + buildFeatures = [ "v5" ]; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + cmake + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightweight and efficient OCR"; + homepage = "https://github.com/zibo-chen/rust-paddle-ocr"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ linsui ]; + mainProgram = "ocr"; + }; +}) diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix index ec655a6ee1aa..10795b672dd4 100644 --- a/pkgs/by-name/ru/rust-petname/package.nix +++ b/pkgs/by-name/ru/rust-petname/package.nix @@ -2,25 +2,33 @@ lib, rustPlatform, fetchCrate, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-petname"; version = "2.0.2"; src = fetchCrate { - inherit version; + inherit (finalAttrs) version; crateName = "petname"; hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; }; cargoHash = "sha256-gZxZeirvGHwm8C87HdCBYr30+0bbjwnWxIQzcLgl3iQ="; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Generate human readable random names"; homepage = "https://github.com/allenap/rust-petname"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "petname"; }; -} +}) diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 23617a6a1bf3..c4e42b91fafb 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -30,11 +30,13 @@ yq, callPackage, addDriverRunpath, + perl, + openssl, }: let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.1/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.4/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -64,18 +66,19 @@ let in flutter329.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; tag = version; fetchSubmodules = true; - hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ="; + hash = "sha256-o7jsVWiCkHaKFpAu27r/Lr1Q9g7uR/OYJdwsiQeDJUA="; }; strictDeps = true; env.VCPKG_ROOT = "/homeless-shelter"; # idk man, makes the build go since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 + env.OPENSSL_NO_VENDOR = true; # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; @@ -92,7 +95,7 @@ flutter329.buildFlutterApplication rec { src patches ; - hash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw="; + hash = "sha256-gd2vS+p+1QtOWZcRWJWahFGo5rFG+soqxx3vJYSYJUo="; }; dontCargoBuild = true; @@ -116,6 +119,7 @@ flutter329.buildFlutterApplication rec { rustPlatform.bindgenHook ffigen yq + perl ]; buildInputs = [ @@ -135,6 +139,7 @@ flutter329.buildFlutterApplication rec { libyuv pam xdotool + openssl ]; prePatch = '' diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 29c7b81c4b5d..34f0e6d0f617 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gaelreyrol - tjni ]; }; } diff --git a/pkgs/by-name/ru/rusthound-ce/package.nix b/pkgs/by-name/ru/rusthound-ce/package.nix index a276f6b342f1..3f298490e3f0 100644 --- a/pkgs/by-name/ru/rusthound-ce/package.nix +++ b/pkgs/by-name/ru/rusthound-ce/package.nix @@ -9,14 +9,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rusthound-ce"; - version = "2.4.4"; + version = "2.4.5"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-WkqelaUTg6GoCoZa/DB5o40Cpfh9iAS0qrSgVwnMrHM="; + hash = "sha256-KqcBhag1NOkZxcuS+J48kwJpCoZ1PZv2S10XXwuIoWc="; }; - cargoHash = "sha256-LLq9Nzx/0UgGPQSPUVFpRmEpRBZwUJIaAKdM5j+mvCI="; + cargoHash = "sha256-4+iqFmpTzoL/sn/Fxji3czcX3XthHDv1Az+5IVMN3gI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 654f6d86ce88..b4bd076b61b4 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.10.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-SSOGFWoZKD0GUwNUG/44IS+w0qlm+J/kC/LqTtO01aE="; + hash = "sha256-xsekMo4ALrY/3wGNQCwzOU2V2j5+Z45aresMeWHsnVk="; }; - cargoHash = "sha256-kN5h/0+YOBKpcLWxksGL6gRfJFmPb0sREG84g3Q6S/g="; + cargoHash = "sha256-QgN6HDNVqY+KSX35uH5+WY4N5DL8r4pt/4OD6uEV6jE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index fc08a07fffae..f302e4fc91df 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk="; + hash = "sha256-lp9XvILpvNZtffJLyDUCo5Xyor4X4bwsfxAIqS8Hf7M="; }; - cargoHash = "sha256-NuOOg9aIa0JW+urxDVaPn66bS4H7+0tbKYNVDUV8D80="; + cargoHash = "sha256-aGy29kGwCKHBNzszYR+w+1m8gZ/lFd0MOlFHtDDzjj4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix index 23be134066d7..44ec141ac8c8 100644 --- a/pkgs/by-name/rx/rx/package.nix +++ b/pkgs/by-name/rx/rx/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ minijackson - Br1ght0ne ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/s4/s4cmd/package.nix b/pkgs/by-name/s4/s4cmd/package.nix index ef5ff67afc13..89f3f479ec32 100644 --- a/pkgs/by-name/s4/s4cmd/package.nix +++ b/pkgs/by-name/s4/s4cmd/package.nix @@ -42,6 +42,5 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; license = licenses.asl20; - maintainers = [ maintainers.bhipple ]; }; } diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 99109352a206..f0edaee10874 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2025-12-02"; + version = "11.7-unstable-2025-12-08"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "d039a7b54db491a701c0a737269ed944eb0e90d2"; - hash = "sha256-gV1hnZe4E8pTxn3w7c/m1aHF3Cwuod0wJED4MPvFxkI="; + rev = "e0859623d8780e26b201f2d34c9e7bfde31331fb"; + hash = "sha256-k7qHTdBUhQDgOF/6Nde9RU/XTA3Neoiq7rIQ9jGWGFs="; }; buildInputs = diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 74a29750c4ae..60c45f766988 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "safecloset"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; rev = "v${version}"; - hash = "sha256-pTfslMZmP8YzLzTru3b64qQ9qefkPzo9V8/S6eSQBgM="; + hash = "sha256-ZLAgSD03Qfoz+uGjVJF7vCkV1pUWqw6yG/9+redbQQ8="; }; - cargoHash = "sha256-b0MD30IJRp06qkYsQsiEI7c4ArY3GCSIh8I16/4eom0="; + cargoHash = "sha256-BSWUWB8OrdmDtU+cGCVp75hakpdd9G3cs9ythDn4nnY="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix index a594c707256b..bc4223cea5af 100644 --- a/pkgs/by-name/sa/sage/package.nix +++ b/pkgs/by-name/sa/sage/package.nix @@ -10,7 +10,7 @@ # is always preferred, see `sage-src.nix` for that. let - inherit (pkgs) symlinkJoin callPackage nodePackages; + inherit (pkgs) symlinkJoin callPackage mathjax; python3 = pkgs.python3 // { pkgs = pkgs.python3.pkgs.overrideScope ( @@ -66,7 +66,7 @@ let inherit singular maxima; inherit three; cysignals = python3.pkgs.cysignals; - mathjax = nodePackages.mathjax; + mathjax = mathjax; }; # The shell file that gets sourced on every sage start. Will also source diff --git a/pkgs/by-name/sa/samira/package.nix b/pkgs/by-name/sa/samira/package.nix index c9c1e7a63ebe..36fa1e194556 100644 --- a/pkgs/by-name/sa/samira/package.nix +++ b/pkgs/by-name/sa/samira/package.nix @@ -83,6 +83,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # the libsteam_api.so supports only x86_64-linux platforms = [ "x86_64-linux" ]; mainProgram = "samira"; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; }) diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index da3957eada9d..8d5200bbd9a4 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/paulp/sbt-extras"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - nequissimus puffnfresh ]; mainProgram = "sbt"; diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index ee4735693da9..ce882979f190 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; + passthru.updateScript = ./update.sh; + meta = { description = "Opinionated code formatter for Scala"; homepage = "http://scalameta.org/scalafmt"; diff --git a/pkgs/by-name/sc/scalafmt/update.sh b/pkgs/by-name/sc/scalafmt/update.sh new file mode 100755 index 000000000000..70b9496ee741 --- /dev/null +++ b/pkgs/by-name/sc/scalafmt/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq gnused nix + +set -euo pipefail + +latest_version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/scalameta/scalafmt/releases/latest | jq -r '.tag_name' | sed 's/^v//') + +current_version=$(nix-instantiate --eval -A scalafmt.version | jq -r) + +if [[ "$current_version" == "$latest_version" ]]; then + echo "Already up to date, nothing to do." + exit 0 +fi + +echo "Updating scalafmt: $current_version -> $latest_version" + +package_dir="$(dirname "${BASH_SOURCE[0]}")" +package_nix="$package_dir/package.nix" + +sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$package_nix" + +build_output=$(nix-build -A scalafmt 2>&1) || true + +if echo "$build_output" | grep -q "hash mismatch"; then + new_deps_hash=$(echo "$build_output" | grep "got:" | sed -n 's/.*got:[[:space:]]*\(sha256-[A-Za-z0-9+/=]*\).*/\1/p' | head -1) + if [[ -n "$new_deps_hash" ]]; then + sed -i "s|outputHash = \"sha256-[A-Za-z0-9+/=]*\"|outputHash = \"$new_deps_hash\"|" "$package_nix" + else + echo "Could not extract new hash from build output, build output:" + echo "$build_output" + exit 1 + fi +else + echo "Unexpected: Build succeeded without hash mismatch, build output:" + echo "$build_output" + exit 1 +fi diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index 2ceadef98100..d1efe2a2b1bc 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "scaleway-cli"; - version = "2.46.0"; + version = "2.47.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kmLXChIzz3VRnD6zw0JrPMIRpkVsderd2CC0ytwx47k="; + hash = "sha256-SV3fwEOGLttfpCsQTMfzsSviJ+YIDzZZXUHBCDPtF6g="; }; - vendorHash = "sha256-PBHsVMWamtAdojBicxshwilrETrP9hyy9Vq8YRMVzyM="; + vendorHash = "sha256-KbjdNGIvvKnv4bbV8YhXYCY0F94C/CUtXiyEnnF2eeA="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 11a32d69724b..9753e2f8b913 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-AY2Iy7MwZ0OmNdv9EPgJ79Ug8pDuxlVNtLRhlX+XCC4="; + hash = "sha256-JP5sSE9xWAB9yVuFh74s85zh9y4t8f+VwUVmn6iMPFI="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix index 2dedc510192b..2ff8e4b17d07 100644 --- a/pkgs/by-name/sc/scc/package.nix +++ b/pkgs/by-name/sc/scc/package.nix @@ -24,7 +24,6 @@ buildGoModule rec { description = "Very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; maintainers = with maintainers; [ sigma - Br1ght0ne ]; license = with licenses; [ mit diff --git a/pkgs/by-name/sc/scom/package.nix b/pkgs/by-name/sc/scom/package.nix index 7f41fed11291..b17e053d819b 100644 --- a/pkgs/by-name/sc/scom/package.nix +++ b/pkgs/by-name/sc/scom/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finaAttrs: { pname = "scom"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "crash-systems"; repo = "scom"; tag = finaAttrs.version; - hash = "sha256-erHer9oeCFwenaEDk/RWYzGkrqigpwB+RPa+UVxFrOI="; + hash = "sha256-eFnCXMrks5V6o+0+vMjR8zaCdkc+hC3trSS+pOh4Y6U="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix index 907dc200d2ae..0d50df41fc38 100644 --- a/pkgs/by-name/sc/scs/package.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -67,6 +67,5 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/cvxgrp/scs/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ bhipple ]; }; }) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index c47b15a164ab..1ee22a2e3e9b 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -4,7 +4,6 @@ cmake, darwin, fetchFromGitHub, - fetchpatch2, libGLU, libiconv, libX11, @@ -28,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "SDL_compat"; - version = "1.2.70"; + version = "1.2.72"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl12-compat"; rev = "release-" + finalAttrs.version; - hash = "sha256-vmbkeBpuzgq1B/6rp9/Gy8+Y7aF5uz8lC/mK0uA9v7I="; + hash = "sha256-dTBsbLJFQSaWWhn1+CCQopq7sBONxvlaAximmo3iYVM="; }; nativeBuildInputs = [ @@ -90,12 +89,6 @@ stdenv.mkDerivation (finalAttrs: { # adds their include and library paths to environment variables. The sdl-config # is patched to use these variables to produce correct flags for compiler. ./find-headers.patch - - # https://github.com/libsdl-org/sdl12-compat/issues/382 - (fetchpatch2 { - url = "https://github.com/libsdl-org/sdl12-compat/commit/bef8f7412dd44edc4f7e14dc35d3b20399e25496.patch?full_index=1"; - hash = "sha256-5kJawjmA8C3uH3OIXHmqQjnIRtoTJtXmm3iLxG3e1qc="; - }) ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix index 0ce34e4b96bf..0285eb98ca95 100644 --- a/pkgs/by-name/sd/sd/package.nix +++ b/pkgs/by-name/sd/sd/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ amar1729 - Br1ght0ne ]; }; } diff --git a/pkgs/data/themes/sddm-astronaut/default.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix similarity index 90% rename from pkgs/data/themes/sddm-astronaut/default.nix rename to pkgs/by-name/sd/sddm-astronaut/package.nix index 21bf75833449..330c0ca4f122 100644 --- a/pkgs/data/themes/sddm-astronaut/default.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -1,7 +1,9 @@ { - pkgs, lib, stdenvNoCC, + fetchFromGitHub, + kdePackages, + formats, themeConfig ? null, embeddedTheme ? "astronaut", }: @@ -9,7 +11,7 @@ stdenvNoCC.mkDerivation rec { pname = "sddm-astronaut"; version = "1.0-unstable-2025-01-05"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "Keyitdev"; repo = "sddm-astronaut-theme"; rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3"; @@ -18,7 +20,7 @@ stdenvNoCC.mkDerivation rec { dontWrapQtApps = true; - propagatedBuildInputs = with pkgs.kdePackages; [ + propagatedBuildInputs = with kdePackages; [ qtsvg qtmultimedia qtvirtualkeyboard @@ -26,7 +28,7 @@ stdenvNoCC.mkDerivation rec { installPhase = let - iniFormat = pkgs.formats.ini { }; + iniFormat = formats.ini { }; configFile = iniFormat.generate "" { General = themeConfig; }; basePath = "$out/share/sddm/themes/sddm-astronaut-theme"; diff --git a/pkgs/data/themes/chili-sddm/default.nix b/pkgs/by-name/sd/sddm-chili-theme/package.nix similarity index 92% rename from pkgs/data/themes/chili-sddm/default.nix rename to pkgs/by-name/sd/sddm-chili-theme/package.nix index cb6939b3d3e4..a08e87b6982e 100644 --- a/pkgs/data/themes/chili-sddm/default.nix +++ b/pkgs/by-name/sd/sddm-chili-theme/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtgraphicaleffects, + libsForQt5, themeConfig ? { }, }: let @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ - qtgraphicaleffects + libsForQt5.qtgraphicaleffects ]; dontWrapQtApps = true; @@ -46,7 +46,7 @@ stdenv.mkDerivation { postFixup = '' mkdir -p $out/nix-support - echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages + echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages ''; meta = with lib; { license = licenses.gpl3; diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/by-name/sd/sddm-sugar-dark/package.nix similarity index 72% rename from pkgs/data/themes/sddm-sugar-dark/default.nix rename to pkgs/by-name/sd/sddm-sugar-dark/package.nix index 0f10a916cf95..162f8e4ec266 100644 --- a/pkgs/data/themes/sddm-sugar-dark/default.nix +++ b/pkgs/by-name/sd/sddm-sugar-dark/package.nix @@ -1,28 +1,30 @@ { - pkgs, lib, stdenvNoCC, + fetchFromGitHub, + formats, + libsForQt5, themeConfig ? null, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sddm-sugar-dark"; version = "1.2"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "MarianArlt"; repo = "sddm-sugar-dark"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8="; }; dontWrapQtApps = true; - buildInputs = with pkgs.libsForQt5.qt5; [ qtgraphicaleffects ]; + buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ]; installPhase = let - iniFormat = pkgs.formats.ini { }; + iniFormat = formats.ini { }; configFile = iniFormat.generate "" { General = themeConfig; }; basePath = "$out/share/sddm/themes/sugar-dark"; @@ -37,10 +39,9 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Dark SDDM theme from the sugar family"; - homepage = "https://github.com/${src.owner}/${pname}"; + homepage = "https://github.com/MarianArlt/sddm-sugar-dark"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danid3v ]; }; -} +}) diff --git a/pkgs/by-name/sd/sdl3-shadercross/package.nix b/pkgs/by-name/sd/sdl3-shadercross/package.nix new file mode 100644 index 000000000000..d1ce92a2bc34 --- /dev/null +++ b/pkgs/by-name/sd/sdl3-shadercross/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + sdl3, + spirv-cross, + directx-shader-compiler, + nix-update-script, + runCommand, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdl3-shadercross"; + version = "0-unstable-2025-12-06"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_shadercross"; + rev = "f1ca8cfefba8f32095861bbcf2a4f4d773f0fbb4"; + hash = "sha256-q0iEoN8+f438ScgAvobDh7evulfaZ3Cd8zkc19kRT54="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + sdl3 + spirv-cross + directx-shader-compiler + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "SDLSHADERCROSS_INSTALL" true) + (lib.cmakeBool "SDLSHADERCROSS_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + passthru.tests.example = runCommand "compile-spv-example" { } '' + cat > example.vert.hlsl << EOF + struct Input + { + float4 position : POSITION; + float3 color : COLOR; + }; + float3 main(in Input IN) : COLOR + { + return IN.color; + }; + EOF + ${lib.getExe finalAttrs.finalPackage} example.vert.hlsl -o example.spv + touch $out + ''; + + meta = { + description = "Shader translation library"; + mainProgram = "shadercross"; + homepage = "https://github.com/libsdl-org/SDL_shadercross"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ nyxonios ]; + teams = [ lib.teams.sdl ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index b8d2b7d6044d..8a27e346b042 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-11-28"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "cbfc87488e446c446d5b5ded1d99a0df2273d499"; - hash = "sha256-Za1TtweRWKiwJfvtjvaM+HMFjRgx7GTcg4S4xCRTcNE="; + rev = "2b71fffae463ecaa08391c86cfd8a9f1842389af"; + hash = "sha256-DD93UoxfBp95TLYnBna9Z3LmBoy4tZ5s5ZXSprP47yU="; }; dontBuild = true; diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 562220f0386a..203ac01b72c9 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -12,6 +12,7 @@ dsdcc, faad2, fetchFromGitHub, + fetchpatch, fftwFloat, flac, glew, @@ -51,6 +52,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k="; }; + patches = [ + # Fix build with Qt 6.10, remove when the commit reaches a release + (fetchpatch { + url = "https://github.com/f4exb/sdrangel/commit/fd6a8d51f8c39fd31b4e864f528bf1921ebd4260.patch"; + hash = "sha256-S8LQbCTEgyEt1wByDsDMqqyQjK5HALtvUIODgQ1skSA="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/se/seadrive-fuse/package.nix b/pkgs/by-name/se/seadrive-fuse/package.nix new file mode 100644 index 000000000000..94f0dca9b822 --- /dev/null +++ b/pkgs/by-name/se/seadrive-fuse/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + nix-update-script, + fetchFromGitHub, + autoreconfHook, + curl, + libargon2, + libevent, + libsearpc, + libuuid, + pkg-config, + python3, + sqlite, + vala, + libwebsockets, + fuse, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "seadrive-fuse"; + version = "3.0.18"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seadrive-fuse"; + rev = "v${finalAttrs.version}"; + hash = "sha256-oMi297ORIKdJhuYOvazJ+oSVCwRAqvjy0pc+lyBq5oQ="; + }; + + nativeBuildInputs = [ + libwebsockets + autoreconfHook + vala + fuse + pkg-config + python3 + ]; + + buildInputs = [ + libargon2 + libuuid + sqlite + libsearpc + libevent + curl + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/haiwen/seadrive-fuse"; + description = "SeaDrive daemon with FUSE interface"; + changelog = "https://github.com/haiwen/seadrive-fuse/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + wenbin-liu + ]; + mainProgram = "seadrive"; + }; +}) diff --git a/pkgs/by-name/se/seadrive-gui/package.nix b/pkgs/by-name/se/seadrive-gui/package.nix new file mode 100644 index 000000000000..87a6bed2e916 --- /dev/null +++ b/pkgs/by-name/se/seadrive-gui/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchpatch, + nix-update-script, + fetchFromGitHub, + pkg-config, + cmake, + qt6, + libuuid, + seafile-shared, + jansson, + libsearpc, + seadrive-fuse, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "seadrive-gui"; + version = "3.0.18"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seadrive-gui"; + rev = "v${finalAttrs.version}"; + hash = "sha256-TAmLHoJmFZyGa0wMBBPBWYOOdBCiMBdVfrIBTCZ8Sig="; + }; + + # Fix cmake modernization warning. + # Avoid mixed use of plain signature and keyword signature + # for all seadrive-gui targets in target_link_libraries. + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'; \ + substituteInPlace CMakeLists.txt --replace-fail \ + 'TARGET_LINK_LIBRARIES(seadrive-gui PRIVATE Qt6::DBus)' \ + 'TARGET_LINK_LIBRARIES(seadrive-gui Qt6::DBus)' + ''; + + nativeBuildInputs = [ + libuuid + pkg-config + cmake + qt6.wrapQtAppsHook + qt6.qttools + ]; + + buildInputs = [ + qt6.qt5compat + seafile-shared + jansson + libsearpc + seadrive-fuse + qt6.qtwebengine + ]; + + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ seadrive-fuse ]}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/haiwen/seadrive-gui"; + changelog = "https://github.com/haiwen/seadrive-gui/releases/tag/v${finalAttrs.version}"; + description = "GUI part of Seafile drive"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + wenbin-liu + ]; + mainProgram = "seadrive-gui"; + }; +}) diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix index 191a21aae457..bb7835df2731 100644 --- a/pkgs/by-name/se/secrethound/package.nix +++ b/pkgs/by-name/se/secrethound/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "secrethound"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rafabd1"; repo = "SecretHound"; rev = "v${finalAttrs.version}"; - hash = "sha256-nXL7ly4W4MIXy3DcWeTPfP3t77M72EDxaqjQWwNu/TY="; + hash = "sha256-TyN7byX4rkRXrKzcx/u/LYNqVRBue2YNJRnkF+f34jQ="; }; vendorHash = "sha256-oTyI3/+evDTzyH+BjfSP0A1r2bYVAMxtWRsg0G1d2zQ="; diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix index 738685b78d57..2a86510beffd 100644 --- a/pkgs/by-name/se/seqkit/package.nix +++ b/pkgs/by-name/se/seqkit/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "seqkit"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-8AffU5u7Pw3WX+MaLioPKVwg3WnTLjHcY6Yvo5lrHwk="; + sha256 = "sha256-9+eu4M58nG/tOdEW7fO8f+dMJewMjQsWfzH/KpSBDB8="; }; vendorHash = "sha256-TsL7iYZoxCGR2gl2YlNCnmssVui8TLKN8JTtLAzgvH4="; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index fb02a4996571..8a0f9b3887dc 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-4F17DArBV3kKQJi24pwD+JE7W9AuAQrxJcU1YTj93os="; + hash = "sha256-qbXbbHu8RFSzeexWY/KQKEDnL+pRQPSV8sweCEcv4Kc="; }; - cargoHash = "sha256-wvvtlhlgwZylE6tucVcmsGbos6h5Nc8ZfP8zlkcIoqw="; + cargoHash = "sha256-lNJY+iNXE+f1haOmNL6OehS5KsLYJMCvF04U5a/AXhA="; nativeCheckInputs = [ gitMinimal ]; diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 03341bc0ba39..541a45c7d424 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.22.1"; + version = "2025.24"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-aLiJXEnk3YoTYG9y64bFs4R0wukE7dXZOkdN70GGm2M="; + hash = "sha256-lOvPEUsweyBIf/ryoCDnwBTkvz4J9xatkNSWDvM8zWc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix index 7f669833e48f..9e98f469ec91 100644 --- a/pkgs/by-name/sh/shellhub-agent/package.nix +++ b/pkgs/by-name/sh/shellhub-agent/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.21.0"; + version = "0.21.3"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-+oCPjof64j+XUnQtml6y2v/1/AiHGpN5DAkFfAEy8Nw="; + hash = "sha256-C6ez20eTMGGvORqB00F3mSciExlOmcG7iKvz9F3Sls8="; }; modRoot = "./agent"; diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix index 3367c42ec113..c05b4522f66c 100644 --- a/pkgs/by-name/sh/sherpa/package.nix +++ b/pkgs/by-name/sh/sherpa/package.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { gfortran cmake pkg-config - autoPatchelfHook - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libzip @@ -41,9 +41,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = '' - patchelf --add-rpath $out/lib/SHERPA-MC $out/bin/Sherpa - ''; + preFixup = + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -add_rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --add-rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa + ''; meta = { description = "Monte Carlo event generator for the Simulation of High-Energy Reactions of PArticles"; diff --git a/pkgs/by-name/sh/shuffledns/package.nix b/pkgs/by-name/sh/shuffledns/package.nix index f6d5306c2481..3c6eca9d9541 100644 --- a/pkgs/by-name/sh/shuffledns/package.nix +++ b/pkgs/by-name/sh/shuffledns/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "shuffledns"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "shuffledns"; rev = "v${finalAttrs.version}"; - hash = "sha256-wfHGIWdksfe0sNss4pLQ0ODh28u2kMuxAJh5C9Uiap4="; + hash = "sha256-hdlFmUfAKvBaFBIraOyLTuPbwykwIpqX5VzIPRP1lz8="; }; - vendorHash = "sha256-A4Ssvc6UOvwezzdMa+nPkwyVT8j15+mTAAL+loeBcCo="; + vendorHash = "sha256-dWO/Dut4zwEkJfuBeXvE4Yx85hn0ufCPS9mV09gUrnc="; subPackages = [ "cmd/shuffledns" ]; diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 50417fb2f942..7d6063b28799 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.80.1"; + version = "7.81.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-q4eRrMXYu1jVi1/gcFrEcwhmwtiEv2JOepyxf0wTPws="; + hash = "sha256-Ulv4/VZxsMAFKsNshVDdWjqGg4FzazvWdXGohwlyKs4="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-7zw9qmnQt5NYRKI4bLCM5Hg0d/6kVKovy1k8CpZ/1R8=" + "sha256-aNef+j0Kw8ERa1KKerGFi1+14U7YEclHThGIjkmQQow=" else - "sha256-Mya7v0uhjP4GVyD412SMiQ8/YHaq99fDIjGHCJOIWxY="; + "sha256-n5wvPqYCqKGC8ApUJ7K7OSwOHJq1rEivXiowK+HzN8M="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1764091164; + SOURCE_DATE_EPOCH = 1764799973; }; preBuild = '' diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index b13e12a2bc19..d8818583355b 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20251110"; + version = "20251207-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-3LGwd7LZO9XZjDDE1aDiWCHjR7rMOGWyd8RWt7iAa0Y="; + hash = "sha256-s+9p6Eruc3tdhSUAKLo9MFlQf5Dhq9Ff2WOVh34UVQM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index e0e6cf3f08c4..7e107359aac1 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; rev = "v${version}"; - hash = "sha256-HKHlIsOdCeU1yYPQZJ+npz/MjKhWf7PZ4nfWxRUTEUc="; + hash = "sha256-hQPYS3SskakS+8S2gIjoXojDgIET20nz4ig9+VRv8TM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index acf609234b0b..cd94e53c8c97 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "sigsum"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitLab { domain = "git.glasklar.is"; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "core"; repo = "sigsum-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg="; + hash = "sha256-GQ8ENsMc9vrAG23wHDPcWVadRVov3XOgR5WxnXtg94A="; }; postPatch = '' @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { --replace-fail "info.Main.Version" '"${finalAttrs.version}"' ''; - vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY="; + vendorHash = "sha256-SWNvBEIV25G9lp95DsftFKa48iGUgBQ4RdplJ5D1xUg="; ldflags = [ "-s" diff --git a/pkgs/by-name/sr/src/package.nix b/pkgs/by-name/si/simple-revision-control/package.nix similarity index 97% rename from pkgs/by-name/sr/src/package.nix rename to pkgs/by-name/si/simple-revision-control/package.nix index 76c06b07cd9b..915456f0aa17 100644 --- a/pkgs/by-name/sr/src/package.nix +++ b/pkgs/by-name/si/simple-revision-control/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "src"; + pname = "simple-revision-control"; version = "1.41"; src = fetchFromGitLab { diff --git a/pkgs/by-name/si/sioclient/package.nix b/pkgs/by-name/si/sioclient/package.nix deleted file mode 100644 index fcf5a02ef7b3..000000000000 --- a/pkgs/by-name/si/sioclient/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - asio, - rapidjson, - websocketpp, -}: - -stdenv.mkDerivation { - pname = "sioclient"; - version = "3.1.0-unstable-2023-11-10"; - - src = fetchFromGitHub { - owner = "socketio"; - repo = "socket.io-client-cpp"; - rev = "0dc2f7afea17a0e5bfb5e9b1e6d6f26ab1455cef"; - hash = "sha256-iUKWDv/CS2e68cCSM0QUobkfz2A8ZjJ7S0zw7rowQJ0="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - asio - rapidjson - websocketpp - ]; - - meta = with lib; { - description = "C++11 implementation of Socket.IO client"; - homepage = "https://github.com/socketio/socket.io-client-cpp"; - license = licenses.mit; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 132aafe49c95..98f4178e6a33 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-11-14"; + version = "2.0.0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "f0dfb35aa35518acd489ea2239a0e52260db23ca"; - hash = "sha256-fKxP4febum5XqAKMKVMc1uXiieXbZfJiKBOj2K99mkU="; + rev = "8a980c7a6095f84da2452db036bcef0489531d3e"; + hash = "sha256-Zlrlz3K5z/9DFUeAMKSiB6DyQCYQp3ogQz3r/rWz8bM="; }; buildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 42717057753d..5624ed00b36c 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-BplxcFV8h0V+eyk2knCpwPCxUo9PdoIHp4mDXXo/HyE="; + hash = "sha256-INwbp6gGqrmOtrM5d/8iEv1nlTUDSuo9AVN0EwNhW9Y="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-v2I8+1K+Yz+DR2QsJ+1SaKLh3aEIBaR3aXRfwDMNvVs="; + vendorHash = "sha256-kt5fnkF/bxpeY9d86zKr9VlShvLy1gtaICfA0PGVGKI="; patches = [ (replaceVars ./set-pandoc-path.patch { diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 5f42d607964e..e304a4106e22 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.48"; + version = "2.0.49"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-l7TD5i/o3iqoZCPdmtuzQvm0CvqWQEKptWrj+udYs5k="; + hash = "sha256-Dsp7cv9+g8PDunDnTGnWF4z88SmlJYErfWWylU9mAag="; }; pnpmDeps = pnpm_9.fetchDeps { diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index 6bb2de895581..83fa704adfb0 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-uw41kaIljz9Y378rX2BK0W/ZVUx8IjlIBqYHDuLgZpA="; + hash = "sha256-wL+++p89nZZA5gG6LIDjXIDvHxfGy/sKYNiTR0A38Ew="; }; outputs = [ diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 3942c61cccb8..2193cca056ca 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.9-unstable-2025-11-24"; + version = "3.2.9-unstable-2025-12-01"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "7ce989622852c76b10eeb621df17a345e90d92d5"; - hash = "sha256-/B4kN+XyCbujZDosnDFO5+c6fmAOIHHZPPil2lUm0QQ="; + rev = "e76a6921b3295d34066f5ceedad9d3604b0354c3"; + hash = "sha256-BwxooUtblNa9fdZ62hgxh6RU0g1reCJrEMV77A8Y9dQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix index 2ed435c2d005..40fb1c66c1ff 100644 --- a/pkgs/by-name/sl/slint-viewer/package.nix +++ b/pkgs/by-name/sl/slint-viewer/package.nix @@ -9,14 +9,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-viewer"; - version = "1.13.1"; + version = "1.14.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-I3iwnxft0z6kXdlHIaZUqufqJP3XrF2h+l5Y4EgLPr0="; + hash = "sha256-7NxpnkMAQTBDfcDhdnneFNjB0oE82dDdpfq4vmMqECg="; }; - cargoHash = "sha256-lxxiNa1xqZDtSx19h1MxGOhK/N14fv5k+miaaNpskFc="; + cargoHash = "sha256-RNK3dzXdWRpugC7FwenUF/IsKbD3GxFRLqyLzBf2Wuw="; buildInputs = [ qt6.qtbase diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 66d644eb5cb7..7a68b342ad61 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -9,13 +9,13 @@ ocamlPackages.buildDunePackage rec { pname = "slipshow"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "panglesd"; repo = "slipshow"; tag = "v${version}"; - hash = "sha256-cmBq9RYjvl355+tV+Nf7XmDzgbOqusCjVrqoC34R5CI="; + hash = "sha256-HV4qUp/da0GjZ/KSaE4L/qxdosnOTRcC83zIRigxFSY="; }; postPatch = '' @@ -40,6 +40,7 @@ ocamlPackages.buildDunePackage rec { lwt magic-mime ppx_blob + ppx_deriving_yojson ppx_sexp_value sexplib ]; diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 596916865a11..6e9006561bda 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - jagajaga markuskowa ]; }; diff --git a/pkgs/by-name/sm/sm64coopdx/package.nix b/pkgs/by-name/sm/sm64coopdx/package.nix index 542048170496..f360d9b6da5b 100644 --- a/pkgs/by-name/sm/sm64coopdx/package.nix +++ b/pkgs/by-name/sm/sm64coopdx/package.nix @@ -37,13 +37,13 @@ in # note: there is a generic builder in pkgs/games/sm64ex/generic.nix that is meant to help build sm64ex and its forks; however sm64coopdx has departed significantly enough in its build that it doesn't make sense to use that other than the baseRom derivation stdenv.mkDerivation (finalAttrs: { pname = "sm64coopdx"; - version = "1.3.2"; + version = "1.4"; src = fetchFromGitHub { owner = "coop-deluxe"; repo = "sm64coopdx"; - rev = "v1.3.2"; - hash = "sha256-FHH3+pGowkT8asDmU9qxPNDKy4VPKlkA0X7e4gnX9KY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ct7X6LCitk1QID00guvYOMfIwnZccMeXqXwUB3ioKh8="; }; patches = [ ./no-update-check.patch ]; diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix index 0ef31c4535b0..fa1838c4c1c3 100644 --- a/pkgs/by-name/sm/smfh/package.nix +++ b/pkgs/by-name/sm/smfh/package.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Sleek Manifest File Handler"; homepage = "https://github.com/feel-co/smfh"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ - arthsmn - gerg-l - ]; + teams = [ lib.teams.feel-co ]; mainProgram = "smfh"; }; }) diff --git a/pkgs/by-name/sm/smokeping/package.nix b/pkgs/by-name/sm/smokeping/package.nix index cc17ecae7ac6..d5156d3f696b 100644 --- a/pkgs/by-name/sm/smokeping/package.nix +++ b/pkgs/by-name/sm/smokeping/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { NetOpenSSH NetSNMP LWP + LWPProtocolHttps IOTty fping NetDNS diff --git a/pkgs/by-name/sm/smtp4dev/deps.json b/pkgs/by-name/sm/smtp4dev/deps.json index a9645096e9a7..40de6f06d71f 100644 --- a/pkgs/by-name/sm/smtp4dev/deps.json +++ b/pkgs/by-name/sm/smtp4dev/deps.json @@ -11,8 +11,8 @@ }, { "pname": "BouncyCastle.Cryptography", - "version": "2.5.1", - "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + "version": "2.6.1", + "hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo=" }, { "pname": "CommandLiners", @@ -31,8 +31,8 @@ }, { "pname": "dotnet-ef", - "version": "8.0.15", - "hash": "sha256-a/Wb9PIfyBLs0d8VOUQdEvxk73i8nlvd1kCCqOpEHs8=" + "version": "8.0.22", + "hash": "sha256-NBMB7Z3gbxP2UNroR1s2thYO+bMBmBBZRVSOa9vKyVY=" }, { "pname": "DotNet.Glob", @@ -41,8 +41,8 @@ }, { "pname": "EntityFramework", - "version": "6.5.0", - "hash": "sha256-WZ4AI6XjyMMIDw6y3ggz5lym4ihmFTndInt35ij9E0k=" + "version": "6.5.1", + "hash": "sha256-dJDJ3hNv77RRuKfvcVOptGmSdohov8FtSeEfvNF/hJk=" }, { "pname": "Esprima", @@ -54,10 +54,15 @@ "version": "8.0.200", "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" }, + { + "pname": "Html2Markdown", + "version": "6.1.0.2", + "hash": "sha256-r8tXLN6rkOCW+Tae+etAgP3MGkW8mQFQetR1ual6trM=" + }, { "pname": "HtmlAgilityPack", - "version": "1.12.1", - "hash": "sha256-qravAvCdB/KjWujRk2GL/kGre/B9XVAP+jewICxiKKo=" + "version": "1.12.4", + "hash": "sha256-58ohjvtRXFwfY46Hny9GWL2r6KwZzkJWHFXwIWjkaHU=" }, { "pname": "Humanizer.Core", @@ -76,23 +81,23 @@ }, { "pname": "LinqKit", - "version": "1.3.8", - "hash": "sha256-kX82JIKz2mNK11na8M84ChWgrdBhhB0Zd+JhL4FmR1U=" + "version": "1.3.9", + "hash": "sha256-qfX4HyvFWk54mvJ6klDO3XbXyll9i/N7O/09qWV2eJ8=" }, { "pname": "LinqKit.Core", - "version": "1.2.8", - "hash": "sha256-7PTxzw8n3vpmNKJlumOwL5eWGM7nmdC4oomPTKlm7LE=" + "version": "1.2.9", + "hash": "sha256-JZvxc0pmLVLeEzIFRVlkq0/ivZ1POawqDQYc07USves=" }, { "pname": "MailKit", - "version": "4.11.0", - "hash": "sha256-T41OHePMaYkd7rRP2ytMfEjaD+bpJ65yWBJJuvs7y18=" + "version": "4.14.1", + "hash": "sha256-YSEcfyYVskwJX6xa13wGW4JgHn0VpD04CtUiAGn3et0=" }, { "pname": "Microsoft.AspNetCore.Hosting.WindowsServices", - "version": "8.0.15", - "hash": "sha256-HqNCXJfBZxbtCf94EirLczAl8bsHhmIAzFIFsEjBspE=" + "version": "8.0.22", + "hash": "sha256-GiFLzCpOIE1e7B9KsTwWVudPEonnPub+e8mZEI8ir2I=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", @@ -166,53 +171,48 @@ }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.15", - "hash": "sha256-JWnPERvxWL+5n0dQh+s9zhkWL1gnGexq8LpBszAIaco=" + "version": "8.0.22", + "hash": "sha256-IkNJ8ZWhfDe4zyha/TGmrkehj47HVLNCM9T3HWKAIUY=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.15", - "hash": "sha256-C5TRzSpdH11L+slXG3Gxmhtjl76DGlaKl3G9k9G6giQ=" + "version": "8.0.22", + "hash": "sha256-PYPUupElE4UocZbP3Tx6OWxJC0+FbDCpOLEbhN/ikFk=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.15", - "hash": "sha256-QM0bhIyoBR8j9epa8eoFhtf/fA7u2dW3vU1tfneNsr0=" + "version": "8.0.22", + "hash": "sha256-N+2V4ZLNOgHZkHS0ONiMfbVjATCzzC7qi+69ak2N9sY=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.15", - "hash": "sha256-SVQd3sX0TjNz1kXN4PVWdThyyWpzE8JC0ch5vKVSDKE=" + "version": "8.0.22", + "hash": "sha256-HtB1hTZlz9qEAv2Y0B/o+aRSS+M7XOsTQxoCNpB3Opk=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.15", - "hash": "sha256-G+A43Fv8cqdbg3SKewEKs2NTItBCjELdhVQCtYwEu3U=" + "version": "8.0.22", + "hash": "sha256-fhMgHA7BcxuBtC2QCd4hHv9g5wHgDPY3sUaX/tuT4fI=" }, { "pname": "Microsoft.EntityFrameworkCore.InMemory", - "version": "8.0.15", - "hash": "sha256-iQwlHSclsftdgYnlYODBbeP1I9mWiVM8f3whPtWYrtk=" + "version": "8.0.22", + "hash": "sha256-JJk1apU1tZO3jAgPuOWuZwX3Fe6g+jl518zdFySO3HQ=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.15", - "hash": "sha256-U+pLbWgYmi+2JhGUkYa/ZdU89IutJewGRNA3TrP4vjk=" + "version": "8.0.22", + "hash": "sha256-XCXbuMmLZkn4q6xNDCFjmJbez/T/UVHqdl2VJDq9ckA=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.15", - "hash": "sha256-Pc7/YnigKXfAZQE1Rb2awo1YHYz48knv7WMeaKP9QjY=" + "version": "8.0.22", + "hash": "sha256-RdMVfrpcdrYiQ2R9RWPzGwBfgkkNIyb6HlWSrVoZYy0=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.15", - "hash": "sha256-MwbVFf22PLUZvMxAm5+ooAoYP7UsPvnX6mYkU4C9RLU=" - }, - { - "pname": "Microsoft.Extensions.ApiDescription.Server", - "version": "8.0.14", - "hash": "sha256-mfNB1+5kcIr8burRrsr5LR5pVEAISQ8o9m8FrCtye3M=" + "version": "8.0.22", + "hash": "sha256-hfmIbkhF80gcb9X0jTC4g5uoWhSsa+KCov39B1tBb2I=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", @@ -354,11 +354,6 @@ "version": "8.0.0", "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" }, - { - "pname": "Microsoft.Extensions.FileProviders.Embedded", - "version": "8.0.0", - "hash": "sha256-TueGeSls8KFgMavmAqPyd4irQ61yKm0+W6GAru6Leuw=" - }, { "pname": "Microsoft.Extensions.FileProviders.Physical", "version": "2.1.0-preview1-final", @@ -581,8 +576,8 @@ }, { "pname": "Microsoft.TypeScript.MSBuild", - "version": "5.8.3", - "hash": "sha256-zL02BnZRCc5v1GUmzhaL1TnUq9+8Vkz5rGDPt+7CkD8=" + "version": "5.9.3", + "hash": "sha256-oDNZi8D8CFUl1QM80n1a0GIZW7+o9NSQ/qDxkhlsFIA=" }, { "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts", @@ -621,8 +616,8 @@ }, { "pname": "MimeKit", - "version": "4.11.0", - "hash": "sha256-UTP+pfP3q4X65/KNGBTkHo4KZjeHZ10dQbr58Qf42iQ=" + "version": "4.14.0", + "hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM=" }, { "pname": "Mono.Options", @@ -636,8 +631,8 @@ }, { "pname": "Namotion.Reflection", - "version": "3.4.2", - "hash": "sha256-iaQrE5VwRHqXOyzym4vY3+4aDw6eswN5P3LDd3FoFZk=" + "version": "3.4.3", + "hash": "sha256-4M0llvgnQRbO7RmM71TRrhMYa9ygzPDzHCOR29gsVdU=" }, { "pname": "NETStandard.Library", @@ -666,53 +661,58 @@ }, { "pname": "NJsonSchema", - "version": "11.3.2", - "hash": "sha256-x+vNknToh2X1qk7NmsQEUWCoEJ5CGc1b9XNOrIbCOLc=" + "version": "11.5.2", + "hash": "sha256-pG9IJqK7xrQSyeHDkBOtxLLkZ+DSEXSb2P2rhkczYsM=" }, { "pname": "NJsonSchema.Annotations", - "version": "11.3.2", - "hash": "sha256-MWC0Hvd6knCAjViSKOY7lugxGbVEcn3lyzEUO5unphQ=" + "version": "11.5.2", + "hash": "sha256-ZLdV/B6KBIC9coxcGA2iBDYT2vajbTS29AlbitVo3uc=" }, { "pname": "NJsonSchema.NewtonsoftJson", - "version": "11.3.2", - "hash": "sha256-jIRsXWHVNmWgz2WlmiJnfyXNofwrrdkLVlx4x3PPPlM=" + "version": "11.5.2", + "hash": "sha256-arWHhMrKAkVn/x5n1cCMAYZd7q2RgyWK6UOVMvKT/dk=" }, { "pname": "NJsonSchema.Yaml", - "version": "11.3.2", - "hash": "sha256-7IzmfufXlhTZoESAIsd5zqBZ/x30tAAZl9Bx/m3QaxA=" + "version": "11.5.2", + "hash": "sha256-AXerqLICqMPCLZNimbIDnUhnCIo4ReGyzWRGvoANjZs=" + }, + { + "pname": "NStack.Core", + "version": "1.1.1", + "hash": "sha256-yt1t7NqwzegHtpeI7aT8G0mTmZ7MLn65qhyBwkwcOwg=" }, { "pname": "NSwag.Annotations", - "version": "14.4.0", - "hash": "sha256-NbAAQ+tlgi+/766JeEsD+W6SQMEHy2qyTsoMlxvuuo8=" + "version": "14.6.3", + "hash": "sha256-wRbGOhhkuKsdoh5avsLITfaA/LogEkZqq2N8YQ012zo=" }, { "pname": "NSwag.AspNetCore", - "version": "14.4.0", - "hash": "sha256-3nMNWDrr6k6q5vaskxWc6oioUkLoyJciZ4ocyW5oN+w=" + "version": "14.6.3", + "hash": "sha256-MddseEM+ACh9orRjTsOWnYELjUI5P4DLzh1/aCOtCrg=" }, { "pname": "NSwag.Core", - "version": "14.4.0", - "hash": "sha256-l1nBCyf/ed2Xm8Yk5TL3ni8kQxQSAf0ajAfwaAL3/6I=" + "version": "14.6.3", + "hash": "sha256-5kjVMRUDfvndcwfhTNygbWsgPusN9EzZrMJEZlJ8Rr8=" }, { "pname": "NSwag.Core.Yaml", - "version": "14.4.0", - "hash": "sha256-YBlNeIqgZgcYvf/VvJXelTIxDCRqyPJPo7ZzTIo16ak=" + "version": "14.6.3", + "hash": "sha256-uruduhlp/UPvoY7BSp1tNz0rC74yj3/7UDeNYxcjp3Q=" }, { "pname": "NSwag.Generation", - "version": "14.4.0", - "hash": "sha256-DH7C00KVAiv6i8lJxNAzkDtuNHykyGQAfgT6MAbeBko=" + "version": "14.6.3", + "hash": "sha256-Yswpger7gs/btXUbH802XCEx402CdgwUIjaj9x2nMus=" }, { "pname": "NSwag.Generation.AspNetCore", - "version": "14.4.0", - "hash": "sha256-YT2v9ddGAFk8gMj1aQ2yHOK3UWX3mcIoGYWBl+OsJ2s=" + "version": "14.6.3", + "hash": "sha256-jiOcrEG2yX02N94zkB3A8jxW0eMTKcxUDQPOvWtkeDU=" }, { "pname": "NuGet.Frameworks", @@ -996,14 +996,34 @@ }, { "pname": "Serilog", - "version": "4.2.0", - "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" + "version": "4.3.0", + "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw=" }, { "pname": "Serilog.AspNetCore", "version": "8.0.3", "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I=" }, + { + "pname": "Serilog.Enrichers.Environment", + "version": "3.0.1", + "hash": "sha256-rBaw7hsAiYaIv+yAfjJR/xX80f58kGj88VDXyLyPoTU=" + }, + { + "pname": "Serilog.Enrichers.Process", + "version": "3.0.0", + "hash": "sha256-n8XxHSFPysw+laE9SezFQHcboolPAVxO5gmoRbKqnCQ=" + }, + { + "pname": "Serilog.Enrichers.Thread", + "version": "4.0.0", + "hash": "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8=" + }, + { + "pname": "Serilog.Expressions", + "version": "5.0.0", + "hash": "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E=" + }, { "pname": "Serilog.Extensions.Hosting", "version": "8.0.0", @@ -1016,8 +1036,8 @@ }, { "pname": "Serilog.Formatting.Compact", - "version": "2.0.0", - "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g=" + "version": "3.0.0", + "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY=" }, { "pname": "Serilog.Settings.Configuration", @@ -1041,8 +1061,8 @@ }, { "pname": "Serilog.Sinks.File", - "version": "5.0.0", - "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" + "version": "6.0.0", + "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -1066,8 +1086,8 @@ }, { "pname": "StreamLib", - "version": "0.12.0", - "hash": "sha256-oAsRU/n575cgAms0AngignhSYPWfVvWvnThYLFz+cNU=" + "version": "0.12.1", + "hash": "sha256-u5EtS666YDSlWtVhlQXd9ivxkFD1IWDcKH6u2IiVZgo=" }, { "pname": "System.AppContext", @@ -1094,6 +1114,11 @@ "version": "6.0.0", "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, + { + "pname": "System.CodeDom", + "version": "9.0.4", + "hash": "sha256-X8IDHw/ssp0vgPSnyM/tmDTb3poH6GLe+gZ4MR9qfho=" + }, { "pname": "System.Collections", "version": "4.0.11", @@ -1414,6 +1439,11 @@ "version": "4.0.1", "hash": "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q=" }, + { + "pname": "System.Management", + "version": "9.0.4", + "hash": "sha256-+sW/NQELaBGjUfzndaNLPHKKQVdI1yOJMaqF4tV2SVY=" + }, { "pname": "System.Memory", "version": "4.5.3", @@ -1899,6 +1929,11 @@ "version": "4.0.1", "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY=" }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, { "pname": "System.Windows.Extensions", "version": "6.0.0", @@ -1949,6 +1984,11 @@ "version": "4.0.1", "hash": "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA=" }, + { + "pname": "Terminal.Gui", + "version": "1.19.0", + "hash": "sha256-1JIu78fv4AKRq8VbSASoVH4kJGyeixuoOr7ghxosDw8=" + }, { "pname": "VueCliMiddleware", "version": "6.0.0", diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index 56b5bdcede9c..fae45b8cb86d 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -11,13 +11,13 @@ buildDotnetModule (finalAttrs: { pname = "smtp4dev"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = finalAttrs.version; - hash = "sha256-bbo4kke0deZQoD08dbUKsLUhjg/z7TaIr5qmU4SETNg="; + hash = "sha256-+6UIfttIjBbsxptc1uI7K8golGwl+Fw6f5kCl89NPDA="; }; patches = [ ./smtp4dev-npm-packages.patch ]; @@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src patches; - hash = "sha256-c0/6kbMv5CmLxS0S/p3+oZvZsuHP9gt4X43uvGQFjTw="; + hash = "sha256-+rKqiGiIQAYCY/3z1m9cQI0WgtdX8UTr70v7nTtgkt0="; postPatch = "cd ${finalAttrs.npmRoot}"; }; diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 1ebf78b15a10..90220aff68be 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.84"; + version = "2.85"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-sKxuFG3lqpjGkC0WVPr+4v09LR7BR2FYBOsToNI6M78="; + hash = "sha256-jD3OnK37p7lgG116J0E9Mp8mWDxlqndKIYzxbCZBOhk="; }; buildInputs = [ diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 00489e42f100..7388eb903a79 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.14.0"; + version = "9.14.1"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-XkPzv6W/SsF92V8hvs7+SQ+o7QeP9Sne3pvZyy8YBlA="; + hash = "sha256-yRnoo6vaq2Gw+/WJ3Jjk4AMnj0OPylgPI2lezCzK/B4="; }; postPatch = '' diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix index 0a5d332bd0df..67dbfd29f629 100644 --- a/pkgs/by-name/so/soupault/package.nix +++ b/pkgs/by-name/so/soupault/package.nix @@ -12,7 +12,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "soupault"; - version = "5.2.0"; + version = "5.2.1"; minimalOCamlVersion = "5.3"; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { "https://github.com/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz" "https://codeberg.org/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz" ]; - hash = "sha256-BuQ2yQzf6PpK6HUfuHDscgKkOBttCrs0zTh37hMUR6E="; + hash = "sha256-jwVos7KeQ6fBuBWUslFyvrwDuJ3Wgb7pieERm9+b3Zg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index 5de6064251c7..df11de5af1e1 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - Br1ght0ne gaelreyrol ]; mainProgram = "sozu"; diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix index 7a00979d9b47..d9e22a949530 100644 --- a/pkgs/by-name/sp/spaceFM/package.nix +++ b/pkgs/by-name/sp/spaceFM/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ - jagajaga obadz ]; }; diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix index 104e30e50d1c..94935f624fff 100644 --- a/pkgs/by-name/sp/spacevim/package.nix +++ b/pkgs/by-name/sp/spacevim/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://spacevim.org/"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.perchun ]; + maintainers = [ lib.maintainers.PerchunPak ]; platforms = lib.platforms.all; mainProgram = "spacevim"; }; diff --git a/pkgs/by-name/sp/spec-kit/package.nix b/pkgs/by-name/sp/spec-kit/package.nix index 320a61547ffc..2b03753cd3a5 100644 --- a/pkgs/by-name/sp/spec-kit/package.nix +++ b/pkgs/by-name/sp/spec-kit/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "spec-kit"; - version = "0.0.86"; + version = "0.0.90"; src = fetchFromGitHub { owner = "github"; repo = "spec-kit"; tag = "v${version}"; - hash = "sha256-zgiJN7rzD5x/xpL6CMvxITy+/YTu1TKk26UhhQ/s5V8="; + hash = "sha256-ulAii6//DT9uqLxYk6qmX6dwWWjhuARbBmjH5u1YGGM="; }; pyproject = true; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 856dce4673cb..5ef4e17376cf 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.42.3"; + version = "2.42.4"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-gLVysXgQyodjyxXd81Rbduvr/xsaECioDHPgrpw8UiM="; + hash = "sha256-JOAw2GEHGr7eIIZtoAeKFqde1L7TidbyvRv1kAcUm2w="; }; vendorHash = "sha256-DiVu/ePiZvn9+B/r8LS0qLt8eXKAtg4IXZ1WRzzAvcE="; diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index ff2eeae10d2d..365061b56d0b 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -10,28 +10,28 @@ makeDesktopItem, nix-update-script, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "splayer"; - version = "3.0.0-beta.5"; + version = "3.0.0-beta.6"; src = fetchFromGitHub { owner = "imsyy"; repo = "SPlayer"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = false; - hash = "sha256-glYq0rHEV2xWoKznpMIU6klUxk1lXYOq4TBRuyTQgOM="; + hash = "sha256-7guh5KJ9RbYCiifH0ERXbIXxoJDxanUAHAf/zux7yU4="; }; pnpm = pnpm_10; - pnpmDeps = final.pnpm.fetchDeps { - inherit (final) pname version src; + pnpmDeps = finalAttrs.pnpm.fetchDeps { + inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-ZyQcuZYwfc0a5PgfYgvp2GdfV3cBf5sb8oxJtI4+kp4="; + hash = "sha256-3t9Qx+1OQwqVvzgYssP8azGG/PNSJkrG614wQh0W4WQ="; }; nativeBuildInputs = [ - final.pnpm.configHook + finalAttrs.pnpm.configHook nodejs makeWrapper copyDesktopItems diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix index 47c43e745c40..15e5973ee38c 100644 --- a/pkgs/by-name/sp/splitcode/package.nix +++ b/pkgs/by-name/sp/splitcode/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "splitcode"; - version = "0.31.4"; + version = "0.31.5"; src = fetchFromGitHub { owner = "pachterlab"; repo = "splitcode"; tag = "v${finalAttrs.version}"; - hash = "sha256-jaZptrF5HSQSe2KQdBNPprhsVZ2FSudZFgWPn9zQq3A="; + hash = "sha256-x2N+IQHB6gbEKTEofsWy7SwVf1lvRxh5f93avtAs8fM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 639c448b9a78..dc19c712d5bf 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -79,7 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ anderslundstedt - Br1ght0ne getchoo ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 74194341cb8d..93e9142d5455 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -9,19 +9,19 @@ }: let pname = "sql-studio"; - version = "0.1.45"; + version = "0.1.46"; src = fetchFromGitHub { owner = "frectonz"; repo = "sql-studio"; tag = version; - hash = "sha256-LAPJPYHCIBRrnz03s3VhFaVfmGAoIj1UrsY+u2/FaRQ="; + hash = "sha256-xtW6tF3hc8GyxOMwE6GlZNBNEE/QsKJzyOvAYU6i6M0="; }; ui = buildNpmPackage { pname = "sql-studio-ui"; inherit version src; - npmDepsHash = "sha256-RVVCmlfembWI+MLxt+96V2Xmczkscuw79aNPWtYlGG8="; + npmDepsHash = "sha256-1k054qLwvpSrWfBKXJRVVomCh1dMSEtjtwUTWCoAaEg="; sourceRoot = "${src.name}/ui"; installPhase = '' runHook preInstall @@ -35,7 +35,7 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-Dtstp9xEWGau+OJ6471gCEC5eWneiPj03pBMxYBr7DI="; + cargoHash = "sha256-RMI2pW89PzmxHgZ7ondwNyGE4yeWpf3T6NRNr2eUFjQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index e8e7e6bf81a7..5e7354416509 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "sqlitestudio"; - version = "3.4.17"; + version = "3.4.18"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; rev = version; - hash = "sha256-nGu1MYI3uaQ/3rc5LlixF6YEUU+pUsB6rn/yjFDGYf0="; + hash = "sha256-UYu1ViLzzeZfJhoYoKOMCTbytGeK+2TKhwMR3yGpGrI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 64e7e95a8ec5..4f4d59175a2b 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "6.10.0"; + version = "6.11.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-x35ER65LNw3049JLrRA5SyPjUYh/zXhRJM8FIp9iW60="; + hash = "sha256-uJAiNBrZmaDV7Etr3xAkDHXs7H9YZYLsyTcnaHGVJfI="; }; - vendorHash = "sha256-rsmgKSmgjtxeNhTrwA7RBtNAa7qyDKhbKSVmfP5AgFg="; + vendorHash = "sha256-H8xJtlAWkk7AcZBYR/xggs/Ut0cnHC49XiScEcdlkMc="; subPackages = [ "cmd/src" diff --git a/pkgs/by-name/sr/srm/package.nix b/pkgs/by-name/sr/srm/package.nix index ccecb22418e1..05738dc6b7bd 100644 --- a/pkgs/by-name/sr/srm/package.nix +++ b/pkgs/by-name/sr/srm/package.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation { ''; homepage = "https://srm.sourceforge.net"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index 0b3436066b80..50481524faf8 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.64"; + version = "4.65"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "46ef1ea7baa81fb009b4010700a9e00c39fb61a8"; - hash = "sha256-ky0+UKqIF37tf0drNRvdi116VZsgUn2HedPeKuitHLg="; + rev = "256c3415a580c2bec37f98bdc6d972c10454d627"; + hash = "sha256-HGT7hBzsbtlBud4zwWZHDrQqzA1lmnNMrCZy5oylBSQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ss/sslsplit/package.nix b/pkgs/by-name/ss/sslsplit/package.nix index 73ba386ae1cb..96101e75313e 100644 --- a/pkgs/by-name/ss/sslsplit/package.nix +++ b/pkgs/by-name/ss/sslsplit/package.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "OPENSSL_BASE=${openssl.dev}" - "LIBEVENT_BASE=${libevent.dev}" - "LIBPCAP_BASE=${libpcap}" - "LIBNET_BASE=${libnet}" + "OPENSSL_BASE=${lib.getDev openssl}" + "LIBEVENT_BASE=${lib.getDev libevent}" + "LIBPCAP_BASE=${lib.getDev libpcap}" + "LIBNET_BASE=${lib.getDev libnet}" ]; meta = with lib; { diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix index 73acab70a14d..e03ae09a867d 100644 --- a/pkgs/by-name/st/starship/package.nix +++ b/pkgs/by-name/st/starship/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.isc; maintainers = with lib.maintainers; [ danth - Br1ght0ne Frostman da157 sigmasquadron diff --git a/pkgs/by-name/st/startup-disk/package.nix b/pkgs/by-name/st/startup-disk/package.nix new file mode 100644 index 000000000000..431a492f3b30 --- /dev/null +++ b/pkgs/by-name/st/startup-disk/package.nix @@ -0,0 +1,65 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + nix-update-script, + pkg-config, + libadwaita, + gtk4, + glib, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "startup-disk"; + version = "0.1.5"; + + src = fetchFromGitLab { + owner = "davide125"; + repo = "startup-disk"; + tag = "${finalAttrs.version}"; + hash = "sha256-258whEX6hKqfrk2aII15tuFEuB7NQUCNLEmi3OCOWV4="; + domain = "gitlab.gnome.org"; + }; + + nativeBuildInputs = [ + pkg-config + glib # glib-compile-resources + ]; + + buildInputs = [ + libadwaita + gtk4 + glib + ]; + + postPatch = '' + # Fix sudo crate's hardcoded /usr/bin/sudo + substituteInPlace $cargoDepsCopy/sudo-0.6.0/src/lib.rs \ + --replace-fail 'Command::new("/usr/bin/sudo")' 'Command::new("sudo")' + ''; + + cargoHash = "sha256-Ec2u/F/lVdT5Oi8N116kVWtp7duZTU0d5zOhYungJ/U="; + + postInstall = '' + install -Dm644 res/org.startup_disk.StartupDisk.desktop -t $out/share/applications/ + install -Dm644 res/org.startup_disk.StartupDisk.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm644 res/org.startup_disk.StartupDisk.metainfo.xml -t $out/share/metainfo/ + install -Dm644 res/org.startup_disk.StartupDisk.policy -t $out/share/polkit-1/actions/ + ''; + + postFixup = '' + substituteInPlace $out/share/polkit-1/actions/org.startup_disk.StartupDisk.policy \ + --replace-fail /usr/bin/startup-disk /run/current-system/sw/bin/startup-disk + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Interface to choose the startup volume on Apple Silicon systems"; + homepage = "https://gitlab.gnome.org/davide125/startup-disk"; + changelog = "https://gitlab.gnome.org/davide125/startup-disk/-/tags/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "startup-disk"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ milomc123 ]; + }; +}) diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 14a142581fea..5dc2d89a53cc 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -4,9 +4,11 @@ fetchFromGitHub, withJson ? true, stdenv, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; # also update version of the vim plugin in # pkgs/applications/editors/vim/plugins/overrides.nix @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "oppiliappan"; repo = "statix"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c="; }; @@ -27,13 +29,20 @@ rustPlatform.buildRustPackage rec { # tests are failing on darwin doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.update-script = nix-update-script { }; + + meta = { description = "Lints and suggestions for the nix programming language"; homepage = "https://github.com/oppiliappan/statix"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "statix"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ nerdypepper + progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix index 19e76087c588..b4472c2ebc27 100644 --- a/pkgs/by-name/st/stc-cli/package.nix +++ b/pkgs/by-name/st/stc-cli/package.nix @@ -1,7 +1,8 @@ { - lib, buildGoModule, fetchFromGitHub, + lib, + versionCheckHook, }: buildGoModule rec { @@ -17,6 +18,12 @@ buildGoModule rec { vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ="; + ldflags = [ "-X main.GitTag=${version}" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + meta = { description = "Syncthing CLI Tool"; homepage = "https://github.com/tenox7/stc"; diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix index d7e5162c8b43..9c4cc31e6018 100644 --- a/pkgs/by-name/st/steam-lancache-prefill/package.nix +++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix @@ -10,13 +10,13 @@ buildDotnetModule (finalAttrs: { pname = "steam-lancache-prefill"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "tpill90"; repo = "steam-lancache-prefill"; tag = "v${finalAttrs.version}"; - hash = "sha256-6XBe64hAe5mPakjcTAPdwnMKsVlvCeorItLVS5cf+cI="; + hash = "sha256-FD7rC73VF+jhdCrSPKEillRXAi7jbY+h+oHi0Bpng3k="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix index 2d5e69988597..375e4ba3cfea 100644 --- a/pkgs/by-name/st/steam-tui/package.nix +++ b/pkgs/by-name/st/steam-tui/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dmadisetti/steam-tui"; license = licenses.mit; maintainers = with maintainers; [ - lom dmadisetti ]; # steam only supports that platform diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 513ba73b6ecc..d654ba61f9b5 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://store.steampowered.com/"; license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ jagajaga ]; teams = with lib.teams; [ steam ]; mainProgram = "steam"; }; diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index a4b08737b1b8..c32beb2b1138 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -19,13 +19,13 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0-unstable-2025-11-24"; + version = "0-unstable-2025-12-06"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "ad509e7284f9b48ad49de70ea5ccb94ac25b1fef"; - hash = "sha256-82r5L1nLOSzWJqZq8HlS0Ggz5D8JbK1y5Mvad127cuw="; + rev = "875b6739eed0b7d053a53e7b694496954f5681f6"; + hash = "sha256-RSjIYtRlgcTUSd9pJApRsvJ+GZZI4AThQdRzFFtM9rg="; }; cargoHash = "sha256-bXAgp83U48GsTAuki3tsoOK7X+UepKJIlS0bL5qMc8I="; diff --git a/pkgs/by-name/st/stern/package.nix b/pkgs/by-name/st/stern/package.nix index ee4f18306b2a..e2c714d1cc73 100644 --- a/pkgs/by-name/st/stern/package.nix +++ b/pkgs/by-name/st/stern/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "stern"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - hash = "sha256-JMtdjsXUOf75Djva0qdHUGM16OuWoTLjshDz4LAfllQ="; + hash = "sha256-2GCUPmeSbRg1TE5pD42BiHUwzxqS+9FV9ZYIaZKwNWo="; }; vendorHash = "sha256-xDkYW542V2M9CvjNBFojRw4KAhcxvlBPVJCndlF+MKw="; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 4eaf19e6df43..e675d9bb96fc 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.38"; + version = "3.16.40"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-QhuxJmSI09rPJf5W+MH/5ApBVTSYYY/kWENLr7vX/3A="; + hash = "sha256-i+CthE7tyFicVSDxa7LI/7RkWoD3W2/uNGrKGDpbEtw="; }; outputs = [ diff --git a/pkgs/by-name/st/storcli2/package.nix b/pkgs/by-name/st/storcli2/package.nix index c9d121743a28..5797ce75e42a 100644 --- a/pkgs/by-name/st/storcli2/package.nix +++ b/pkgs/by-name/st/storcli2/package.nix @@ -62,7 +62,6 @@ stdenvNoCC.mkDerivation ( description = "Storage Command Line Tool"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ edwtjo ]; mainProgram = "storcli2"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/st/storm/package.nix b/pkgs/by-name/st/storm/package.nix index f617fa8c9afe..d8e04f914114 100644 --- a/pkgs/by-name/st/storm/package.nix +++ b/pkgs/by-name/st/storm/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ - edwtjo vizanto ]; platforms = with platforms; unix; diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index 23b9b4b359e8..2bb0ca714f6e 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.17"; + version = "6.18"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Cnx77cfvwHbzJCoDEK8q5jwpKjbdQjbweeiKk+mMucA="; + hash = "sha256-CtXcupc6aed5ZQ7xyzNbEu5gcW/HMmYJiVvTPm0qcyU="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/su/subfinder/package.nix b/pkgs/by-name/su/subfinder/package.nix index dad6fc2dc603..f86702603d39 100644 --- a/pkgs/by-name/su/subfinder/package.nix +++ b/pkgs/by-name/su/subfinder/package.nix @@ -43,7 +43,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ fpletz - Br1ght0ne Misaka13514 ]; mainProgram = "subfinder"; diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix index dca17f1093a0..7b453ce35719 100644 --- a/pkgs/by-name/su/sudachidict/package.nix +++ b/pkgs/by-name/su/sudachidict/package.nix @@ -7,20 +7,20 @@ let pname = "sudachidict"; - version = "20250515"; + version = "20251022"; srcs = { core = fetchzip { url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-core.zip"; - hash = "sha256-+N6B1eW8ScDJSjMWjSNJlQAEOCNh5Q0lcsAWrY9eRVE="; + hash = "sha256-kfYGjDO7kO0Gy0YhBceetl2B51iH3myCVt3MCo9nYq0="; }; small = fetchzip { url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-small.zip"; - hash = "sha256-+0pg2wXS1Y/5LGnVvEbtEpws2LqFPv88jCHsV+Oxb5E="; + hash = "sha256-Y8vX4+G5JB0AmiKP5lGYh/t3NeXSgyGd0Wvv6qFpikE="; }; full = fetchzip { url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-full.zip"; - hash = "sha256-jYFZax9LDLX6knGuQDhbhdDU3WGjevVkDFF/XZx2kg0="; + hash = "sha256-w/yBWslxIIdniR9c3LN4G4n94VqT73506u/knL9/Pj8="; }; }; in diff --git a/pkgs/by-name/su/sums/package.nix b/pkgs/by-name/su/sums/package.nix index 27a59480c0aa..93e4761f049a 100644 --- a/pkgs/by-name/su/sums/package.nix +++ b/pkgs/by-name/su/sums/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sums"; - version = "0.15"; + version = "0.16"; src = fetchFromGitLab { owner = "leesonwai"; repo = "sums"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-L+ND18cqXAi0qqt1lECQlx2cBX9HrhAXNFxHFl9wjU8="; + tag = "${finalAttrs.version}"; + hash = "sha256-X+AMUH8nJli0Um1bH0gDGLnfHGknqea3DZxH+tdTEr8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix index 633aeeba301c..e9038772f230 100644 --- a/pkgs/by-name/su/sunvox/package.nix +++ b/pkgs/by-name/su/sunvox/package.nix @@ -35,15 +35,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sunvox"; - version = "2.1.3"; + version = "2.1.4"; src = fetchzip { urls = [ "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" # Upstream removes downloads of older versions, please save bumped versions to archive.org - "https://web.archive.org/web/20251019141206/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" + "https://web.archive.org/web/20251208174416/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" ]; - hash = "sha256-egOaIZEyI5x2VV660qbO+pan22BFRaa4d+8sOpJhpBM="; + hash = "sha256-FY5DxdQN1ClFp/dS5fXgFhoU7uk/gUoPrYtsZK5q9O4="; }; nativeBuildInputs = @@ -68,21 +68,35 @@ stdenv.mkDerivation (finalAttrs: { libjack2 ]; - desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ - (makeDesktopItem { - name = "sunvox"; - exec = "sunvox"; - desktopName = "SunVox"; - genericName = "Modular Synthesizer"; - comment = "Modular synthesizer with pattern-based sequencer"; - icon = "sunvox"; - categories = [ - "AudioVideo" - "Audio" - "Midi" - ]; - }) - ]; + desktopItems = + let + sunvoxDesktop = + variant: + makeDesktopItem { + name = "sunvox" + lib.optionalString (variant != null) "-${lib.strings.toLower variant}"; + exec = "sunvox" + lib.optionalString (variant != null) "_${lib.strings.toLower variant}"; + desktopName = "SunVox" + lib.optionalString (variant != null) " (${variant})"; + genericName = "Modular Synthesizer"; + comment = "Modular synthesizer with pattern-based sequencer"; + icon = "sunvox"; + categories = [ + "AudioVideo" + "Audio" + "Midi" + ]; + }; + in + lib.optionals stdenv.hostPlatform.isLinux ( + [ + (sunvoxDesktop null) + ] + ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64) [ + (sunvoxDesktop "OpenGL") + ] + ++ lib.optionals (stdenv.hostPlatform.isi686) [ + (sunvoxDesktop "LoFi") + ] + ); dontConfigure = true; dontBuild = true; diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 7259dc775444..9013400b9900 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.62.10"; + version = "2.65.5"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-rHu74DHbmy+/1mdsEvvND4bzVzVXfQoSXfJIzPYSq2s="; + hash = "sha256-uxRC5T9i4JbMqRT8pCnbqhuNl1GxrhgqsDLrMNy8fgM="; }; - vendorHash = "sha256-neUCgxE7NH6rRKrmjpkzwcCFxYxiqgu5/0b0e/833Ng="; + vendorHash = "sha256-rBlLfKcaWAYaC+3M9YgjHcne70ohNeOZ6JGt3Uwra4k="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 61a5800caaab..31fe69b8c7ac 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -14,13 +14,13 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "16.4.1"; + version = "16.5.0"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-d4mkIy+iFTM1fZxwUVLFgIIjen6+P/l4jsYeEP1kojc="; + hash = "sha256-FBquRpn+g5wOwvM62MqL7RZ41LXer0CskVN5+5mD9kM="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -63,7 +63,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-lIkIxR/SfmbmBLEkhUZkTXSy6RIGcPVoNP8T2EgamEo="; + hash = "sha256-r0xlODXi4+C+Aat3e3goMIBvBordes/KVlsBG696ZWs="; } ); diff --git a/pkgs/by-name/su/super-tiny-icons/package.nix b/pkgs/by-name/su/super-tiny-icons/package.nix index 5e1d283264f7..d1dd4eca5722 100644 --- a/pkgs/by-name/su/super-tiny-icons/package.nix +++ b/pkgs/by-name/su/super-tiny-icons/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "super-tiny-icons"; - version = "unstable-2023-11-06"; + version = "0-unstable-2025-10-30"; src = fetchFromGitHub { owner = "edent"; repo = "SuperTinyIcons"; - rev = "888f449af8fb8df93241204e99fece85b9d225a5"; - hash = "sha256-L/7CEvG0NPbF8+ysiEHPiPnCMAW3cUu/e3XwtatRdbg="; + rev = "621ddf6c231d142cccaa411c3c29001404550624"; + hash = "sha256-qx3Z64id5kv/OrfEqI77ovGf2X4uHt6wlZrlUo8Nnb0="; }; installPhase = '' diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix index 4cd14acdd754..6e8741544101 100644 --- a/pkgs/by-name/su/supercronic/package.nix +++ b/pkgs/by-name/su/supercronic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supercronic"; - version = "0.2.39"; + version = "0.2.40"; src = fetchFromGitHub { owner = "aptible"; repo = "supercronic"; rev = "v${version}"; - hash = "sha256-yAIn5f/ci3oJV55Q8Fd9YrNPI7Cs5yKbnE71Cak9p3I="; + hash = "sha256-20L2GriC+f6bUiJOiUsnvpTEG1J3hp60ry3fSrJt87A="; }; - vendorHash = "sha256-lIFEF0A2JI96ixLLgbOAnGjxXwm39P4SCbKdsVVxC+0="; + vendorHash = "sha256-a1W/Ah3zPMLvYfQj6uWsHvwjxpLs2vb8E2YYH/RRQvs="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/by-name/su/surrealdb-migrations/package.nix b/pkgs/by-name/su/surrealdb-migrations/package.nix index bb577d94dde0..b1047590fd11 100644 --- a/pkgs/by-name/su/surrealdb-migrations/package.nix +++ b/pkgs/by-name/su/surrealdb-migrations/package.nix @@ -9,7 +9,7 @@ let pname = "surrealdb-migrations"; - version = "2.3.0"; + version = "2.4.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "Odonno"; repo = "surrealdb-migrations"; rev = "v${version}"; - hash = "sha256-BCShTHZSeahJclOHcWh7etl0FajhFs4/RVVszFZdOV8="; + hash = "sha256-eeIXbpfXZ91XcQ+4T76BGZU0Ron5dAf2pUAvLj9nEok="; }; - cargoHash = "sha256-fV7yHRiqcM4l9i3tnoMawEQxd9fqbcZYZkeTITy310g="; + cargoHash = "sha256-XA4OXHKSdVKoq3aKpKnYXzWjXHolDqPNLeIDS3iARYI="; # Error: No such file or directory (os error 2) # failures: diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 48af7410eb36..b019b1411c8a 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -15,6 +15,7 @@ wayland-scanner, wrapGAppsNoGuiHook, librsvg, + libjxl, }: stdenv.mkDerivation rec { @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { extraLoaders = [ librsvg webp-pixbuf-loader + libjxl ]; } }" diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix index 74f522e5d943..fcf4a5a0cad3 100644 --- a/pkgs/by-name/sw/switchfin/package.nix +++ b/pkgs/by-name/sw/switchfin/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchfin"; - version = "0.7.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dragonflylee"; repo = "switchfin"; rev = version; - hash = "sha256-swNwaZg6W5Ox08poc3gC3MOsIHv08/Q9BOMwD9FNf3g="; + hash = "sha256-5W1lUnblXQi8G8+emQ2oU+PYxire0Lwza/j/JESCytw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 5486cd5145e6..3b63db7e8d4c 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.38.0"; + version = "1.38.2"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-XSwGTaR0pZXFdLqTBAWmiK2VqIkZ/7I+uckUUvDfmVQ="; + hash = "sha256-t8YG4RDuEfIlzvcG1/ozuLWyzX4T+JZfO4mvedKBsY4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-6n+aA5/8B89KSLnjB61kalX7Ugbtg+VwCaZ/ni2fe/w="; + vendorHash = "sha256-k2LkkABh6Rp/DFhagRM62UdDLFsM5nrtiltZZX5p+yk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix index 57f5d44815c4..8c6b3e6071b0 100644 --- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin-etkecc"; - version = "0.11.1-etke49"; + version = "0.11.1-etke50"; src = fetchFromGitHub { owner = "etkecc"; repo = "synapse-admin"; tag = "v${finalAttrs.version}"; - hash = "sha256-PbqO+Y740GWqfh584W6OS4HeQtO6Rkz6lc5IaTjadq0="; + hash = "sha256-460Ma0R1WG9BGB2NgHD7yIz+alcywtuhyHZXH4DPxDA="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-4o6TVbOSDm7btMDd4ItQR+jCFNZGhTXvycqcIh0FQnk="; + hash = "sha256-qpzrOfBInKHFH/uUViLCSIkjc41XUaHOyTs5oejt5NY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index a1aede3c9f58..8a1a2ffaf210 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2025-11-06"; + version = "0-unstable-2025-12-06"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "523b7f812746123e814d09e687f64781b71ac303"; - hash = "sha256-o4gKVsvOz09DazOTfEwNo4iOb8D++by3eAOko/1GMsI="; + rev = "f1e13091544e37ea276f219361348936bf4a272c"; + hash = "sha256-6lVS6sjK16194uH9raPJwkOZIOjgYVfYU2DK2Ruio1c="; }; postPatch = '' diff --git a/pkgs/by-name/sy/systemd-manager-tui/package.nix b/pkgs/by-name/sy/systemd-manager-tui/package.nix index bf6ac522b277..97b94ad871dd 100644 --- a/pkgs/by-name/sy/systemd-manager-tui/package.nix +++ b/pkgs/by-name/sy/systemd-manager-tui/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemd-manager-tui"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Matheus-git"; repo = "systemd-manager-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-rZ0Xz3TLklyo+HymYlM9RjKxp3Rv4OH9Vj/+sRYvfco="; + hash = "sha256-/KtvQBye5Z7xfCO57YhM/s+XOAT4ZIBU6Ycu398haXw="; }; - cargoHash = "sha256-38IKHIYMDS8GFxC6NTFA6hIipjAa4rpNHeZwd2+lfqU="; + cargoHash = "sha256-g6ES+A73E6k/TPw73azeYXj5R91Y98Im1enYKDqKTVk="; meta = { homepage = "https://github.com/Matheus-git/systemd-manager-tui"; diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix index 5fe573fbb691..a03577ac7f13 100644 --- a/pkgs/by-name/t-/t-rec/package.nix +++ b/pkgs/by-name/t-/t-rec/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "t-rec"; - version = "0.7.10"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-FyLahDf72uNPCKYqFyWxDkWw90R4Pnq94v64iFaAYFI="; + sha256 = "sha256-pM/p+fstEHDP+EBKjgbW1Tw1HxdNM9rpvFiMkbCDT3g="; }; - cargoHash = "sha256-J+Ng+X1k4oMtWPKkDevQVnYuFu7Ba35X4hBg3i3p8qM="; + cargoHash = "sha256-sUzvKeG1fmY40udLlxvvmJPJOCNlfliFKuEZYRtGQOM="; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/by-name/ta/tailscalesd/package.nix b/pkgs/by-name/ta/tailscalesd/package.nix index 718b05df48d9..07efa2db98d2 100644 --- a/pkgs/by-name/ta/tailscalesd/package.nix +++ b/pkgs/by-name/ta/tailscalesd/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tailscalesd"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cfunkhouser"; repo = "tailscalesd"; rev = "v${version}"; - hash = "sha256-OcvLVsPtAIaGTxk5SKNme0+i0PsDc8uY/sDcM/L5yqU="; + hash = "sha256-avGgkGgzeupZwqRPT1juRyTs6udpefTI0W0rqmvhwk0="; }; - vendorHash = "sha256-cBHAo2RL7Q6TJbv1QYrescMFwbSUnGlOmTqqt8CZ/qc="; + vendorHash = "sha256-DowF+3eTe+bC3wqfIznCaLwcl42vRyEzFCbMRZffZS8="; meta = { description = "Prometheus Service Discovery for Tailscale"; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/by-name/ta/tango-icon-theme/package.nix similarity index 76% rename from pkgs/data/icons/tango-icon-theme/default.nix rename to pkgs/by-name/ta/tango-icon-theme/package.nix index 5d9a4883b7ba..5e41a3f2b697 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/by-name/ta/tango-icon-theme/package.nix @@ -7,17 +7,17 @@ iconnamingutils, imagemagick, librsvg, - gtk, # any version + gtk3, # any version gnome-icon-theme, hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tango-icon-theme"; version = "0.8.90"; src = fetchurl { - url = "http://tango.freedesktop.org/releases/tango-icon-theme-${version}.tar.gz"; + url = "http://tango.freedesktop.org/releases/tango-icon-theme-${finalAttrs.version}.tar.gz"; sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f"; }; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool + gtk3 ]; buildInputs = [ iconnamingutils @@ -42,12 +43,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-png-creation" ]; - postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; + postInstall = '' + gtk-update-icon-cache $out/share/icons/Tango + ''; - meta = with lib; { + meta = { description = "Basic set of icons"; homepage = "https://tango.freedesktop.org/Tango_Icon_Library"; - platforms = platforms.linux; - license = licenses.publicDomain; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; }; -} +}) diff --git a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch b/pkgs/by-name/ta/tango-icon-theme/rsvg-convert.patch similarity index 100% rename from pkgs/data/icons/tango-icon-theme/rsvg-convert.patch rename to pkgs/by-name/ta/tango-icon-theme/rsvg-convert.patch diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix index 6dd95c8ca094..f1cc9a3034be 100644 --- a/pkgs/by-name/ta/taoup/package.nix +++ b/pkgs/by-name/ta/taoup/package.nix @@ -73,6 +73,5 @@ stdenv.mkDerivation rec { description = "Tao of Unix Programming (Ruby-powered ANSI colored fortunes)"; homepage = "https://github.com/globalcitizen/taoup"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.zakame ]; }; } diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index ae1eb771571b..e51085032ae9 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.6.0"; + version = "10.7.0"; src = fetchFromGitHub { - owner = "sjrc6"; - repo = "taterclient-ddnet"; + owner = "TaterClient"; + repo = "TClient"; tag = "V${finalAttrs.version}"; - hash = "sha256-Z5W+IBiNhEXyBVk6w2YzotBlHam1fELmr3ojJ0q4Ge8="; + hash = "sha256-9d4vKrWuDW2E1PXs4yRAyR6zNPfYEclW8RfHNnpkpyc="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { # Since we are not building the server executable, the `run_tests` Makefile target # will not be generated. # - # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.6.0/CMakeLists.txt#L3179 + # See https://github.com/TaterClient/TClient/blob/V10.7.0/CMakeLists.txt#L3207 doCheck = false; preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index bdbf27dc97c0..7a3a4902d640 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -32,12 +32,12 @@ let # fork of pypresence, to be reverted if/when there's an upstream release lynxpresence = python3Packages.buildPythonPackage rec { pname = "lynxpresence"; - version = "4.4.1"; + version = "4.6.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ="; + hash = "sha256-w4WShLTTSf4JGQVL4lTkbOLL8C7cjnf8WwHyfwKK2zA="; }; build-system = with python3Packages; [ setuptools ]; @@ -48,14 +48,14 @@ let in python3Packages.buildPythonApplication rec { pname = "tauon"; - version = "8.1.4"; + version = "8.2.2"; pyproject = true; src = fetchFromGitHub { owner = "Taiko2k"; repo = "Tauon"; tag = "v${version}"; - hash = "sha256-AV8B09H/25+2ZOoGux2/A4xP8sBBpRP197JYkS9/awk="; + hash = "sha256-d7bEC68ZJthJE/AlcUqBSNM4L4YAjwHXTiWDCtKf598="; }; postUnpack = '' diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index e8184a477f8e..935a58475032 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.91.4"; + version = "1.92.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-h1FDCC6+KYkrtJoGuBnoVnLgumb3kk720XXm+Pd0koE="; + hash = "sha256-Z+X7OUT38OB7559s+bOlraL9F2qSnhpzpQTYt07DYD0="; }; vendorHash = "sha256-3Y3GsVMImo0oCigAyQ2SPOucllrfkD9oj9o3ESk47eA="; diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index a12b1d55029f..906af6013a8d 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { pname = if tde2eOnly then "tde2e" else "tdlib"; - version = "1.8.57"; + version = "1.8.58"; src = fetchFromGitHub { owner = "tdlib"; @@ -47,8 +47,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "6f4ee8703898f7829c442c74c5170beada171962"; - hash = "sha256-G0wy//IkI/hVDeMRdZey1sagShu0bEM9/m9z/t1K/Co="; + rev = "282f96ca66421c348ed75aaca84471b3e39e64dd"; + hash = "sha256-Qry/jL/7pyPribh1Nn6L5hx5BfNNn+EG0YeOs5Z0M9Q="; }; buildInputs = [ diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 6b9657d642c7..76349a684778 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.6.17"; + version = "2.6.18"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-veOuhTo+RSKZnj+gEpd/Nf5+MipbpYcWtbZFoYYO4DI="; + hash = "sha256-hIFr+lJrM3FaCKQhUBzD8kzKaF1ZouCp+QLa558b35s="; }; - npmDepsHash = "sha256-iqSGqEz2YYNrNcB+B/8+KK/Ld2TzEFE+nFt3Oi6YP9w="; + npmDepsHash = "sha256-brru6gsHwu2wS1Qe2AjjMW9QOVYd2HBUzUvSl1EJ87M="; nativeBuildInputs = [ makeWrapper @@ -106,7 +106,7 @@ buildNpmPackage rec { desktopItems = [ (makeDesktopItem { name = "teams-for-linux"; - exec = "teams-for-linux"; + exec = "teams-for-linux %U"; icon = "teams-for-linux"; desktopName = "Microsoft Teams for Linux"; comment = meta.description; @@ -115,6 +115,7 @@ buildNpmPackage rec { "InstantMessaging" "Chat" ]; + mimeTypes = [ "x-scheme-handler/msteams" ]; }) ]; diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 5d826f5dfb69..8971d7dfc795 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "dns-server-v14.0.0"; + version = "dns-server-v14.2.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = version; - hash = "sha256-vQAYNXSXWWuEMLj+zWQIM5A4BYcyiUlfp7+Ttk4R+MA="; + hash = "sha256-a5gCwOxBlp+MzcxrYWY56ihb2ayC/l9G3SQ31ZVpBZc="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index dcfe49aa3060..49533367f839 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -10,13 +10,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "14.0.0"; + version = "14.2.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-h7lcm9gKaCIPccg4Mxp78qSgygAuFyRPd1jPfmkoarU="; + hash = "sha256-zLm6uEC8BoaDfyzmLErJTOzzSKxrmb0j3VhEcsyizI4="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix index 2a0f7ce92d47..2f9d033efe48 100644 --- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix +++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix @@ -42,7 +42,12 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "version"; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v([0-9.]+)" + ]; + }; meta = { homepage = "https://pipelinesascode.com"; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 28a962fc330b..ef580514aec6 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.36.4"; + version = "1.37.0"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-sqFknEDhBR370w7MRHV34mz/j+TNzY2+vNDqouDAiwA="; + hash = "sha256-8PacuXxxGv4bjmkY8mtPjyycaUvnNtMu8XtOgKhKpNo="; }; - vendorHash = "sha256-8Dtztt5Z8Wn2ZsDCOJ5NiID6w3/xNXwEy0WnQYNwFg4="; + vendorHash = "sha256-22XtJ+V859xk0DGPJFVtuaqn91QC8ag1EWR653QuAA4="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 1ed08ec1a4d0..13c0ef10cebe 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -39,6 +39,27 @@ let # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941 doCheck = false; + postPatch = '' + # Remove keybinding overrides from shell completion scripts + # Users should configure their own keybindings + + # Bash: Remove bind commands + sed -i '/^# Bind the functions to key combinations/,$d' \ + television/utils/shell/completion.bash + + # Fish: Remove bind commands for both modes + sed -i '/^for mode in default insert/,$d' \ + television/utils/shell/completion.fish + + # Nushell: Remove keybinding configuration + sed -i '/^# Bind custom keybindings/,$d' \ + television/utils/shell/completion.nu + + # Zsh: Remove zle and bindkey commands + sed -i '/^zle -N tv-smart-autocomplete/,$d' \ + television/utils/shell/completion.zsh + ''; + postInstall = '' installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1 diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index a53e2d224ef2..5ab08c77ef11 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ - Br1ght0ne th0rgal Rishik-Y ]; diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix index 81d562e43cb1..3e89b864fea5 100644 --- a/pkgs/by-name/te/terraform-backend-git/package.nix +++ b/pkgs/by-name/te/terraform-backend-git/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "terraform-backend-git"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "plumber-cd"; repo = "terraform-backend-git"; rev = "v${version}"; - hash = "sha256-mZbGMv5b9wK/gWqQB75sDJIVURrS6t/L7WBhTonaatQ="; + hash = "sha256-hOHNUgRFb2Hh1P3W4tpB6COzTZiR59SP7luEevyozQg="; }; - vendorHash = "sha256-vFx59dIdniLRP0xHcD3c22GidZOPdGZvmvg/BvxFBGI="; + vendorHash = "sha256-c1gf1qrxZ2rjB4GOh214vrtFBVo5nHJj5tesdiJxbjw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 898fbe1c3eed..293342cea560 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.93.11"; + version = "0.93.12"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ff56GmIgi95BIRFUJ5KJGiqeioCfHY/ZseZ3Q4YzrtU="; + hash = "sha256-TiSjKr8A5mxUWgVnWjWB2sgPbqSjIJlf8DetYiuw8No="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-SLRWtOBPa2jVWTHVYfjlEEfK+I/ZKA3ls/LLV5/oLfQ="; + vendorHash = "sha256-DkFqj52mdkJvjG5yceRH5GEKWHU73rOE6dJno/6N2k8="; doCheck = false; diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index a4e99d7ef418..7dcb7d00327f 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-JI5NwohnSFogOgzk7PJplFhXNnhfrkOk6U/7bWPtGVk="; + hash = "sha256-ntWgobBBYaBORwEg3kODH9II5ydsEi3ckTDdb65eO18="; }; vendorHash = "sha256-o2MNmJmYMq2mQBLslOtRyRH9euEhcJyIhohJ3CKp6kg="; diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index a39d3b841c73..657bc1ad0e92 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-5UkE7hd9ffKlDssZ0osslbWXSOGqodkS81/qnQfZzac="; + hash = "sha256-2jUUipT6xE/8qxWaMsUmrEf2qmDcE93vp2nME01B34A="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix new file mode 100644 index 000000000000..eb7dc7573e33 --- /dev/null +++ b/pkgs/by-name/tg/tgeraser/package.nix @@ -0,0 +1,48 @@ +{ + fetchFromGitHub, + lib, + python3Packages, + versionCheckHook, +}: +python3Packages.buildPythonApplication rec { + pname = "tgeraser"; + version = "1.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "en9inerd"; + repo = "tgeraser"; + tag = "v${version}"; + hash = "sha256-xB6bdB6ndyS3EOb3D2h9mRbelUXSQXkBkDvzCm7m5TY="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + docopt + pyaes + pyasn1 + rsa + telethon + ]; + + pythonImportsCheck = [ "tgeraser" ]; + + nativeCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + meta = { + description = "Tool to delete all your messages from Telegram"; + longDescription = '' + TgEraser is a Python tool that allows you to delete all your messages from + a chat, channel, or conversation on Telegram without requiring admin + privileges. + ''; + homepage = "https://github.com/en9inerd/tgeraser"; + changelog = "https://github.com/en9inerd/tgeraser/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.azahi ]; + mainProgram = "tgeraser"; + }; +} diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix index 7d91dd87ca17..8700ea4ed286 100644 --- a/pkgs/by-name/th/thedesk/package.nix +++ b/pkgs/by-name/th/thedesk/package.nix @@ -5,65 +5,67 @@ dpkg, autoPatchelfHook, makeWrapper, - electron, alsa-lib, gtk3, libxshmfence, libgbm, + libGL, + musl, nss, + systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thedesk"; - version = "24.2.1"; + version = "25.2.2"; src = fetchurl { - url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo="; + url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb"; + hash = "sha256-9Xd0YHkFHPVY6BHy0V1X7p27m2iJFVHmSickzMJeOXs="; }; nativeBuildInputs = [ - dpkg autoPatchelfHook + dpkg makeWrapper ]; buildInputs = [ alsa-lib gtk3 - libxshmfence libgbm + libGL + libxshmfence + musl nss ]; - dontBuild = true; - dontConfigure = true; + runtimeDependencies = [ systemd ]; installPhase = '' runHook preInstall - mv usr $out - mv opt $out - - # binary is not used and probably vulnerable to CVE(s) - rm $out/opt/TheDesk/thedesk - - substituteInPlace $out/share/applications/thedesk.desktop \ - --replace '/opt/TheDesk' $out/bin - - makeWrapper ${electron}/bin/electron $out/bin/thedesk \ - --add-flags $out/opt/TheDesk/resources/app.asar + substituteInPlace usr/share/applications/thedesk-next.desktop \ + --replace-fail "/opt/TheDesk/thedesk-next" "thedesk" + cp --recursive usr $out + mkdir $out/libexec $out/bin + cp --recursive opt/TheDesk $out/libexec/thedesk + ln --symbolic $out/libexec/thedesk/thedesk-next $out/bin/thedesk runHook postInstall ''; - meta = with lib; { + preFixup = '' + patchelf --add-needed libGL.so.1 $out/libexec/thedesk/thedesk-next + ''; + + meta = { description = "Mastodon/Misskey Client for PC"; homepage = "https://thedesk.top"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "thedesk"; }; -} +}) diff --git a/pkgs/by-name/th/thicket/package.nix b/pkgs/by-name/th/thicket/package.nix index bef6bc28c2b5..85f5be3617fa 100644 --- a/pkgs/by-name/th/thicket/package.nix +++ b/pkgs/by-name/th/thicket/package.nix @@ -26,7 +26,6 @@ crystal.buildCrystalPackage rec { description = "Better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "thicket"; }; } diff --git a/pkgs/by-name/th/thorium-reader/package.nix b/pkgs/by-name/th/thorium-reader/package.nix new file mode 100644 index 000000000000..c50d24dc2e69 --- /dev/null +++ b/pkgs/by-name/th/thorium-reader/package.nix @@ -0,0 +1,78 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs_24, + makeWrapper, + electron, + copyDesktopItems, + makeDesktopItem, +}: + +buildNpmPackage (finalAttrs: { + pname = "thorium-reader"; + version = "3.2.2"; + nodejs = nodejs_24; + npmDepsHash = "sha256-T70Oxn97oDyFSxkJ55nlM2ET0UEWpo8ahnipkUwgTcM="; + makeCacheWritable = true; + + src = fetchFromGitHub { + owner = "edrlab"; + repo = "thorium-reader"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+1cc8UxcLaqC6Yrc4RYAKDZ4hzoz0eX31HaiUtp/znE="; + }; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + postInstall = '' + install -Dpm644 resources/icon.png $out/share/icons/hicolor/1024x1024/apps/thorium-reader.png + + cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/ + + makeWrapper '${lib.getExe electron}' "$out/bin/thorium-reader" \ + --add-flags $out/lib/node_modules/EDRLab.ThoriumReader \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + ''; + + desktopItems = [ + (makeDesktopItem { + name = "thorium-reader"; + desktopName = "Thorium"; + exec = "thorium-reader %u"; + terminal = false; + type = "Application"; + icon = "thorium-reader"; + startupWMClass = "thorium-reader"; + mimeTypes = [ + "application/epub+zip" + "application/daisy+zip" + "application/vnd.readium.lcp.license.v1.0+json" + "application/audiobook+zip" + "application/webpub+zip" + "application/audiobook+lcp" + "application/pdf+lcp" + "x-scheme-handler/thorium" + "x-scheme-handler/opds" + ]; + comment = "Desktop application to read ebooks"; + categories = [ "Office" ]; + }) + ]; + + meta = { + description = "EPUB reader"; + homepage = "https://www.edrlab.org/software/thorium-reader/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ YodaDaCoda ]; + platforms = lib.platforms.all; + mainProgram = "thorium-reader"; + }; +}) diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index e13aeefcd4dc..70593b4430cc 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ei3noC/RXUCfwLHjiYZ/+M1vjn/9g1JhTI2A4O4DJZM="; + hash = "sha256-C5X1+spnhJgynG8vPgU/HMjDikPmm/xNZ/svVQHA9N4="; }; - vendorHash = "sha256-S+aiL1nY57gOXgaNwFXUk9xfUpFOok8XHYKBtQKHmOc="; + vendorHash = "sha256-LdCwPXPPt7kxK8FvXN332ih9SMhUWyEfXq+7OLQ+Uv0="; # The attestation test requires internet access checkFlags = [ "-skip=TestAttestationVerifySEV" ]; diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix index 7afa3629b866..b799d6c24924 100644 --- a/pkgs/by-name/ti/tiny/package.nix +++ b/pkgs/by-name/ti/tiny/package.nix @@ -35,9 +35,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/osa1/tiny"; changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - Br1ght0ne - ]; + maintainers = [ ]; mainProgram = "tiny"; }; } diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix index e5b8fa173eaa..9877861b2cd0 100644 --- a/pkgs/by-name/tk/tk-safe/package.nix +++ b/pkgs/by-name/tk/tk-safe/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "tk-safe"; - version = "25.10.1"; - revision = "22"; + version = "25.10.2"; + revision = "23"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_${revision}.snap"; - hash = "sha512-pRPtOF/+L8FVCvnB+CKCJvzxbCAVxN5EAn7SzNDFIrm+Ar9Xl03Lup+a8SmIdAN2t9Mfd1YxqZHpixH3EMPTdA=="; + hash = "sha512-Al2SOS2X7FO7uuqB1iyZapYP+AJHVqRnPxzupt5N0TwfSCP+N3FgiKN32tzsROoff8hkmQt5En3hFCCh3/UePA=="; }; desktopItems = [ diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix index 668fd919e3d2..522fe50daf82 100644 --- a/pkgs/by-name/tl/tlsinfo/package.nix +++ b/pkgs/by-name/tl/tlsinfo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tlsinfo"; - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "paepckehh"; repo = "tlsinfo"; tag = "v${version}"; - hash = "sha256-EtKke+kMheZ7R7q+4TlJD18x+s5qTa+JFpdwFdDsa7A="; + hash = "sha256-UD/dy8pEulsoNOC5W+hkC+n4y8SjpZ0QOOECGPVy1ws="; }; - vendorHash = "sha256-L5xL66T2FDTjiGb4VrCjwalcvKzCYdGaJ/w77FyEZjo="; + vendorHash = "sha256-SkCuyYUwVcbCDSN0NtX29BNP/pPlFHqo0jU0Qo02mNk="; ldflags = [ "-s" diff --git a/pkgs/by-name/tm/tmatrix/package.nix b/pkgs/by-name/tm/tmatrix/package.nix index 478f7222fbae..785ee27433ad 100644 --- a/pkgs/by-name/tm/tmatrix/package.nix +++ b/pkgs/by-name/tm/tmatrix/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/M4444/TMatrix"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "tmatrix"; }; } diff --git a/pkgs/by-name/tm/tmpmail/package.nix b/pkgs/by-name/tm/tmpmail/package.nix index a7fe5fe237da..43e97972f72b 100644 --- a/pkgs/by-name/tm/tmpmail/package.nix +++ b/pkgs/by-name/tm/tmpmail/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/sdushantha/tmpmail"; description = "Temporary email right from your terminal written in POSIX sh"; license = licenses.mit; - maintainers = [ maintainers.lom ]; + maintainers = [ ]; mainProgram = "tmpmail"; }; } diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix index 4f6668b1b659..35a49b04d009 100644 --- a/pkgs/by-name/tm/tmux/package.nix +++ b/pkgs/by-name/tm/tmux/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tmux"; - version = "3.6"; + version = "3.6a"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "tmux"; repo = "tmux"; rev = finalAttrs.version; - hash = "sha256-jIHnwidzqt+uDDFz8UVHihTgHJybbVg3pQvzlMzOXPE="; + hash = "sha256-VwOyR9YYhA/uyVRJbspNrKkJWJGYFFktwPnnwnIJ97s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 967423601d0d..1ec99d8b4bfd 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.6.55"; + version = "0.7.4"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-kJ8F0gAx7ua6FvHZCSY19KOPKiCvlHIiRPwgG1HiiEY="; + hash = "sha256-KbXrqnPadztw7uNmaqWNKWZR3YMysRmNfg7A2XlhE4E="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-BP0sxpplP3O/YVy2RPEd7ojFQ7a6Gl4valRBL3Twnug="; + cargoHash = "sha256-dpOQsaUzd1n/yBVVVp/mAVvJNLKzvOAjos0tgkzvF44="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index f42c2269dc2f..28f5c0c75db0 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "16.6.0"; + version = "16.6.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; tag = "v${version}"; - hash = "sha256-hZD7I31kmX+wvurDa+7NHitzJEdN5Yudr1y6djGeh04="; + hash = "sha256-HOMCk88PrngnrBUGw3cBo8ZEh2Qez/+fmuK1I+tTevc="; }; - cargoHash = "sha256-gYuKMpBy/muH0ZjYrIy6v8xqOVP1Ph/hx8VKfOPKJJc="; + cargoHash = "sha256-+aH73WsAuE1BWWJo12X7dCF54uXG452ITonWfp16vWY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index 39dedf7a4503..008934e94fdf 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.22.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-+PkqIO3xsShSTyi5yBa9a3zLU8BIwERlBv84nuk8rHI="; + sha256 = "sha256-49byQWrv0yDPCAMcgltlDnmYZ5TWyTUIZy0K46CiTUs="; }; - vendorHash = "sha256-JGVieAp5pg+Vhqx/Ge6xkR3sm/e+qYjMYrkYcPZjpiA="; + vendorHash = "sha256-ltvWWB0Y5arPV8o3bSYHcDf1ZSRRCrPriXklShj/fjo="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix index efb72643499f..a341868bf407 100644 --- a/pkgs/by-name/tr/traccar/package.nix +++ b/pkgs/by-name/tr/traccar/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "traccar"; - version = "6.10.0"; + version = "6.11.1"; nativeBuildInputs = [ pkgs.makeWrapper ]; src = fetchzip { stripRoot = false; url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip"; - hash = "sha256-esXmcN3j7rZ6Sx9n772LC39hN25tHKq7RIn+j/PyISw="; + hash = "sha256-IYdcLOTGPoAs8Rg5WcYOMctOiY7icpvoVKLF7BhMTBY="; }; installPhase = '' diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index c3b9c8be510e..2ae0fd2ad55e 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -8,16 +8,16 @@ buildGo124Module (finalAttrs: { pname = "traefik"; - version = "3.6.2"; + version = "3.6.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; - hash = "sha256-waFed0xsEJb3C9ywTIoKnqUcrIgBc8/zq8XwoDTIF88="; + hash = "sha256-gvKOQloDiRlBMxQ8x9eUSO6zs/IMdbHQsu4uwForrrY="; stripRoot = false; }; - vendorHash = "sha256-JJCyr4aYqHOvXBMp/iSY6OPXxZGNwegx7mpGO6DFo9s="; + vendorHash = "sha256-pK6KUXPnbHeCXS+DGoNIoCfoPkBqaMZwOLW8Y4F3eOI="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index b290d4bccc5b..a12610368459 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.86.5"; + version = "2.86.10"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-0r73id/Yy9CrLM56x66iJtzrC7WCC/VSA+rRKiz9cDk="; + hash = "sha256-R/eaDkP3uQcaGMWfECyWpWeMoSBukXLrG6t+NT2bO50="; }; postPatch = '' diff --git a/pkgs/by-name/tr/tremotesf/package.nix b/pkgs/by-name/tr/tremotesf/package.nix index 8edfd17f6c6b..187eba14263b 100644 --- a/pkgs/by-name/tr/tremotesf/package.nix +++ b/pkgs/by-name/tr/tremotesf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; tag = finalAttrs.version; - hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg="; + hash = "sha256-bDeyVmcKw6pMrsN123OnZio7YHs1Y/bfg+EnFTHY8gE="; # We need this for src/libtremotesf fetchSubmodules = true; }; diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index 3f49e3c54867..4d33c0fff2a8 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "25.11.2"; + version = "25.11.3"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-pwwtspFYDJAT6MAKzD7G3dI4JXtBDfsaPhe1YDFU0FsNkYhvObpvXfHIwzaRYKJT3Naam9KTLyGqmjgRdf3zag=="; - x86_64-linux = "sha512-/+fGC4B303mW+HJ7uOzPrQLQtofZVdnQnry3Z5CcpyGJFm+4tGAdmcFHVgYV81flabeH105q+pcR3hJhTTb8Jg=="; + aarch64-linux = "sha512-fY2X571p71HCtAFGcYxBwvrlb556hJSyBCNkyVJ6s+P3GuBlTqapSTuE/ZAyPraS9H/QMEVnZF+Qpzu/6hgiew=="; + x86_64-linux = "sha512-00Nnc7xY3snP5gS5GzszgE3MVTNZ6jUiU43D68Pz4aYzgNaPn8JMuh3kC0ybxm4HaHnZ9EC4Eraa9U5gO8Mq3w=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tr/trgui-ng/package.nix b/pkgs/by-name/tr/trgui-ng/package.nix index e972e35b4cd4..7c016eeceddf 100644 --- a/pkgs/by-name/tr/trgui-ng/package.nix +++ b/pkgs/by-name/tr/trgui-ng/package.nix @@ -15,13 +15,13 @@ webkitgtk_4_1, }: let - version = "1.4.0-unstable-2025-05-18"; + version = "1.5.0"; src = fetchFromGitHub { owner = "openscopeproject"; repo = "TrguiNG"; - rev = "d2cd93ecc724f196d93c701fa27afa4288d2a37c"; - hash = "sha256-Y3ZSpXmG+wi7x7qanKpRp917alssqF78L27Yt9K9Khs="; + tag = "v${version}"; + hash = "sha256-N049HA+X9DcXyhmFbnxjfbQoKlf3dA73c1IOYFrDgwc="; }; meta = { @@ -34,7 +34,7 @@ let frontend = buildNpmPackage (finalAttrs: { pname = "TrguiNG-frontend"; inherit version src; - npmDepsHash = "sha256-sHZHAlV3zVeCmVTlIr0NeS1zxRCKfRMv1w9bW0tOg3g="; + npmDepsHash = "sha256-Ql1/itjEfvYigUzEZDWsGgJj7oZ1p6Bo00eLHRVHi4c="; npmBuildScript = "webpack-prod"; @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "TrguiNG"; inherit version src; - cargoHash = "sha256-TflzT1BNAciMcxcejrlmIOIjXc1tpm/zX0kjk+dpGiM="; + cargoHash = "sha256-YGBLAO8lFvbowbT3yt2m/OQrpGzWghtyyZQJeYVQijA="; postPatch = '' cp ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb src-tauri/dbip.mmdb diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index c1de3be0944e..a213d14ca0f5 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.91.2"; + version = "3.92.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-+sG/heW0Dqs3TvdtpAvqnCYU7e4paTSDKX7rtCvacq4="; + hash = "sha256-eKhmSUqT6t4l1SOBMI65wEj5hXsi3Bkxys2nd8cGb4I="; }; vendorHash = "sha256-Qz0tKqqT3PlZFCiYxLBmHeICIx2ogOUW7rfXHadcVPg="; diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix index 7bf821b7025e..68b670ba5935 100644 --- a/pkgs/by-name/tr/trustymail/package.nix +++ b/pkgs/by-name/tr/trustymail/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trustymail"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "cisagov"; repo = "trustymail"; tag = "v${version}"; - hash = "sha256-EA8RomXREDAHZIuq8x+t6w7V1ErUOuuo0TUyaxIgdR8="; + hash = "sha256-NF89Am/sG3Ruaws2SUofrbLoEiKdYpgPuXIAKjst9hk="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/ts/tshock/package.nix b/pkgs/by-name/ts/tshock/package.nix index 822f58014721..97fe24692726 100644 --- a/pkgs/by-name/ts/tshock/package.nix +++ b/pkgs/by-name/ts/tshock/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "tshock"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "Pryaxis"; repo = "TShock"; rev = "v${version}"; - sha256 = "sha256-1EtHpBZ7bbwVbl+tMfwpjgPuxu98XKvxlZ2+SbUlWV4="; + sha256 = "sha256-dQ4yux5k4K1t6ah9r4X6d1KPAMqzzCsGvBKhm0TYIjA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ts/tsidp/package.nix b/pkgs/by-name/ts/tsidp/package.nix index 04bc37a65d86..6d590565b0f6 100644 --- a/pkgs/by-name/ts/tsidp/package.nix +++ b/pkgs/by-name/ts/tsidp/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "tsidp"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "tailscale"; repo = "tsidp"; tag = "v${finalAttrs.version}"; - hash = "sha256-7VOTrIYwNnayjQ4s/dFIIUj58XG5LTRvdLXdGpeW0CY="; + hash = "sha256-ClN3aZ0mLmb4UPSW+oQSrKPar56wbHp+NXOzGA6GpCQ="; }; vendorHash = "sha256-iBy+osK+2LdkTzXhrkSaB6nWpUCpr8VkxJTtcfVCFuw="; diff --git a/pkgs/by-name/ts/tsocks/package.nix b/pkgs/by-name/ts/tsocks/package.nix index 03faca1336f4..4bd4c1f44ec5 100644 --- a/pkgs/by-name/ts/tsocks/package.nix +++ b/pkgs/by-name/ts/tsocks/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { mainProgram = "tsocks"; homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix new file mode 100644 index 000000000000..713fd3978416 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix @@ -0,0 +1,34 @@ +{ + lib, + nixosTests, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "tt-rss-plugin-auth-ldap"; + version = "unstable-2022-11-30"; + + src = fetchFromGitHub { + owner = "hydrian"; + repo = "TTRSS-Auth-LDAP"; + rev = "582ade49fd433a30b403caa1d0689fca5f3c99e1"; + sha256 = "sha256-favz/2KvWqvv8ehTv3gc7TBbFDjkrOmutChnyKPgces="; + }; + + installPhase = '' + install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php + ''; + + passthru = { + tests = { inherit (nixosTests) tt-rss; }; + }; + + meta = with lib; { + description = "Plugin for TT-RSS to authenticate users via ldap"; + license = licenses.asl20; + homepage = "https://github.com/hydrian/TTRSS-Auth-LDAP"; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/tt/tt-rss-plugin-data-migration/package.nix b/pkgs/by-name/tt/tt-rss-plugin-data-migration/package.nix new file mode 100644 index 000000000000..c5c484eda3e9 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-plugin-data-migration/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchgit, +}: + +stdenv.mkDerivation { + pname = "tt-rss-plugin-data-migration"; + version = "0-unstable-2023-11-01"; + + src = fetchgit { + url = "https://git.tt-rss.org/fox/ttrss-data-migration.git"; + rev = "e13d5f97b4887ce7b57b3d76228d838dec15963d"; + hash = "sha256-xnbR5IQ0h7ilxchNj55ROZdq1L7MIAwv3/00k09WTTs="; + }; + + installPhase = '' + runHook preInstall + + install -D init.php $out/data_migration/init.php + + runHook postInstall + ''; + + meta = { + description = "Plugin for TT-RSS to exports and imports *all* articles of a specific user via neutral format (JSON files in a ZIP archive)"; + # this plugin doesn't have a license file + license = lib.licenses.unfree; + homepage = "https://git.tt-rss.org/fox/ttrss-data-migration.git/"; + maintainers = with lib.maintainers; [ wrvsrx ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix new file mode 100644 index 000000000000..8e92d249f6f4 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + tt-rss, +}: + +stdenv.mkDerivation rec { + pname = "tt-rss-plugin-feediron"; + version = "1.33"; + + src = fetchFromGitHub { + owner = "feediron"; + repo = "ttrss_plugin-feediron"; + rev = "v${version}"; + sha256 = "sha256-KU4XQJNK7Ua7rZaXA32lv16RlloCysAb54E5kEY847A="; + }; + + installPhase = '' + mkdir -p $out/feediron + + cp -r bin filters init.php preftab recipes $out/feediron/ + ''; + + meta = with lib; { + description = "Evolution of ttrss_plugin-af_feedmod"; + longDescription = '' + This is a plugin for Tiny Tiny RSS (tt-rss). + It allows you to replace an article's contents by the contents of an element on the linked URL's page + + i.e. create a "full feed". + ''; + license = licenses.mit; + homepage = "https://github.com/feediron/ttrss_plugin-feediron"; + maintainers = with maintainers; [ milogert ]; + inherit (tt-rss.meta) platforms; + }; +} diff --git a/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix new file mode 100644 index 000000000000..cdae35b9baff --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "tt-rss-plugin-ff-instagram"; + version = "0-unstable-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 + + src = fetchFromGitHub { + owner = "wltb"; + repo = "ff_instagram"; + rev = "0366ffb18c4d490c8fbfba2f5f3367a5af23cfe8"; + sha256 = "0vvzl6wi6jmrqknsfddvckjgsgfizz1d923d1nyrpzjfn6bda1vk"; + }; + + installPhase = '' + mkdir -p $out/ff_instagram + + cp *.php $out/ff_instagram + ''; + + meta = with lib; { + broken = true; # Plugin code does not conform to plugin API changes. See https://github.com/wltb/ff_instagram/issues/13 + description = "Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites"; + longDescription = '' + Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites. + + The name of the plugin in TT-RSS is 'ff_instagram'. + ''; + license = licenses.agpl3Plus; + homepage = "https://github.com/wltb/ff_instagram"; + maintainers = with maintainers; [ gileri ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/tt/tt-rss-plugin-freshapi/package.nix b/pkgs/by-name/tt/tt-rss-plugin-freshapi/package.nix new file mode 100644 index 000000000000..bf86938eb852 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-plugin-freshapi/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "tt-rss-plugin-freshapi"; + version = "0-unstable-2024-11-14"; + + src = fetchFromGitHub { + owner = "eric-pierce"; + repo = "freshapi"; + rev = "44c98f12e8a4423501fc6d8cb7903cca11094dc6"; + hash = "sha256-1cQ4QMrXOdtelAbmMEuhWJPFi5XrAoR3IGlFzb8122k="; + }; + + installPhase = '' + runHook preInstall + + install -D init.php $out/freshapi/init.php + install -D api/greader.php $out/freshapi/api/greader.php + install -D api/freshapi.php $out/freshapi/api/freshapi.php + + runHook postInstall + ''; + + meta = { + description = "FreshRSS / Google Reader API Plugin for Tiny-Tiny RSS"; + license = lib.licenses.agpl3Only; + homepage = "https://github.com/eric-pierce/freshapi"; + maintainers = with lib.maintainers; [ wrvsrx ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix new file mode 100644 index 000000000000..b211d25c17a5 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix @@ -0,0 +1,38 @@ +{ + lib, + nixosTests, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "tt-rss-theme-feedly"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "levito"; + repo = "tt-rss-feedly-theme"; + rev = "v${version}"; + sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4="; + }; + + dontBuild = true; + + installPhase = '' + mkdir $out + + cp -ra feedly *.css $out + ''; + + passthru = { + tests = { inherit (nixosTests) tt-rss; }; + }; + + meta = with lib; { + description = "Feedly theme for Tiny Tiny RSS"; + license = licenses.mit; + homepage = "https://github.com/levito/tt-rss-feedly-theme"; + maintainers = with maintainers; [ das_j ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/tt/tt-rss/package.nix b/pkgs/by-name/tt/tt-rss/package.nix new file mode 100644 index 000000000000..aed3e6f154b2 --- /dev/null +++ b/pkgs/by-name/tt/tt-rss/package.nix @@ -0,0 +1,49 @@ +# nixpkgs-update: no auto update +{ + lib, + stdenv, + fetchgit, + nixosTests, + unstableGitUpdater, +}: + +stdenv.mkDerivation rec { + pname = "tt-rss"; + version = "0-unstable-2025-11-01"; + + src = fetchgit { + url = "https://github.com/tt-rss/tt-rss.git"; + rev = "912162ad811869af334232d32fe6c79b3cf095ca"; + hash = "sha256-2U9V4MTWGNZzdVr9AlH/S7KdBGPap+mm5/KieWLcF1A="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -ra * $out/ + + # see the code of Config::get_version(). you can check that the version in + # the footer of the preferences pages is not UNKNOWN + echo "${version}" > $out/version_static.txt + + runHook postInstall + ''; + + passthru = { + tests = { inherit (nixosTests) tt-rss; }; + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + }; + + meta = with lib; { + description = "Web-based news feed (RSS/Atom) aggregator"; + license = licenses.gpl3Plus; + homepage = "https://tt-rss.org"; + maintainers = with maintainers; [ + gileri + globin + zohl + ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index ab14a2bf038e..4e9656145c5a 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.17.0"; + version = "4.18.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-NVNnkGWI2+lFfxpeUPFEVrr6QHj1U1jcyLXyFjGh5uo="; + sha256 = "sha256-vpkqUHMTHsWHLcnePlFLhkckDDLZV/y/iATmQHby9cs="; }; - cargoHash = "sha256-kFnMNl/s7n0VyPPt7ie3kZjC7y7ZB5HX6jUoBBTFp50="; + cargoHash = "sha256-t6uThxXCQ4sN6SQCOe9GOglI4DVvfdf0PZ3m6H14KLw="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tu/tuios/package.nix b/pkgs/by-name/tu/tuios/package.nix index 33b8f43e8254..38c0c2ddd9fe 100644 --- a/pkgs/by-name/tu/tuios/package.nix +++ b/pkgs/by-name/tu/tuios/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "tuios"; - version = "0.3.4"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Gaurav-Gosain"; repo = "tuios"; tag = "v${finalAttrs.version}"; - hash = "sha256-pIzHf4JT+BEa4On92uWscbZoEd3eRjf/B+aUART2V4M="; + hash = "sha256-4x5Vqd81/ZFXDpPUnJeOzI2DprAD49saL+aZZMAxI3w="; }; - vendorHash = "sha256-tu8GXE/wMq2i61gTlgdbfL38ehVppa/fz1WVXrsX+vk="; + vendorHash = "sha256-uhqa850dHRHNZLXUMGg9Hb8skEY/5CrGmxSmnBytW/s="; ldflags = [ "-s" diff --git a/pkgs/by-name/tu/tuir/package.nix b/pkgs/by-name/tu/tuir/package.nix index 3ff5f3874e50..57cfa5874d72 100644 --- a/pkgs/by-name/tu/tuir/package.nix +++ b/pkgs/by-name/tu/tuir/package.nix @@ -55,7 +55,6 @@ buildPythonApplication rec { homepage = "https://gitlab.com/Chocimier/tuir"; license = licenses.mit; maintainers = with maintainers; [ - Br1ght0ne matthiasbeyer brokenpip3 ]; diff --git a/pkgs/by-name/tu/tunnelto/package.nix b/pkgs/by-name/tu/tunnelto/package.nix index 17c39ca3ac3d..0ba494736559 100644 --- a/pkgs/by-name/tu/tunnelto/package.nix +++ b/pkgs/by-name/tu/tunnelto/package.nix @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage { description = "Expose your local web server to the internet with a public URL"; homepage = "https://tunnelto.dev"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index cf4b6c6f2a32..f71c89defe3c 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "6.2.1"; + version = "6.2.2"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-yxtMpmPB3w+28aU0G4hAF3I+uijdI5yavqHlthZ9eIs="; + hash = "sha256-de4LGEuBxuCeySpsUi6iIIf4asJLdR7HcqflnSD7jyw="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index e4d897851bcf..9d24a6668db6 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.29"; + version = "0.0.1-alpha.32"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-64/SE+B5fIaPS2qWHBNza8w14ID9xUVH8GhXSSB8Fbw="; + hash = "sha256-Kc5jxDpQv7bm4J7EdejkrUv/lz7hRc01riUIEdv+wmY="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-ySR1pe9zwihjTzr3qhv71LuJbrhBWgZ+z+n9qEEern4="; + cargoHash = "sha256-GEf/gU2DXz+u7kPHAB1NRqkmn0f7NV3M5U9u17adtkI="; nativeBuildInputs = [ installShellFiles ]; @@ -56,6 +56,14 @@ rustPlatform.buildRustPackage (finalAttrs: { "--package=ty_test" # test framework tests ]; + checkFlags = [ + # Flaky: + # called `Result::unwrap()` on an `Err` value: Os { code: 26, kind: ExecutableFileBusy, message: "Text file busy" } + "--skip=python_environment::ty_environment_and_active_environment" + "--skip=python_environment::ty_environment_is_only_environment" + "--skip=python_environment::ty_environment_is_system_not_virtual" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix index 7622ba0d9384..9abd872e1c9e 100644 --- a/pkgs/by-name/ty/tydra/package.nix +++ b/pkgs/by-name/ty/tydra/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { description = "Shortcut menu-based task runner, inspired by Emacs Hydra"; homepage = "https://github.com/Mange/tydra"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "tydra"; }; } diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index cc5f52565a58..ab9d4dbe7138 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,13 +10,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-11-28"; + version = "0-unstable-2025-12-06"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "ea6a3dc055cfcac80fecf12264b01d62bfd7a094"; - hash = "sha256-gn46RcWqXor7yyMhG/TH3DwzTAko/5kST65iZ32vqgg="; + rev = "1d138eaa29bc189e6b4f04b87fe278b6afe7e62f"; + hash = "sha256-CNVKfWvlRzKPm3WSFxT7te5gd5TfErApseUfrqcwUQU="; fetchSubmodules = false; }; diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix index 74a034167630..e5b0291eaa71 100644 --- a/pkgs/by-name/ty/typesetter/package.nix +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "typesetter"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "haydn"; repo = "typesetter"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZbMg7yKJ9nYVqDfPO614PhEoL8fmVbdHONfWgCbZZ0k="; + hash = "sha256-PFqMV5ofEg5Va08ssD6en5YXCpYrRjG7pSVD34l/QQY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-ZCWMyxzku5FXWF7EkeQ6O9qbZs1MBzuSIw2g198DNt0="; + hash = "sha256-RBDb0+6bD7K+FZ+Qg9vV1LDn/LT2xfPh/XsPfQWfwJQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 2c750ac6a9ab..d4c04b90833e 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.45"; + version = "0.1.46"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-Yyb2i3ymkxZGmyl3N7hcM2pWuJZRMxcWRNk283wdyy4="; + hash = "sha256-cl9Ufoj+O0rmLIQ6iRYuF0xmziGdwtb9GeRWxM+9nP0="; }; - cargoHash = "sha256-FMKS49Uz7gwsXoa9VjVlMwUzZWUJ5D2kOYjQro9iNwE="; + cargoHash = "sha256-PdLMAoezqmIb7RHU+5e8fnjY8ZO85aMJlznzzM2VWXA="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ud/udp-over-tcp/package.nix b/pkgs/by-name/ud/udp-over-tcp/package.nix new file mode 100644 index 000000000000..3f16a146ae84 --- /dev/null +++ b/pkgs/by-name/ud/udp-over-tcp/package.nix @@ -0,0 +1,39 @@ +{ + fetchFromGitHub, + lib, + nixosTests, + rustPlatform, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "udp-over-tcp"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mullvad"; + repo = "udp-over-tcp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-nlLo5/CpieBuRpQyd0eybfkltZyt4qeiupkbtfL/qWE="; + }; + + cargoHash = "sha256-s72C+7q56dSwrmkUBy871rF1MvPkhg8780S+dN/ETh0="; + cargoBuildFlags = [ + "--bins" + "--features" + "clap" + ]; + + passthru.tests = { + inherit (nixosTests) udp-over-tcp; + }; + + meta = { + homepage = "https://github.com/mullvad/udp-over-tcp"; + description = "Proxy UDP traffic over a TCP stream"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ timschumi ]; + # No single mainProgram is listed here because tcp2udp and udp2tcp are equally important. + }; +}) diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 3e25c1ad7b1c..231e2dc9cec3 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + config, fetchFromGitHub, cmake, pkg-config, @@ -28,16 +29,18 @@ wayland-scanner, enableX11 ? stdenv.hostPlatform.isLinux, xorg, + cudaSupport ? config.cudaSupport, + cudaPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ueberzugpp"; version = "2.9.8"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU="; }; @@ -49,6 +52,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableWayland [ wayland-scanner + ] + # Required by opencv when cudaSupport is enabled + ++ lib.optionals cudaSupport [ + (lib.getBin cudaPackages.cuda_nvcc) ]; buildInputs = [ @@ -79,27 +86,27 @@ stdenv.mkDerivation rec { ++ lib.optionals enableX11 [ xorg.libX11 xorg.xcbutilimage + ] + # Required by opencv when cudaSupport is enabled + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ]; - cmakeFlags = - lib.optionals (!enableOpencv) [ - "-DENABLE_OPENCV=OFF" - ] - ++ lib.optionals enableWayland [ - "-DENABLE_WAYLAND=ON" - ] - ++ lib.optionals (!enableX11) [ - "-DENABLE_X11=OFF" - ]; + cmakeFlags = [ + (lib.cmakeBool "ENABLE_OPENCV" enableOpencv) + (lib.cmakeBool "ENABLE_WAYLAND" enableWayland) + (lib.cmakeBool "ENABLE_X11" enableX11) + ]; - meta = with lib; { + meta = { description = "Drop in replacement for ueberzug written in C++"; homepage = "https://github.com/jstkdng/ueberzugpp"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + changelog = "https://github.com/jstkdng/ueberzugpp/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana wegank ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 26fafb089cbc..6ccf3f767494 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2025.10.1"; + version = "2025.12.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-inPRCIgASg/dh1DQ62uabWx4STNRR0p8CWxisltfLgE="; + hash = "sha256-t+sfDmZmZccFndlL+v3H3qyTLD5sCsYbWmwqYtC9jK0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 2ef0bee981f0..4c26d891c322 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -41,14 +41,14 @@ let # Pin the specific version of prisma to the one used by upstream # to guarantee compatibility. prisma-engines' = prisma-engines.overrideAttrs (old: rec { - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-p198o8ON5mGPCxK+gE0mW+JVyQlNsCsqwa8D4MNBkpA="; + hash = "sha256-icFgoKIrr3fGSVmSczlMJiT5KSb746kVldtrk+Q0wW8="; }; - cargoHash = "sha256-bNl04GoxLX+B8dPgqWL/VarreBVebjwNDwQjtQcJnsg="; + cargoHash = "sha256-PgCfBcmK9RCA5BMacJ5oYEpo2DnBKx2xPbdLb79yCCY="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) pname; @@ -57,22 +57,22 @@ let }; }); prisma' = (prisma.override { prisma-engines = prisma-engines'; }).overrideAttrs (old: rec { - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = version; - hash = "sha256-+WRWa59HlHN2CsYZfr/ptdW3iOuOPfDil8sLR5dWRA4="; + hash = "sha256-lFPAu296cQMDnEcLTReSHuLuOz13kd7n0GV+ifcX+lQ="; }; pnpmDeps = old.pnpmDeps.override { inherit src version; - hash = "sha256-Et1UiZO2zyw9FHW0OuYK7AMfhIy5j7Q7GDQjaL6gjyg="; + hash = "sha256-9v30vhclD+sPcui/VG8dwaC8XGU6QFs/Gu8rjjoQy/w="; }; }); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "umami"; - version = "3.0.1"; + version = "3.0.2"; nativeBuildInputs = [ makeWrapper @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "umami-software"; repo = "umami"; tag = "v${finalAttrs.version}"; - hash = "sha256-M2SWsmvXzOe6ob46ntQ8X8/uOx6/Q5On6zSnkv83uj8="; + hash = "sha256-6ega3ShfZlEnoFuFSh420hB8sp2qoJuAYnzeoOdpODs="; }; # install dev dependencies as well, for rollup @@ -98,7 +98,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src ; fetcherVersion = 2; - hash = "sha256-Gpl57tTV4ML4ukRMzRu8taO75kyzYwa5PyM0jGbrhHI="; + hash = "sha256-zHpIqhxfvJ/so7bKvrGMqVGGnquJNnSI/0q3PE+VQ1Y="; }; env.CYPRESS_INSTALL_BINARY = "0"; @@ -109,6 +109,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { env.TRACKER_SCRIPT_NAME = lib.concatStringsSep "," trackerScriptNames; env.BASE_PATH = basePath; + # Needs to be non-empty during build + env.DATABASE_URL = "postgresql://"; + # Allow prisma-cli to find prisma-engines without having to download them # Only needed at build time for `prisma generate`. env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines'}/lib/libquery_engine.node"; @@ -128,8 +131,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck - # Skip broken test: https://github.com/umami-software/umami/issues/3773 - pnpm test --testPathIgnorePatterns="src/lib/__tests__/detect.test.ts" + pnpm test runHook postCheck ''; diff --git a/pkgs/by-name/um/umami/sources.json b/pkgs/by-name/um/umami/sources.json index 07892901f585..1f691d4d685b 100644 --- a/pkgs/by-name/um/umami/sources.json +++ b/pkgs/by-name/um/umami/sources.json @@ -1,7 +1,7 @@ { "geocities": { - "rev": "b8e72beea52d6f23f12b1a554342f29b101a252e", - "date": "2025-11-17", - "hash": "sha256-mdhOsfuYIKoellpv/M4LM5drTdimvMfFOCYYacbTuJU=" + "rev": "6ba4792cd60bfab42cab9ff0b0614106a6f98cb9", + "date": "2025-12-04", + "hash": "sha256-1NJbjXHk2jL18FTyN5CpWYIe1JO4bCqrgb/YTobDniY=" } } diff --git a/pkgs/by-name/un/undertime/package.nix b/pkgs/by-name/un/undertime/package.nix index 89b1c7819bcf..f600bd118676 100644 --- a/pkgs/by-name/un/undertime/package.nix +++ b/pkgs/by-name/un/undertime/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "undertime"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; src = fetchFromGitLab { owner = "anarcat"; repo = "undertime"; tag = version; - hash = "sha256-sQI+fpg5PFGCsS9xikMTi4Ad76TayP13UgZag6CRBxE="; + hash = "sha256-TOrsQIi+ZcUQUGhb+iX8seuwNfKrrBL2DIcLK9wyjn0="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/un/undock/package.nix b/pkgs/by-name/un/undock/package.nix new file mode 100644 index 000000000000..94fcb8d0dee4 --- /dev/null +++ b/pkgs/by-name/un/undock/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule (finalAttrs: { + pname = "undock"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "crazy-max"; + repo = "undock"; + tag = "v${finalAttrs.version}"; + hash = "sha256-p4x8SCYLErcu0ACbWUTjZVlzF+QEoC6xS7rpsOno/yw="; + }; + + vendorHash = null; + + tags = [ + "containers_image_openpgp" + "exclude_graphdriver_btrfs" + "exclude_graphdriver_devicemapper" + ]; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/undock + ''; + + meta = { + description = "Extract contents of a container image in a local folder"; + homepage = "https://crazymax.dev/undock/"; + license = lib.licenses.mit; + mainProgram = "undock"; + maintainers = with lib.maintainers; [ + nolith + ]; + }; +}) diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix index b1757d7150f4..fb1e960a252e 100644 --- a/pkgs/by-name/un/unifi/package.nix +++ b/pkgs/by-name/un/unifi/package.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "unifi-controller"; - version = "10.0.156"; + version = "10.0.161"; # see https://community.ui.com/releases / https://www.ui.com/download/unifi src = fetchurl { url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb"; - hash = "sha256-FlWsCAH6HN7HzoTLJET36FhGi/ci52jSP7132ayKvpA="; + hash = "sha256-vk7t9WRR65BPlHspZGmpVc1XUy/OHANRJpR3jI+2wtI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix index e1d0ed250c2d..20c19dda0f25 100644 --- a/pkgs/by-name/ur/urdfdom-headers/package.nix +++ b/pkgs/by-name/ur/urdfdom-headers/package.nix @@ -7,22 +7,22 @@ validatePkgConfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urdfdom-headers"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; - rev = version; - hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo="; + tag = finalAttrs.version; + hash = "sha256-tBNoG5gH3haZETUlI4Pn1mg14T/sMil9n/iSzjJC+Rg="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) (fetchpatch { - url = "https://github.com/ros/urdfdom_headers/commit/6e0cea148c3a7123f8367cd48d5709a4490c32f1.patch"; - hash = "sha256-LC2TACGma/k6+WE9fTkzY98SgJYKsVuj5O9v84Q5mQ4="; + url = "https://github.com/ros/urdfdom_headers/commit/fa89f2d4744839827f41579004537c966a097681.patch"; + hash = "sha256-w6PPKCpbR4dGsudVEz+SO9ylXVayLPRAl3VvpMt4DHo="; }) ]; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { validatePkgConfig ]; - meta = with lib; { + meta = { description = "URDF (U-Robot Description Format) headers provides core data structure headers for URDF"; homepage = "https://github.com/ros/urdfdom_headers"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch b/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch new file mode 100644 index 000000000000..f29f8693aa4f --- /dev/null +++ b/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch @@ -0,0 +1,84 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ option(APPEND_PROJECT_NAME_TO_INCLUDEDIR + + if(APPEND_PROJECT_NAME_TO_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") ++ set(CMAKE_INSTALL_FULL_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}") + endif() + + # set the default build type +@@ -59,9 +60,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" + + enable_testing() + +-set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake) +-string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}") +-string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_LIBDIR_TO_PREFIX "${CMAKE_INSTALL_LIBDIR}") ++set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake) ++file(RELATIVE_PATH RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") ++file(RELATIVE_PATH RELATIVE_PATH_LIBDIR_TO_PREFIX "${CMAKE_INSTALL_FULL_LIBDIR}" "${CMAKE_INSTALL_PREFIX}") + + add_subdirectory(urdf_parser) + +@@ -69,6 +70,12 @@ set(PKG_NAME ${PROJECT_NAME}) + set(PKG_LIBRARIES urdfdom_sensor urdfdom_model urdfdom_world) + set(PKG_DEPENDS urdfdom_headers) + set(PKG_EXPORTS urdfdom) ++string(REPLACE ++ "${CMAKE_INSTALL_PREFIX}" "\${${PROJECT_NAME}_DIR}/${RELATIVE_PATH_CMAKE_DIR_TO_PREFIX}" ++ CMAKE_CONF_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++string(REPLACE ++ "${CMAKE_INSTALL_PREFIX}" "\${${PROJECT_NAME}_DIR}/${RELATIVE_PATH_CMAKE_DIR_TO_PREFIX}" ++ CMAKE_CONF_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(cmake_conf_file "cmake/urdfdom-config") + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +@@ -92,6 +99,8 @@ install(FILES package.xml DESTINATION share/${PROJECT_NAME}) + set(PKG_DESC "Unified Robot Description Format") + set(PKG_DEPENDS "urdfdom_headers") # make the list separated by spaces instead of ; + set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model -lurdfdom_world") ++string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" PKG_CONF_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" PKG_CONF_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} +diff --git a/cmake/pkgconfig/urdfdom.pc.in b/cmake/pkgconfig/urdfdom.pc.in +index 77d1d9f..01ccb89 100644 +--- a/cmake/pkgconfig/urdfdom.pc.in ++++ b/cmake/pkgconfig/urdfdom.pc.in +@@ -1,8 +1,8 @@ + # This file was generated by CMake for @PROJECT_NAME@ + prefix=${pcfiledir}/../@RELATIVE_PATH_LIBDIR_TO_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONF_LIBDIR@ ++includedir=@PKG_CONF_INCLUDEDIR@ + + Name: @PKG_NAME@ + Description: @PKG_DESC@ +diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in +index ee84f41..9a77019 100644 +--- a/cmake/urdfdom-config.cmake.in ++++ b/cmake/urdfdom-config.cmake.in +@@ -8,16 +8,16 @@ set(@PKG_NAME@_CONFIG_INCLUDED TRUE) + set(CMAKE_MODULE_PATH_BACKUP_URDFDOM ${CMAKE_MODULE_PATH}) + list(APPEND CMAKE_MODULE_PATH "${@PROJECT_NAME@_DIR}") + +-set(@PKG_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") ++set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_CONF_INCLUDEDIR@") + + foreach(lib @PKG_LIBRARIES@) + set(onelib "${lib}-NOTFOUND") + set(onelibd "${lib}-NOTFOUND") + find_library(onelib ${lib} +- PATHS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ++ PATHS "@CMAKE_CONF_LIBDIR@" + NO_DEFAULT_PATH) + find_library(onelibd ${lib}d +- PATHS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ++ PATHS "@CMAKE_CONF_LIBDIR@" + NO_DEFAULT_PATH) + if(onelib-NOTFOUND AND onelibd-NOTFOUND) + message(FATAL_ERROR "Library '${lib}' in package @PKG_NAME@ is not installed properly") diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix index ec65438b542e..b6adda9203ea 100644 --- a/pkgs/by-name/ur/urdfdom/package.nix +++ b/pkgs/by-name/ur/urdfdom/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, validatePkgConfig, @@ -11,23 +10,20 @@ urdfdom-headers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urdfdom"; - version = "4.0.0"; + version = "5.0.3"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom"; - rev = version; - hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w="; + tag = finalAttrs.version; + hash = "sha256-WZA3rzulPO1Si/kFqGF+8si2kRC8xOhlparoO8CvN0g="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142) - (fetchpatch { - url = "https://github.com/ros/urdfdom/commit/61a7e35cd5abece97259e76aed8504052b2f5b53.patch"; - hash = "sha256-b3bEbbaSUDkwTEHJ8gVPEb+AR/zuWwLqiAW5g1T1dPU="; - }) + ./cmake-install-absolute.patch ]; nativeBuildInputs = [ @@ -41,11 +37,11 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ urdfdom-headers ]; - meta = with lib; { + meta = { description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; homepage = "https://github.com/ros/urdfdom"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/us/usbmuxd2/package.nix b/pkgs/by-name/us/usbmuxd2/package.nix index be7fb1cc6fcf..c255fe074394 100644 --- a/pkgs/by-name/us/usbmuxd2/package.nix +++ b/pkgs/by-name/us/usbmuxd2/package.nix @@ -19,7 +19,7 @@ clangStdenv.mkDerivation { owner = "tihmstar"; repo = "usbmuxd2"; rev = "2ce399ddbacb110bd5a83a6b8232d42c9a9b6e84"; - hash = "sha256-UVLLE73XuWTgGlpTMxUDykFmiBDqz6NCRO2rpRAYfow="; + hash = "sha256-u7qRKH5y+Q1HnnumjVm3Ce4SlT3YaEVSPUXYOAiFBes="; # Leave DotGit so that autoconfigure can read version from git tags leaveDotGit = true; }; diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 6f35510cf963..58104e1c39f8 100644 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.233"; + version = "1.5.239"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-x3C9bEE99XOIpnPjVV7Je5mfdhwN0nTkiuBxrwWZ7CI="; + hash = "sha256-oeT58SO8aDwqiKbi9v7R+sclinTH8+x9XoQSOCnXCt8="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 17a26fb49603..69e9b5281be0 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.15"; + version = "0.9.17"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-SZg89Ca1Zx3IHJaDWcX2TYkCVvPO3Q6zUCYlAETbIzQ="; + hash = "sha256-DY/D2t1O2vsFisc3FR97A9oNic9wjxVnYWiAqQR3FwI="; }; - cargoHash = "sha256-e+a/nT1EaI8llGpeO9QkoeenMnkxdTAHVZa3y6zl5io="; + cargoHash = "sha256-cXr529d/PDLeFCwEo06vxfw9JkPjfhYB8MG2oqiGZUw="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 450924cf87a3..87ec49f17afe 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20251202060244"; + version = "20251208040409"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-91MlLtoYaTPY5reN/3JTwLeOtaipQlQjPw6pxKjL7qw="; + hash = "sha256-BinlmP+tiXThq38ye9tCOLp170j3ZLie7EL3/hFHaxo="; }; vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU="; meta = with lib; { diff --git a/pkgs/by-name/v4/v4l2-relayd/package.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix index 8d056f3a00e2..b74a90c2e2a4 100644 --- a/pkgs/by-name/v4/v4l2-relayd/package.nix +++ b/pkgs/by-name/v4/v4l2-relayd/package.nix @@ -8,21 +8,18 @@ libtool, pkg-config, which, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "v4l2-relayd"; - version = "0.1.3"; + version = "0.1.5"; src = fetchgit { url = "https://git.launchpad.net/v4l2-relayd"; - tag = "upstream/${version}"; - hash = "sha256-oU6naDFZ0PQVHZ3brANfMULDqYMYxeJN+MCUCvN/DpU="; + tag = "upstream/${finalAttrs.version}"; + hash = "sha256-D+OWkny+TYNJt08X+nl7EYs5tp51vjvig/vuID6lkmg="; }; - patches = [ - ./upstream-v4l2loopback-compatibility.patch - ]; - nativeBuildInputs = [ autoreconfHook libtool @@ -38,12 +35,16 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --prefix=$out"; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "upstream/"; + }; + + meta = { description = "Streaming relay for v4l2loopback using GStreamer"; mainProgram = "v4l2-relayd"; homepage = "https://git.launchpad.net/v4l2-relayd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ betaboon ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch b/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch deleted file mode 100644 index 643535228256..000000000000 --- a/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/v4l2-relayd.c b/src/v4l2-relayd.c -index 21bb0d5..cfc9e27 100644 ---- a/src/v4l2-relayd.c -+++ b/src/v4l2-relayd.c -@@ -27,7 +27,10 @@ - #include - #include - --#define V4L2_EVENT_PRI_CLIENT_USAGE V4L2_EVENT_PRIVATE_START -+#define V4L2LOOPBACK_EVENT_BASE (V4L2_EVENT_PRIVATE_START) -+#define V4L2LOOPBACK_EVENT_OFFSET 0x08E00000 -+#define V4L2_EVENT_PRI_CLIENT_USAGE \ -+ (V4L2LOOPBACK_EVENT_BASE + V4L2LOOPBACK_EVENT_OFFSET + 1) - - struct v4l2_event_client_usage { - __u32 count; diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix index 4f0e7d58f641..6457b79eb00f 100644 --- a/pkgs/by-name/va/vacuum-tube/package.nix +++ b/pkgs/by-name/va/vacuum-tube/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "vacuum-tube"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "shy1132"; repo = "VacuumTube"; tag = "v${version}"; - hash = "sha256-NZdrueEOzir1/1RncSWk/eDEXFqo3bIhKVspruP4k8s="; + hash = "sha256-F1F1p+jQnCiVTZZez30JmykgC8oQLdZ8GEZTkdf3qRs="; }; - npmDepsHash = "sha256-JfsZI2V2nsoa/boQ9jBrEK+CkGa8KdsJriqnAv+YpmY="; + npmDepsHash = "sha256-BzoKKDllytCByjou48KzyLU1wtAzJoJwRNJb9OwRT9o="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/by-name/va/vaporizer2/package.nix b/pkgs/by-name/va/vaporizer2/package.nix index 3a8fae479d62..b6c4fc02fc3d 100644 --- a/pkgs/by-name/va/vaporizer2/package.nix +++ b/pkgs/by-name/va/vaporizer2/package.nix @@ -30,6 +30,15 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + postPatch = '' + # LTO needs special setup on Linux + substituteInPlace CMakeLists.txt \ + --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' + + rm -rf clap-juce-extensions + ln -s ${finalAttrs.passthru.clapJuceExtensions} clap-juce-extensions + ''; + strictDeps = true; nativeBuildInputs = [ @@ -56,11 +65,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "USE_SYSTEM_JUCE" "ON") ]; - # LTO needs special setup on Linux - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + passthru.clapJuceExtensions = fetchFromGitHub { + owner = "free-audio"; + repo = "clap-juce-extensions"; + rev = "645ed2fd0949d36639e3d63333f26136df6df769"; + hash = "sha256-Lx88nyEFjPLA5yh8rrqBdyZIxe/j0FgIHoyKcbjuuI4="; + fetchSubmodules = true; + }; meta = { description = "Wavetable synthesizer"; diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix index f7fd91d59a20..9362f5c4c32a 100644 --- a/pkgs/by-name/va/varia/package.nix +++ b/pkgs/by-name/va/varia/package.nix @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { pygobject3 aria2p yt-dlp + emoji-country-flag ]; postInstall = '' diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix similarity index 53% rename from pkgs/tools/misc/veikk-linux-driver-gui/default.nix rename to pkgs/by-name/ve/veikk-linux-driver-gui/package.nix index 8069e7cec5d1..2d93bbf90683 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix @@ -1,22 +1,25 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, - qmake, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "veikk-linux-driver-gui"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = pname; - rev = "v${version}"; - sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; + repo = "veikk-linux-driver-gui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ssQ54d+4H0a0FF3BrVlHPrPd7WlBocFLep9KPtPB4Qk="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; postBuild = '' make all clean @@ -27,12 +30,12 @@ mkDerivation rec { cp veikk-linux-driver-gui $out/bin ''; - meta = with lib; { + meta = { description = "Configuration tool for the VEIKK Linux driver"; homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ nicbk ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nicbk ]; mainProgram = "veikk-linux-driver-gui"; }; -} +}) diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index 158bde24d1cb..fb2461304b5a 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -196,6 +196,5 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ jagajaga ]; }; }) diff --git a/pkgs/by-name/vi/vice/package.nix b/pkgs/by-name/vi/vice/package.nix index d4f68c8569d4..1276c1287b94 100644 --- a/pkgs/by-name/vi/vice/package.nix +++ b/pkgs/by-name/vi/vice/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { description = "Emulators for a variety of 8-bit Commodore computers"; homepage = "https://vice-emu.sourceforge.io/"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 1a7de8a6102d..cca36b5a6b22 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -14,19 +14,19 @@ pkg-config, protobuf, qt6, - rapidfuzz-cpp, - stdenv, + gcc15Stdenv, wayland, + libxml2, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.16.11"; + version = "0.16.14"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-gX7bUoIP4PU0wUOW3ciyjYAInX/6VLVcEBKdQIQyzDk="; + hash = "sha256-G9zuw0IuzOxCeAcLE+IXcsdp0vAGMXBBdlfjBISnL90="; }; apiDeps = fetchNpmDeps { @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtsvg qt6.qtwayland - rapidfuzz-cpp wayland + libxml2 ]; postPatch = '' diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index db4f7c868503..9f562333faaf 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -48,11 +48,7 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; passthru = { - tests = { - inherit (nixosTests) - victorialogs - ; - }; + tests = lib.recurseIntoAttrs nixosTests.victorialogs; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 864038394899..6f04dcd8fb41 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.130.0"; + version = "1.131.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-upviz4MDwEXzIs21mPwa5TgKywfXiRcsZfdF/d3w/Ao="; + hash = "sha256-pfOspKTDEMIRdsRJQ/IVViNKL/hojceHyAUuOKKHJO8="; }; vendorHash = null; @@ -77,9 +77,7 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; passthru = { - tests = { - inherit (nixosTests) victoriametrics; - }; + tests = lib.recurseIntoAttrs nixosTests.victoriametrics; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix index bfa7c48aba9c..6727f513a08f 100644 --- a/pkgs/by-name/vi/victoriatraces/package.nix +++ b/pkgs/by-name/vi/victoriatraces/package.nix @@ -47,9 +47,7 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; passthru = { - tests = { - inherit (nixosTests) victoriatraces; - }; + tests = lib.recurseIntoAttrs nixosTests.victoriatraces; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/vi/virt-manager/package.nix b/pkgs/by-name/vi/virt-manager/package.nix index b4a7ae7f8758..6ea45f71cac9 100644 --- a/pkgs/by-name/vi/virt-manager/package.nix +++ b/pkgs/by-name/vi/virt-manager/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation rec { mainProgram = "virt-manager"; maintainers = with maintainers; [ fpletz - globin ]; }; } diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix index c221974d4275..a9bf7b47ca1e 100644 --- a/pkgs/by-name/vi/virtiofsd/package.nix +++ b/pkgs/by-name/vi/virtiofsd/package.nix @@ -5,22 +5,23 @@ fetchFromGitLab, libcap_ng, libseccomp, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "virtiofsd"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; - rev = "v${version}"; - hash = "sha256-7ShmdwJaMjaUDSFnzHnsTQ/CmAQ0qpZnX5D7cFYHNmo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-H8FjnrwB6IfZ7pVFesEWZkWpWjVYGrewlPRZc97Nlh8="; }; separateDebugInfo = true; - cargoHash = "sha256-Y07SJ54sw4CPCPq/LoueGBfHuZXu9F32yqMR6LBJ09I="; + cargoHash = "sha256-AOWHlvFvKj05f4/KE1F37qkRstW5gUlRH0HZVZrg7Dg="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = if stdenv.hostPlatform.isStatic then "static" else "dylib"; @@ -38,8 +39,14 @@ rustPlatform.buildRustPackage rec { install -Dm644 50-virtiofsd.json "$out/share/qemu/vhost-user/50-virtiofsd.json" ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { homepage = "https://gitlab.com/virtio-fs/virtiofsd"; + changelog = "https://gitlab.com/virtio-fs/virtiofsd/-/releases/v${finalAttrs.version}"; description = "vhost-user virtio-fs device backend written in Rust"; maintainers = with maintainers; [ qyliss @@ -52,4 +59,4 @@ rustPlatform.buildRustPackage rec { bsd3 ]; }; -} +}) diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index d83e5fc468b6..f3b14d782328 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.39"; + version = "2.40"; pyproject = true; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-YYmvWMWWMCNRWICHVSzRyae77YCSkrvh4mRJC0xpAbE="; + hash = "sha256-F8AXawn8eVh6Foiv3Kx8vLJGTBM+WB4JIv78/s4UBPs="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index 29fae7be6d39..afb3f4cece60 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.7.3851.56"; + version = "7.7.3851.58"; suffix = { @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-bnjFgTXts0qaQY3pqzaKp14apDpcCn2/smZ0hT5SbH0="; - x86_64-linux = "sha256-kXx0CD3hCTl2JWYWQApO73+UXXeAqqE7cujLXCtVcmI="; + aarch64-linux = "sha256-WPJB2wMS9F1WqCxZzAnonA5YkqHnnEmW/SJ4qYJImtU="; + x86_64-linux = "sha256-w10CX3j7Iq1kthLvklynN17k6A77VIkkRl0QT5ui+Bk="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix index ac1911cbe607..f7fcc6c6c641 100644 --- a/pkgs/by-name/vo/vorta/package.nix +++ b/pkgs/by-name/vo/vorta/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.10.3"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; tag = "v${version}"; - hash = "sha256-VhM782mFWITA0VlKw0sBIu/UxUqlFLgq5XVdCpQggCw="; + hash = "sha256-/60KVJGKNz3aouv5jzubFlz+AxPEbRDSv4ZO9MEi3V0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json index 4ce10589823a..4d154cb80972 100644 --- a/pkgs/by-name/vr/vrcx/deps.json +++ b/pkgs/by-name/vr/vrcx/deps.json @@ -96,8 +96,8 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "9.0.10", - "hash": "sha256-hqtadbUx58gBwBFfVk2vyRmgWgdRpbmT84pcuhKTXl0=" + "version": "10.0.0", + "hash": "sha256-p0rfcBwM6pkVY+G49ujVcHwwFgrEq46FGPpGFOg0H5w=" }, { "pname": "Newtonsoft.Json", @@ -111,8 +111,8 @@ }, { "pname": "NLog", - "version": "6.0.5", - "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY=" + "version": "6.0.6", + "hash": "sha256-vLtwZ32e1GWB93SGwmDAdUogQOf/5GuIcovO9Pn6qj8=" }, { "pname": "runtime.any.System.Runtime", @@ -171,8 +171,8 @@ }, { "pname": "SourceGear.sqlite3", - "version": "3.50.4.2", - "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M=" + "version": "3.50.4.5", + "hash": "sha256-yPOyLiK4QoTfE3IED0hFl1JJYjmt8RBB3fp1a1CwvqE=" }, { "pname": "Stub.System.Data.SQLite.Core.NetStandard", @@ -181,13 +181,13 @@ }, { "pname": "System.CodeDom", - "version": "4.7.0", - "hash": "sha256-4lO4CQyyqvwSG/EtNsRTQsbwyiY5pr225kAQXvlDkNE=" + "version": "10.0.0", + "hash": "sha256-ffMXe35XVE49Gd6bbz2QRmTkCDeTuSnGYfKTZ6/MtS8=" }, { "pname": "System.CodeDom", - "version": "9.0.10", - "hash": "sha256-AMmYDZGMI8HVtvpGBhXkCDoBaJa11FPf/t2VYl31Nk8=" + "version": "4.7.0", + "hash": "sha256-4lO4CQyyqvwSG/EtNsRTQsbwyiY5pr225kAQXvlDkNE=" }, { "pname": "System.Collections.Immutable", @@ -229,20 +229,25 @@ "version": "1.0.119", "hash": "sha256-upgcZ/YGVNT7kl+oZ/4fsLVourVef/8xpLQjk+J9+7w=" }, + { + "pname": "System.Drawing.Common", + "version": "10.0.0", + "hash": "sha256-ZFneSifHbDj3O+IbwHSSs5YpDEunTeu9Hnz9APZKOA8=" + }, { "pname": "System.Drawing.Common", "version": "4.7.0", "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk=" }, { - "pname": "System.Drawing.Common", - "version": "9.0.10", - "hash": "sha256-D4E99H3HVNatH+MDKuCGxaJOP7pXTxibBLThNZBXwLc=" + "pname": "System.IO.Pipelines", + "version": "10.0.0", + "hash": "sha256-0aeIxLFEBn9BoCa93UVNikdlqgPl3B1nmYCLQ9Yu9Ak=" }, { "pname": "System.Management", - "version": "9.0.10", - "hash": "sha256-C6mzt+JhNagK6G1mQF+iVwPZtrRpyzdAspbIAKndpqo=" + "version": "10.0.0", + "hash": "sha256-Nh3KOlsv6AxGkrWiHhuuTbRuIi2tp13NrbBwgQgKuSg=" }, { "pname": "System.Memory", @@ -319,10 +324,15 @@ "version": "4.5.1", "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" }, + { + "pname": "System.Text.Encodings.Web", + "version": "10.0.0", + "hash": "sha256-OrsgqAPfEjjo+CzzrAzkKTXNv3VXw2dm3Wpn+uRHCM8=" + }, { "pname": "System.Text.Json", - "version": "9.0.10", - "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w=" + "version": "10.0.0", + "hash": "sha256-ZyAMIT3yQDJazYAObAlXmScGshGD9MVZgYmLqHyICq0=" }, { "pname": "System.Text.RegularExpressions", diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index 40565f2890a2..4132b2a4563a 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -16,18 +16,18 @@ let in buildNpmPackage (finalAttrs: { pname = "vrcx"; - version = "2025.11.16"; + version = "2025.12.06"; src = fetchFromGitHub { repo = "VRCX"; owner = "vrcx-team"; tag = "v${finalAttrs.version}"; - hash = "sha256-ipe5dQQxqIdzbaeUBFAlfCtXS5fwCEuaqpVQEvz8o2E="; + hash = "sha256-eyw8zFtKVR85ao1/gO8qJOF5VcBkZd7L5AB1JB8qAv0="; }; makeCacheWritable = true; npmFlags = [ "--ignore-scripts" ]; - npmDepsHash = "sha256-k+jo2Iiflmrtg3LOM2KohPFih8gaDZqoFoh6WLFJRGM="; + npmDepsHash = "sha256-WHxrIzZLktU6Jd6wm5VeGnZAbNT3pkNfqcxE6tdBoq8="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/vt/vtable-dumper/package.nix b/pkgs/by-name/vt/vtable-dumper/package.nix index ba63b8d51be2..dfa523430ddf 100644 --- a/pkgs/by-name/vt/vtable-dumper/package.nix +++ b/pkgs/by-name/vt/vtable-dumper/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Tool to list content of virtual tables in a C++ shared library"; mainProgram = "vtable-dumper"; license = licenses.lgpl21; - maintainers = [ maintainers.bhipple ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix index 3da9944e081f..204364e08894 100644 --- a/pkgs/by-name/vu/vultr-cli/package.nix +++ b/pkgs/by-name/vu/vultr-cli/package.nix @@ -38,7 +38,6 @@ buildGoModule rec { homepage = "https://github.com/vultr/vultr-cli"; changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "vultr-cli"; }; } diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index b8ef20873450..1accd9c6d01f 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${version}"; - hash = "sha256-DHuNhizYDY/z3DPAPPOgGWn1m86yGHamiVCHGxlaC1w="; + hash = "sha256-uaB8Qczb+5kIFwrJ1h/derOCzW/4C2QPr2aPOMwxMHk="; leaveDotGit = true; }; diff --git a/pkgs/by-name/vw/vwsfriend/package.nix b/pkgs/by-name/vw/vwsfriend/package.nix index ddeb89ca6e05..d45a4948992c 100644 --- a/pkgs/by-name/vw/vwsfriend/package.nix +++ b/pkgs/by-name/vw/vwsfriend/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vwsfriend"; - version = "0.24.7"; + version = "0.24.10"; pyproject = true; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "VWsFriend"; tag = "v${version}"; - hash = "sha256-ZGH7rcGSAYDBSjv1jZjT/uGJIrFL71RYK6vX71RHz8E="; + hash = "sha256-k2LHPjV6ndYpPemLlDBp8oi5ner9LG123FwKTRgqNsM="; }; sourceRoot = "${src.name}/vwsfriend"; diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix index 3474ffb569d4..83b1fb8beb8a 100644 --- a/pkgs/by-name/wa/wabt/package.nix +++ b/pkgs/by-name/wa/wabt/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/WebAssembly/wabt"; license = licenses.asl20; - maintainers = with maintainers; [ ekleog ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix index 5328e6fb53ea..5e27d5ce4727 100644 --- a/pkgs/by-name/wa/wallutils/package.nix +++ b/pkgs/by-name/wa/wallutils/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "wallutils"; - version = "5.14.2"; + version = "5.14.3"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-mcleLQIBG8L5cpA4QYZpDsBdZbJlyDx7XXwDtAV4sjU="; + hash = "sha256-35JkZa7ihz0vgHwEagIkP7xTd6wLLRqSaeySJY1/Dw8="; }; vendorHash = null; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index fbc0dcd41d4a..81e79816f356 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-grrT5ndW+jcITbOmpgv+3ZsMqintVpM8BkwmMgcBWnM=", - "version": "0.2025.11.19.08.12.stable_03" + "hash": "sha256-WAxXd+KHcDPHuKGj0aNmzetUYzydeRCTJIpW5VlaKYw=", + "version": "0.2025.12.03.08.12.stable_03" }, "linux_x86_64": { - "hash": "sha256-OOgDy2TwYPCn/aEkh2Bv8m9l/XxqealOtihiO9PppBU=", - "version": "0.2025.11.19.08.12.stable_03" + "hash": "sha256-wfelfSLCfJyoP8F8R1qjlFmmLBvcPQyopKBfdvcVbI0=", + "version": "0.2025.12.03.08.12.stable_03" }, "linux_aarch64": { - "hash": "sha256-TFwhgZMT52lIxbxZNqgQR9gJ7o/VrH53dGUcwNtxJw0=", - "version": "0.2025.11.19.08.12.stable_03" + "hash": "sha256-/baDz+NFH6rCYF5r9iSXL6k3Aa+Cew8/FQPIoY5lwOU=", + "version": "0.2025.12.03.08.12.stable_03" } } diff --git a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch deleted file mode 100644 index 8db9aba1c95a..000000000000 --- a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/.cargo/config.toml b/.cargo/config.toml -index 8ab4225..8e0c812 100644 ---- a/.cargo/config.toml -+++ b/.cargo/config.toml -@@ -1,8 +1,5 @@ - # https://github.com/rust-lang/cargo/issues/5376#issuecomment-2163350032 - [target.'cfg(all())'] - rustflags = [ -- "--cfg", "tokio_unstable", -- "-Zremap-cwd-prefix=/reproducible-cwd", -- "--remap-path-prefix=$HOME=/reproducible-home", -- "--remap-path-prefix=$PWD=/reproducible-pwd", -+ "--cfg", "tokio_unstable" - ] diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix index 440b3f762724..e3d5c44a3d5e 100644 --- a/pkgs/by-name/wa/warpgate/package.nix +++ b/pkgs/by-name/wa/warpgate/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage ( patches = [ ./web-ui-package-json.patch ]; - npmDepsHash = "sha256-1zCxKAH2IAKSFdL8Pyd8dJi0i8Y5mgYcWNKVpiQszc0="; + npmDepsHash = "sha256-jgsNF93DkEVgPGzdi192HKoSHPYhdrtog28jZvOLK6E="; nativeBuildInputs = [ openapi-generator-cli ]; @@ -35,29 +35,33 @@ rustPlatform.buildRustPackage ( in { pname = "warpgate"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "warp-tech"; repo = "warpgate"; tag = "v${finalAttrs.version}"; - hash = "sha256-nr0z8c0o5u4Rqs9pFUaxnasRHUhwT3qQe5+JNV+LObg="; + hash = "sha256-GLY/VGEKB6gFNTbBlbhpmqQZ62pk2wd6JwWwy4Tz0FE="; }; - cargoHash = "sha256-pIr5Z7rp+dYOuKYnlsBdya6MqAdL0U2gUhwXvLfmM34="; + cargoHash = "sha256-hwAtj8tTDsYgzuDobMg97wepKKIpohSVClyRiaDd+8w="; patches = [ (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; }) - ./disable-rust-reproducible-build.patch ]; + RUSTFLAGS = "--cfg tokio_unstable"; + buildFeatures = [ "postgres" "mysql" "sqlite" ]; - preBuild = ''ln -rs "${warpgate-web}" warpgate-web/dist''; + preBuild = '' + rm -r .cargo/ + ln -rs "${warpgate-web}" warpgate-web/dist + ''; # skip check, project included tests require python stuff and docker doCheck = false; diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 7579c718e4b3..ee35c3a137e9 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.242.0"; + version = "1.243.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${version}"; - hash = "sha256-7TKodssE1obD7tIqrjrWoEdcCk3iSRwaecRHg7ddg6w="; + hash = "sha256-wVIGwFWQvQvFl170I0VgYaTvaJnOGv6GrtM6VGpPxSc="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-X9dDmHWBdh0znGvTWG+WyiXmf4wnz5mhxJWsZJJUYmI="; + cargoHash = "sha256-9BYethBg9seBOCCJTLYvAXDXj2dfjSZWPBOQS1TqD90="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer/package.nix b/pkgs/by-name/wa/wasmer/package.nix index ddde5f11434d..0c7f6ba76d4b 100644 --- a/pkgs/by-name/wa/wasmer/package.nix +++ b/pkgs/by-name/wa/wasmer/package.nix @@ -68,7 +68,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ - Br1ght0ne shamilton nickcao ]; diff --git a/pkgs/by-name/wa/watcher/package.nix b/pkgs/by-name/wa/watcher/package.nix index 419b49a9776f..78d08eb9dbde 100644 --- a/pkgs/by-name/wa/watcher/package.nix +++ b/pkgs/by-name/wa/watcher/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "watcher"; - version = "0.13.8"; + version = "0.14.1"; src = fetchFromGitHub { owner = "e-dant"; repo = "watcher"; tag = version; - hash = "sha256-sQel+W9J8ExWkSEYd6Wjw2M9VgTIax+8zadI982fH4U="; + hash = "sha256-Rqsm6DBS8SHxibQvrwO30RZ5ZPLWQvdTOM7i2zzCPXc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix index 41e0a94d8175..4a9ce76158a0 100644 --- a/pkgs/by-name/wa/wayland-bongocat/package.nix +++ b/pkgs/by-name/wa/wayland-bongocat/package.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wayland-bongocat"; - version = "1.2.5"; + version = "1.3.2"; src = fetchFromGitHub { owner = "saatvik333"; repo = "wayland-bongocat"; tag = "v${finalAttrs.version}"; - hash = "sha256-VkBuqmen6s/LDFu84skQ3wOpIeURZ5e93lvAiEdny70="; + hash = "sha256-hsCNbweWBqCQRCKnVTSQwwQCPz/U2KoqpZZE92Q5BhA="; }; # Package dependencies diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index b431ff9aae37..eeb22ebfecde 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -23,18 +23,18 @@ }: llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "waypipe"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${finalAttrs.version}"; - hash = "sha256-yvywUHb6WNOdHpbPymdY8xHvWkkoCOIaK2YdEPXH6eU="; + hash = "sha256-Tbd/yY90yb2+/ODYVL3SudHaJCGJKatZ9FuGM2uAX+8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-6+DTbFjHdeC10XSN3t6NEyyHmSgCuib1IFjbq15indU="; + hash = "sha256-IUvXHLxrhc2Au57wsE53Q+NL1cZzFcaRG3HDV8s3xWw="; }; strictDeps = true; diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 178ba48fd5e1..51c880afb30b 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "webdav"; - version = "5.10.0"; + version = "5.10.1"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-A8Gt3HWspV01AZC4mxj4i9+CnrMX0XcIvW5X4nnKvig="; + hash = "sha256-V4PNDtKyB0uoMY4ehWQUeTa1ZqIYAvL3Xm2rWw9zKTE="; }; - vendorHash = "sha256-jBCtTBqHXY7786G+QOlU0BB3g+qmsGGOg96xSGv6hXI="; + vendorHash = "sha256-nrvL+glI4kVFUELege8q7z62AsvrLMw5JxigZkZ8kkY="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index f2625af2956f..42082188e02a 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -64,7 +64,10 @@ python.pkgs.buildPythonApplication rec { ''; pythonRelaxDeps = [ + "celery" "certifi" + "cyrtranslit" + "django-appconf" ]; dependencies = diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index d980a053eb4a..8e9593f2c721 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice - Br1ght0ne ]; mainProgram = "websocat"; }; diff --git a/pkgs/by-name/we/websocketpp/package.nix b/pkgs/by-name/we/websocketpp/package.nix index aa3abf8d9388..8720e5e5bf27 100644 --- a/pkgs/by-name/we/websocketpp/package.nix +++ b/pkgs/by-name/we/websocketpp/package.nix @@ -18,10 +18,14 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build with cmake4 (fetchpatch { url = "https://github.com/zaphoyd/websocketpp/commit/deb0a334471362608958ce59a6b0bcd3e5b73c24.patch?full_index=1"; hash = "sha256-bFCHwtRuCFz9vr4trmmBLziPSlEx6SNjsTcBv9zV8go="; }) + # Fix build with boost187/newer asio + # https://github.com/zaphoyd/websocketpp/pull/1164 + ./websocketpp-0.8.2-boost-1.87-compat.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/we/websocketpp/websocketpp-0.8.2-boost-1.87-compat.patch b/pkgs/by-name/we/websocketpp/websocketpp-0.8.2-boost-1.87-compat.patch new file mode 100644 index 000000000000..71c51cdb8662 --- /dev/null +++ b/pkgs/by-name/we/websocketpp/websocketpp-0.8.2-boost-1.87-compat.patch @@ -0,0 +1,2534 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Wed, 12 Feb 2025 03:53:35 +0000 +Subject: [PATCH 1/7] fixed incompatibility with Boost 1.87 due to use of + previously-deprecated now-removed functionality + +(cherry picked from commit 146925c2404655dbb61b9a18e57692bfc18eb6c6) + + Conflicts: + examples/broadcast_server/broadcast_server.cpp + websocketpp/transport/asio/endpoint.hpp + websocketpp/transport/asio/security/none.hpp + websocketpp/transport/asio/security/tls.hpp +--- + SConstruct | 4 +- + docs/faq.dox | 12 +- + .../broadcast_server/broadcast_server.cpp | 2 +- + examples/debug_client/debug_client.cpp | 2 +- + examples/debug_server/debug_server.cpp | 2 +- + examples/echo_client/echo_client.cpp | 2 +- + examples/echo_server/echo_server.cpp | 2 +- + .../echo_server_both/echo_server_both.cpp | 8 +- + examples/echo_server_tls/echo_server_tls.cpp | 2 +- + .../CMakeLists.txt | 2 +- + .../SConscript | 4 +- + .../external_io_context.cpp} | 14 +- + .../tcp_echo_server.hpp | 12 +- + examples/print_client/print_client.cpp | 2 +- + .../print_client_tls/print_client_tls.cpp | 2 +- + examples/scratch_server/scratch_server.cpp | 2 +- + examples/sip_client/sip_client.cpp | 2 +- + .../telemetry_client/telemetry_client.cpp | 4 +- + .../telemetry_server/telemetry_server.cpp | 2 +- + examples/testee_client/testee_client.cpp | 2 +- + examples/testee_server/testee_server.cpp | 2 +- + test/endpoint/endpoint.cpp | 6 +- + test/transport/asio/timers.cpp | 8 +- + test/transport/integration.cpp | 27 ++- + tutorials/utility_server/step1.cpp | 2 +- + tutorials/utility_server/step2.cpp | 2 +- + tutorials/utility_server/utility_server.md | 8 +- + websocketpp/roles/server_endpoint.hpp | 4 +- + websocketpp/transport/asio/base.hpp | 2 +- + websocketpp/transport/asio/connection.hpp | 44 ++--- + websocketpp/transport/asio/endpoint.hpp | 182 +++++++++--------- + websocketpp/transport/asio/security/none.hpp | 16 +- + websocketpp/transport/asio/security/tls.hpp | 20 +- + websocketpp/transport/debug/endpoint.hpp | 2 +- + websocketpp/transport/iostream/endpoint.hpp | 2 +- + websocketpp/transport/stub/endpoint.hpp | 2 +- + 36 files changed, 205 insertions(+), 208 deletions(-) + rename examples/{external_io_service => external_io_context}/CMakeLists.txt (87%) + rename examples/{external_io_service => external_io_context}/SConscript (72%) + rename examples/{external_io_service/external_io_service.cpp => external_io_context/external_io_context.cpp} (92%) + rename examples/{external_io_service => external_io_context}/tcp_echo_server.hpp (92%) + +diff --git a/SConstruct b/SConstruct +index ae3df10..08a75a3 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -271,8 +271,8 @@ subprotocol_server = SConscript('#/examples/subprotocol_server/SConscript',varia + # telemetry_server + telemetry_server = SConscript('#/examples/telemetry_server/SConscript',variant_dir = builddir + 'telemetry_server',duplicate = 0) + +-# external_io_service +-external_io_service = SConscript('#/examples/external_io_service/SConscript',variant_dir = builddir + 'external_io_service',duplicate = 0) ++# external_io_context ++external_io_context = SConscript('#/examples/external_io_context/SConscript',variant_dir = builddir + 'external_io_context',duplicate = 0) + + if not env['PLATFORM'].startswith('win'): + # iostream_server +diff --git a/docs/faq.dox b/docs/faq.dox +index 9f417ec..c89e85b 100644 +--- a/docs/faq.dox ++++ b/docs/faq.dox +@@ -29,19 +29,19 @@ Note: some browsers will allow the connection to continue if they requested a su + + ### How do I cleanly exit an Asio transport based program + +-The Asio transport based clients and servers use the Asio library's underlying `io_service` to handle asyncronous networking operations. The standard behavior of the io_service is to run until there are no async operations left and then return. WebSocket++, when using the Asio transport, behaves like a standard Asio application. If you want your WebSocket++/Asio based program to stop network operations and cleanly close all sockets you will want to do the following: ++The Asio transport based clients and servers use the Asio library's underlying `io_context` to handle asyncronous networking operations. The standard behavior of the io_context is to run until there are no async operations left and then return. WebSocket++, when using the Asio transport, behaves like a standard Asio application. If you want your WebSocket++/Asio based program to stop network operations and cleanly close all sockets you will want to do the following: + + - For servers, call `websocketpp::transport::asio::endpoint::stop_listening` to initiate the closing of the server listening socket. + - For clients, if you have engaged perpetual mode with `websocketpp::transport::asio::endpoint::start_perpetual`, disable it with `websocketpp::transport::asio::endpoint::stop_perpetual`. + - For both, run `websocketpp::endpoint::close` or `websocketpp::connection::close` on all currently outstanding connections. This will initiate the WebSocket closing handshake for these connections +-- Wait. Asio is asyncronous. When the calls to the above methods (stop_listening, close, etc) complete the server *will still be listening*, the connections *will still be active* until the io_service gets around to asyncronously processing the socket and WebSocket protocol closing handshakes. The `io_service::run` method will exit cleanly and automatically when all operations are complete. ++- Wait. Asio is asyncronous. When the calls to the above methods (stop_listening, close, etc) complete the server *will still be listening*, the connections *will still be active* until the io_context gets around to asyncronously processing the socket and WebSocket protocol closing handshakes. The `io_context::run` method will exit cleanly and automatically when all operations are complete. + +-__WARNING__: Asio's `io_service` has a method called `stop`. WebSocket++ wraps this method as `websocketpp::transport::asio::endpoint::stop`. While this operation has a benign sounding name, it is a powerful and destructive operation that should only be used in special cases. If you are using `io_service::stop` or `endpoint::stop` without a very good reason your program is likely broken and may exhibit erratic behavior. Specifically, `io_service::stop` stops the processing of events entirely. This does not give current operations (such as socket closing handshakes) the opportunity to finish. It will leave your sockets in a dangling state that may invoke operating system level timeouts or other errors. ++__WARNING__: Asio's `io_context` has a method called `stop`. WebSocket++ wraps this method as `websocketpp::transport::asio::endpoint::stop`. While this operation has a benign sounding name, it is a powerful and destructive operation that should only be used in special cases. If you are using `io_context::stop` or `endpoint::stop` without a very good reason your program is likely broken and may exhibit erratic behavior. Specifically, `io_context::stop` stops the processing of events entirely. This does not give current operations (such as socket closing handshakes) the opportunity to finish. It will leave your sockets in a dangling state that may invoke operating system level timeouts or other errors. + + __Special cases__: +-- If your client uses the `start_perpetual` method it will prevent the io_service from exiting even if it has nothing to do. This is useful if you want a client endpoint to idle in the background to allow new connections to be formed on demand rather than generating a new endpoint for each. +-- If you are using an external io_service and/or are placing non-WebSocket++ operations on the `io_service` those operations may keep the `io_service` open even after all WebSocket++ operations have completed. +-- If you are using `poll`/`poll_one`/`run_one` or otherwise manually driving the `io_service` event loop you may need to adjust usage to make sure you are correctly recognizing the "done with work" and "not done but idling / `io_service::work`" cases. ++- If your client uses the `start_perpetual` method it will prevent the io_context from exiting even if it has nothing to do. This is useful if you want a client endpoint to idle in the background to allow new connections to be formed on demand rather than generating a new endpoint for each. ++- If you are using an external io_context and/or are placing non-WebSocket++ operations on the `io_context` those operations may keep the `io_context` open even after all WebSocket++ operations have completed. ++- If you are using `poll`/`poll_one`/`run_one` or otherwise manually driving the `io_context` event loop you may need to adjust usage to make sure you are correctly recognizing the "done with work" and "not done but idling / `io_context::work`" cases. + + ### Is there a way to check the validity of a `connection_hdl`? + +diff --git a/examples/broadcast_server/broadcast_server.cpp b/examples/broadcast_server/broadcast_server.cpp +index b02e7cd..106eba7 100644 +--- a/examples/broadcast_server/broadcast_server.cpp ++++ b/examples/broadcast_server/broadcast_server.cpp +@@ -63,7 +63,7 @@ public: + // Start the server accept loop + m_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + try { + m_server.run(); + } catch (const std::exception & e) { +diff --git a/examples/debug_client/debug_client.cpp b/examples/debug_client/debug_client.cpp +index d3e9153..d3e21ab 100644 +--- a/examples/debug_client/debug_client.cpp ++++ b/examples/debug_client/debug_client.cpp +@@ -83,7 +83,7 @@ public: + + m_endpoint.connect(con); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + m_start = std::chrono::high_resolution_clock::now(); + m_endpoint.run(); + } +diff --git a/examples/debug_server/debug_server.cpp b/examples/debug_server/debug_server.cpp +index 8d1ff0e..3748800 100644 +--- a/examples/debug_server/debug_server.cpp ++++ b/examples/debug_server/debug_server.cpp +@@ -162,7 +162,7 @@ int main() { + // Start the server accept loop + echo_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + echo_server.run(); + } catch (websocketpp::exception const & e) { + std::cout << e.what() << std::endl; +diff --git a/examples/echo_client/echo_client.cpp b/examples/echo_client/echo_client.cpp +index 59af661..88171d9 100644 +--- a/examples/echo_client/echo_client.cpp ++++ b/examples/echo_client/echo_client.cpp +@@ -87,7 +87,7 @@ int main(int argc, char* argv[]) { + // exchanged until the event loop starts running in the next line. + c.connect(con); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + // this will cause a single connection to be made to the server. c.run() + // will exit when this connection is closed. + c.run(); +diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp +index d234009..639c79f 100644 +--- a/examples/echo_server/echo_server.cpp ++++ b/examples/echo_server/echo_server.cpp +@@ -55,7 +55,7 @@ int main() { + // Start the server accept loop + echo_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + echo_server.run(); + } catch (websocketpp::exception const & e) { + std::cout << e.what() << std::endl; +diff --git a/examples/echo_server_both/echo_server_both.cpp b/examples/echo_server_both/echo_server_both.cpp +index 2c2c4ea..869c006 100644 +--- a/examples/echo_server_both/echo_server_both.cpp ++++ b/examples/echo_server_both/echo_server_both.cpp +@@ -58,13 +58,13 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) { + } + + int main() { +- // set up an external io_service to run both endpoints on. This is not ++ // set up an external io_context to run both endpoints on. This is not + // strictly necessary, but simplifies thread management a bit. +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + + // set up plain endpoint + server_plain endpoint_plain; +- // initialize asio with our external io_service rather than an internal one ++ // initialize asio with our external io_context rather than an internal one + endpoint_plain.init_asio(&ios); + endpoint_plain.set_message_handler( + bind(&on_message,&endpoint_plain,::_1,::_2)); +@@ -82,6 +82,6 @@ int main() { + endpoint_tls.listen(443); + endpoint_tls.start_accept(); + +- // Start the ASIO io_service run loop running both endpoints ++ // Start the ASIO io_context run loop running both endpoints + ios.run(); + } +diff --git a/examples/echo_server_tls/echo_server_tls.cpp b/examples/echo_server_tls/echo_server_tls.cpp +index 3d704f5..2f75a7d 100644 +--- a/examples/echo_server_tls/echo_server_tls.cpp ++++ b/examples/echo_server_tls/echo_server_tls.cpp +@@ -148,7 +148,7 @@ int main() { + // Start the server accept loop + echo_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + echo_server.run(); + + } +diff --git a/examples/external_io_service/CMakeLists.txt b/examples/external_io_context/CMakeLists.txt +similarity index 87% +rename from examples/external_io_service/CMakeLists.txt +rename to examples/external_io_context/CMakeLists.txt +index 5223da1..a0e89ec 100644 +--- a/examples/external_io_service/CMakeLists.txt ++++ b/examples/external_io_context/CMakeLists.txt +@@ -2,7 +2,7 @@ + file (GLOB SOURCE_FILES *.cpp) + file (GLOB HEADER_FILES *.hpp) + +-init_target (external_io_service) ++init_target (external_io_context) + + build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES}) + +diff --git a/examples/external_io_service/SConscript b/examples/external_io_context/SConscript +similarity index 72% +rename from examples/external_io_service/SConscript +rename to examples/external_io_context/SConscript +index beb7c1c..57305aa 100644 +--- a/examples/external_io_service/SConscript ++++ b/examples/external_io_context/SConscript +@@ -15,9 +15,9 @@ prgs = [] + # if a C++11 environment is available build using that, otherwise use boost + if env_cpp11.has_key('WSPP_CPP11_ENABLED'): + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] +- prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) ++ prgs += env_cpp11.Program('external_io_context', ["external_io_context.cpp"], LIBS = ALL_LIBS) + else: + ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] +- prgs += env.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) ++ prgs += env.Program('external_io_context', ["external_io_context.cpp"], LIBS = ALL_LIBS) + + Return('prgs') +diff --git a/examples/external_io_service/external_io_service.cpp b/examples/external_io_context/external_io_context.cpp +similarity index 92% +rename from examples/external_io_service/external_io_service.cpp +rename to examples/external_io_context/external_io_context.cpp +index 7372d59..c5ba0a4 100644 +--- a/examples/external_io_service/external_io_service.cpp ++++ b/examples/external_io_context/external_io_context.cpp +@@ -59,10 +59,10 @@ void on_message(ws_echo_server* s, websocketpp::connection_hdl hdl, ws_echo_serv + } + + int main() { +- asio::io_service service; ++ asio::io_context context; + + // Add a TCP echo server on port 9003 +- tcp_echo_server custom_http_server(service, 9003); ++ tcp_echo_server custom_http_server(context, 9003); + + // Add a WebSocket echo server on port 9002 + ws_echo_server ws_server; +@@ -70,8 +70,8 @@ int main() { + ws_server.clear_access_channels(websocketpp::log::alevel::frame_payload); + + // The only difference in this code between an internal and external +- // io_service is the different constructor to init_asio +- ws_server.init_asio(&service); ++ // io_context is the different constructor to init_asio ++ ws_server.init_asio(&context); + + // Register our message handler + ws_server.set_message_handler(bind(&on_message,&ws_server,::_1,::_2)); +@@ -80,6 +80,6 @@ int main() { + + // TODO: add a timer? + +- // Start the Asio io_service run loop for all +- service.run(); +-} +\ No newline at end of file ++ // Start the Asio io_context run loop for all ++ context.run(); ++} +diff --git a/examples/external_io_service/tcp_echo_server.hpp b/examples/external_io_context/tcp_echo_server.hpp +similarity index 92% +rename from examples/external_io_service/tcp_echo_server.hpp +rename to examples/external_io_context/tcp_echo_server.hpp +index ef4ce18..2e14703 100644 +--- a/examples/external_io_service/tcp_echo_server.hpp ++++ b/examples/external_io_context/tcp_echo_server.hpp +@@ -44,7 +44,7 @@ namespace asio = websocketpp::lib::asio; + struct tcp_echo_session : websocketpp::lib::enable_shared_from_this { + typedef websocketpp::lib::shared_ptr ptr; + +- tcp_echo_session(asio::io_service & service) : m_socket(service) {} ++ tcp_echo_session(asio::io_context & context) : m_socket(context) {} + + void start() { + m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)), +@@ -72,15 +72,15 @@ struct tcp_echo_session : websocketpp::lib::enable_shared_from_thisstart_accept(); + } + + void start_accept() { +- tcp_echo_session::ptr new_session(new tcp_echo_session(m_service)); ++ tcp_echo_session::ptr new_session(new tcp_echo_session(m_context)); + m_acceptor.async_accept(new_session->m_socket, + bind(&tcp_echo_server::handle_accept, this, new_session, _1)); + } +@@ -92,6 +92,6 @@ struct tcp_echo_server { + start_accept(); + } + +- asio::io_service & m_service; ++ asio::io_context & m_context; + asio::ip::tcp::acceptor m_acceptor; + }; +diff --git a/examples/print_client/print_client.cpp b/examples/print_client/print_client.cpp +index 7ba6e5f..20a2bd3 100644 +--- a/examples/print_client/print_client.cpp ++++ b/examples/print_client/print_client.cpp +@@ -68,7 +68,7 @@ int main(int argc, char* argv[]) { + // exchanged until the event loop starts running in the next line. + c.connect(con); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + // this will cause a single connection to be made to the server. c.run() + // will exit when this connection is closed. + c.run(); +diff --git a/examples/print_client_tls/print_client_tls.cpp b/examples/print_client_tls/print_client_tls.cpp +index 469d9c6..43164ea 100644 +--- a/examples/print_client_tls/print_client_tls.cpp ++++ b/examples/print_client_tls/print_client_tls.cpp +@@ -239,7 +239,7 @@ int main(int argc, char* argv[]) { + + c.get_alog().write(websocketpp::log::alevel::app, "Connecting to " + uri); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + // this will cause a single connection to be made to the server. c.run() + // will exit when this connection is closed. + c.run(); +diff --git a/examples/scratch_server/scratch_server.cpp b/examples/scratch_server/scratch_server.cpp +index 901ae8e..dab20b9 100644 +--- a/examples/scratch_server/scratch_server.cpp ++++ b/examples/scratch_server/scratch_server.cpp +@@ -94,7 +94,7 @@ int main(int argc, char * argv[]) { + // Start the server accept loop + echo_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + echo_server.run(); + } catch (websocketpp::exception const & e) { + std::cout << e.what() << std::endl; +diff --git a/examples/sip_client/sip_client.cpp b/examples/sip_client/sip_client.cpp +index 66fa857..c9f33e7 100644 +--- a/examples/sip_client/sip_client.cpp ++++ b/examples/sip_client/sip_client.cpp +@@ -69,7 +69,7 @@ int main(int argc, char* argv[]) { + + sip_client.connect(con); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + sip_client.run(); + + while(!received) { +diff --git a/examples/telemetry_client/telemetry_client.cpp b/examples/telemetry_client/telemetry_client.cpp +index f0f7fae..12390b8 100644 +--- a/examples/telemetry_client/telemetry_client.cpp ++++ b/examples/telemetry_client/telemetry_client.cpp +@@ -62,10 +62,10 @@ public: + m_hdl = con->get_handle(); + + // Queue the connection. No DNS queries or network connections will be +- // made until the io_service event loop is run. ++ // made until the io_context event loop is run. + m_client.connect(con); + +- // Create a thread to run the ASIO io_service event loop ++ // Create a thread to run the ASIO io_context event loop + websocketpp::lib::thread asio_thread(&client::run, &m_client); + + // Create a thread to run the telemetry loop +diff --git a/examples/telemetry_server/telemetry_server.cpp b/examples/telemetry_server/telemetry_server.cpp +index 3f8e604..2286c50 100644 +--- a/examples/telemetry_server/telemetry_server.cpp ++++ b/examples/telemetry_server/telemetry_server.cpp +@@ -66,7 +66,7 @@ public: + // Set the initial timer to start telemetry + set_timer(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + try { + m_endpoint.run(); + } catch (websocketpp::exception const & e) { +diff --git a/examples/testee_client/testee_client.cpp b/examples/testee_client/testee_client.cpp +index b66e633..12583e5 100644 +--- a/examples/testee_client/testee_client.cpp ++++ b/examples/testee_client/testee_client.cpp +@@ -117,7 +117,7 @@ int main(int argc, char* argv[]) { + client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec); + c.connect(con); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + c.run(); + + std::cout << "case count: " << case_count << std::endl; +diff --git a/examples/testee_server/testee_server.cpp b/examples/testee_server/testee_server.cpp +index 9ac9a7d..13e574e 100644 +--- a/examples/testee_server/testee_server.cpp ++++ b/examples/testee_server/testee_server.cpp +@@ -124,7 +124,7 @@ int main(int argc, char * argv[]) { + // Start the server accept loop + testee_server.start_accept(); + +- // Start the ASIO io_service run loop ++ // Start the ASIO io_context run loop + if (num_threads == 1) { + testee_server.run(); + } else { +diff --git a/test/endpoint/endpoint.cpp b/test/endpoint/endpoint.cpp +index b4c429e..fa58e66 100644 +--- a/test/endpoint/endpoint.cpp ++++ b/test/endpoint/endpoint.cpp +@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio ) { + + BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) { + websocketpp::server s; +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + s.init_asio(&ios); + } + +@@ -141,8 +141,8 @@ BOOST_AUTO_TEST_CASE( listen_after_listen_failure ) { + server1.init_asio(); + server2.init_asio(); + +- boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::address::from_string("127.0.0.1"), 12345); +- boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::address::from_string("127.0.0.1"), 23456); ++ boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::make_address("127.0.0.1"), 12345); ++ boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::make_address("127.0.0.1"), 23456); + + server1.listen(ep1, ec); + BOOST_CHECK(!ec); +diff --git a/test/transport/asio/timers.cpp b/test/transport/asio/timers.cpp +index aa03d61..391b755 100644 +--- a/test/transport/asio/timers.cpp ++++ b/test/transport/asio/timers.cpp +@@ -54,9 +54,9 @@ void run_dummy_server(int port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; +- tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port)); +- tcp::socket socket(io_service); ++ boost::asio::io_context io_context; ++ tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v6(), port)); ++ tcp::socket socket(io_context); + + acceptor.accept(socket); + for (;;) { +@@ -79,7 +79,7 @@ void run_dummy_server(int port) { + + // Wait for the specified time period then fail the test + void run_test_timer(long value) { +- boost::asio::io_service ios; ++ boost::asio::io_context ios; + boost::asio::deadline_timer t(ios,boost::posix_time::milliseconds(value)); + boost::system::error_code ec; + t.wait(ec); +diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp +index c083cfd..ab82b1a 100644 +--- a/test/transport/integration.cpp ++++ b/test/transport/integration.cpp +@@ -221,9 +221,9 @@ void run_dummy_server(int port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; +- tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port)); +- tcp::socket socket(io_service); ++ boost::asio::io_context io_context; ++ tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v6(), port)); ++ tcp::socket socket(io_context); + + acceptor.accept(socket); + for (;;) { +@@ -248,13 +248,12 @@ void run_dummy_client(std::string port) { + using boost::asio::ip::tcp; + + try { +- boost::asio::io_service io_service; +- tcp::resolver resolver(io_service); +- tcp::resolver::query query("localhost", port); +- tcp::resolver::iterator iterator = resolver.resolve(query); +- tcp::socket socket(io_service); ++ boost::asio::io_context io_context; ++ tcp::resolver resolver(io_context); ++ tcp::resolver::results_type endpoints = resolver.resolve("localhost", port); ++ tcp::socket socket(io_context); + +- boost::asio::connect(socket, iterator); ++ boost::asio::connect(socket, endpoints); + for (;;) { + char data[512]; + boost::system::error_code ec; +@@ -358,11 +357,11 @@ class test_deadline_timer + { + public: + test_deadline_timer(int seconds) +- : m_timer(m_io_service, boost::posix_time::seconds(seconds)) ++ : m_timer(m_io_context, boost::posix_time::seconds(seconds)) + { + m_timer.async_wait(bind(&test_deadline_timer::expired, this, ::_1)); +- std::size_t (boost::asio::io_service::*run)() = &boost::asio::io_service::run; +- m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_service)); ++ std::size_t (boost::asio::io_context::*run)() = &boost::asio::io_context::run; ++ m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_context)); + } + ~test_deadline_timer() + { +@@ -379,7 +378,7 @@ public: + BOOST_FAIL("Test timed out"); + } + +- boost::asio::io_service m_io_service; ++ boost::asio::io_context m_io_context; + boost::asio::deadline_timer m_timer; + websocketpp::lib::thread m_timer_thread; + }; +@@ -541,7 +540,7 @@ BOOST_AUTO_TEST_CASE( client_runs_out_of_work ) { + + c.run(); + +- // This test checks that an io_service with no work ends immediately. ++ // This test checks that an io_context with no work ends immediately. + BOOST_CHECK(true); + } + +diff --git a/tutorials/utility_server/step1.cpp b/tutorials/utility_server/step1.cpp +index c0e4643..dae4a2a 100644 +--- a/tutorials/utility_server/step1.cpp ++++ b/tutorials/utility_server/step1.cpp +@@ -57,7 +57,7 @@ public: + // Queues a connection accept operation + m_endpoint.start_accept(); + +- // Start the Asio io_service run loop ++ // Start the Asio io_context run loop + m_endpoint.run(); + } + private: +diff --git a/tutorials/utility_server/step2.cpp b/tutorials/utility_server/step2.cpp +index a2815bb..c4fe486 100644 +--- a/tutorials/utility_server/step2.cpp ++++ b/tutorials/utility_server/step2.cpp +@@ -68,7 +68,7 @@ public: + // Queues a connection accept operation + m_endpoint.start_accept(); + +- // Start the Asio io_service run loop ++ // Start the Asio io_context run loop + m_endpoint.run(); + } + private: +diff --git a/tutorials/utility_server/utility_server.md b/tutorials/utility_server/utility_server.md +index 1c7ee3f..461eed0 100644 +--- a/tutorials/utility_server/utility_server.md ++++ b/tutorials/utility_server/utility_server.md +@@ -56,7 +56,7 @@ m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log: + + Next, we initialize the transport system underlying the endpoint. This method is specific to the Asio transport not WebSocket++ core. It will not be necessary or present in endpoints that use a non-asio config. + +-> **Note:** This example uses an internal Asio `io_service` that is managed by the endpoint itself. This is a simple arrangement suitable for programs where WebSocket++ is the only code using Asio. If you have an existing program that already manages an `io_service` object or want to build a new program where WebSocket++ handlers share an io_service with other handlers you can pass the `io_service` you want WebSocket++ to register its handlers on to the `init_asio()` method and it will use it instead of generating and managing its own. [TODO: FAQ link instead?] ++> **Note:** This example uses an internal Asio `io_context` that is managed by the endpoint itself. This is a simple arrangement suitable for programs where WebSocket++ is the only code using Asio. If you have an existing program that already manages an `io_context` object or want to build a new program where WebSocket++ handlers share an io_context with other handlers you can pass the `io_context` you want WebSocket++ to register its handlers on to the `init_asio()` method and it will use it instead of generating and managing its own. [TODO: FAQ link instead?] + + ~~~{.cpp} + m_endpoint.init_asio(); +@@ -64,7 +64,7 @@ m_endpoint.init_asio(); + + #### `utility_server::run` method + +-In addition to the constructor, we also add a run method that sets up the listening socket, begins accepting connections, starts the Asio io_service event loop. ++In addition to the constructor, we also add a run method that sets up the listening socket, begins accepting connections, starts the Asio io_context event loop. + + ~~~{.cpp} + // Listen on port 9002 +@@ -73,7 +73,7 @@ m_endpoint.listen(9002); + // Queues a connection accept operation + m_endpoint.start_accept(); + +-// Start the Asio io_service run loop ++// Start the Asio io_context run loop + m_endpoint.run(); + ~~~ + +@@ -123,7 +123,7 @@ public: + // Queues a connection accept operation + m_endpoint.start_accept(); + +- // Start the Asio io_service run loop ++ // Start the Asio io_context run loop + m_endpoint.run(); + } + private: +diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp +index 9cc652f..ed4b703 100644 +--- a/websocketpp/roles/server_endpoint.hpp ++++ b/websocketpp/roles/server_endpoint.hpp +@@ -110,8 +110,8 @@ public: + /// Starts the server's async connection acceptance loop (exception free) + /** + * Initiates the server connection acceptance loop. Must be called after +- * listen. This method will have no effect until the underlying io_service +- * starts running. It may be called after the io_service is already running. ++ * listen. This method will have no effect until the underlying io_context ++ * starts running. It may be called after the io_context is already running. + * + * Refer to documentation for the transport policy you are using for + * instructions on how to stop this acceptance loop. +diff --git a/websocketpp/transport/asio/base.hpp b/websocketpp/transport/asio/base.hpp +index b945fe1..8d980ad 100644 +--- a/websocketpp/transport/asio/base.hpp ++++ b/websocketpp/transport/asio/base.hpp +@@ -40,7 +40,7 @@ namespace websocketpp { + namespace transport { + /// Transport policy that uses asio + /** +- * This policy uses a single asio io_service to provide transport ++ * This policy uses a single asio io_context to provide transport + * services to a WebSocket++ endpoint. + */ + namespace asio { +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 57dda74..eaee6bc 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -85,10 +85,10 @@ public: + typedef typename config::response_type response_type; + typedef typename response_type::ptr response_ptr; + +- /// Type of a pointer to the Asio io_service being used +- typedef lib::asio::io_service * io_service_ptr; +- /// Type of a pointer to the Asio io_service::strand being used +- typedef lib::shared_ptr strand_ptr; ++ /// Type of a pointer to the Asio io_context being used ++ typedef lib::asio::io_context * io_context_ptr; ++ /// Type of a pointer to the Asio io_context::strand being used ++ typedef lib::shared_ptr strand_ptr; + /// Type of a pointer to the Asio timer class + typedef lib::shared_ptr timer_ptr; + +@@ -97,7 +97,7 @@ public: + // to the public api. + friend class endpoint; + +- // generate and manage our own io_service ++ // generate and manage our own io_context + explicit connection(bool is_server, const lib::shared_ptr & alog, const lib::shared_ptr & elog) + : m_is_server(is_server) + , m_alog(alog) +@@ -313,7 +313,7 @@ public: + timer_ptr set_timer(long duration, timer_handler callback) { + timer_ptr new_timer( + new lib::asio::steady_timer( +- *m_io_service, ++ *m_io_context, + lib::asio::milliseconds(duration)) + ); + +@@ -393,7 +393,7 @@ public: + /// Initialize transport for reading + /** + * init_asio is called once immediately after construction to initialize +- * Asio components to the io_service ++ * Asio components to the io_context + * + * The transport initialization sequence consists of the following steps: + * - Pre-init: the underlying socket is initialized to the point where +@@ -451,21 +451,21 @@ protected: + /// Finish constructing the transport + /** + * init_asio is called once immediately after construction to initialize +- * Asio components to the io_service. ++ * Asio components to the io_context. + * +- * @param io_service A pointer to the io_service to register with this ++ * @param io_context A pointer to the io_context to register with this + * connection + * + * @return Status code for the success or failure of the initialization + */ +- lib::error_code init_asio (io_service_ptr io_service) { +- m_io_service = io_service; ++ lib::error_code init_asio (io_context_ptr io_context) { ++ m_io_context = io_context; + + if (config::enable_multithreading) { +- m_strand.reset(new lib::asio::io_service::strand(*io_service)); ++ m_strand.reset(new lib::asio::io_context::strand(*io_context)); + } + +- lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, ++ lib::error_code ec = socket_con_type::init_asio(io_context, m_strand, + m_is_server); + + return ec; +@@ -573,7 +573,7 @@ protected: + lib::error_code const & ec) + { + if (ec == transport::error::operation_aborted || +- (post_timer && lib::asio::is_neg(post_timer->expires_from_now()))) ++ (post_timer && lib::asio::is_neg(post_timer->expiry() - std::chrono::steady_clock::now()))) + { + m_alog->write(log::alevel::devel,"post_init cancelled"); + return; +@@ -679,7 +679,7 @@ protected: + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expires_from_now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) + { + m_elog->write(log::elevel::devel,"write operation aborted"); + return; +@@ -751,7 +751,7 @@ protected: + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expires_from_now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) + { + m_elog->write(log::elevel::devel,"read operation aborted"); + return; +@@ -1012,18 +1012,18 @@ protected: + */ + lib::error_code interrupt(interrupt_handler handler) { + if (config::enable_multithreading) { +- m_io_service->post(m_strand->wrap(handler)); ++ boost::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); + } else { +- m_io_service->post(handler); ++ boost::asio::post(m_io_context->get_executor(), handler); + } + return lib::error_code(); + } + + lib::error_code dispatch(dispatch_handler handler) { + if (config::enable_multithreading) { +- m_io_service->post(m_strand->wrap(handler)); ++ boost::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); + } else { +- m_io_service->post(handler); ++ boost::asio::post(m_io_context->get_executor(), handler); + } + return lib::error_code(); + } +@@ -1095,7 +1095,7 @@ protected: + callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(shutdown_timer->expires_from_now())) ++ lib::asio::is_neg(shutdown_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_shutdown cancelled"); + return; +@@ -1172,7 +1172,7 @@ private: + lib::shared_ptr m_proxy_data; + + // transport resources +- io_service_ptr m_io_service; ++ io_context_ptr m_io_context; + strand_ptr m_strand; + connection_hdl m_connection_hdl; + +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 94509ad..7af0915 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -77,25 +77,25 @@ public: + /// associated with this endpoint transport component + typedef typename transport_con_type::ptr transport_con_ptr; + +- /// Type of a pointer to the ASIO io_service being used +- typedef lib::asio::io_service * io_service_ptr; ++ /// Type of a pointer to the ASIO io_context being used ++ typedef lib::asio::io_context * io_context_ptr; + /// Type of a shared pointer to the acceptor being used + typedef lib::shared_ptr acceptor_ptr; + /// Type of a shared pointer to the resolver being used + typedef lib::shared_ptr resolver_ptr; + /// Type of timer handle + typedef lib::shared_ptr timer_ptr; +- /// Type of a shared pointer to an io_service work object +- typedef lib::shared_ptr work_ptr; ++ /// Type of a shared pointer to an io_context work object ++ typedef lib::shared_ptr> work_ptr; + + /// Type of socket pre-bind handler + typedef lib::function tcp_pre_bind_handler; + +- // generate and manage our own io_service ++ // generate and manage our own io_context + explicit endpoint() +- : m_io_service(NULL) +- , m_external_io_service(false) +- , m_listen_backlog(lib::asio::socket_base::max_connections) ++ : m_io_context(NULL) ++ , m_external_io_context(false) ++ , m_listen_backlog(lib::asio::socket_base::max_listen_connections) + , m_reuse_addr(false) + , m_state(UNINITIALIZED) + { +@@ -103,14 +103,14 @@ public: + } + + ~endpoint() { +- // clean up our io_service if we were initialized with an internal one. ++ // clean up our io_context if we were initialized with an internal one. + + // Explicitly destroy local objects + m_acceptor.reset(); + m_resolver.reset(); + m_work.reset(); +- if (m_state != UNINITIALIZED && !m_external_io_service) { +- delete m_io_service; ++ if (m_state != UNINITIALIZED && !m_external_io_context) { ++ delete m_io_context; + } + } + +@@ -132,34 +132,34 @@ public: + : config::socket_type(std::move(src)) + , m_tcp_pre_init_handler(src.m_tcp_pre_init_handler) + , m_tcp_post_init_handler(src.m_tcp_post_init_handler) +- , m_io_service(src.m_io_service) +- , m_external_io_service(src.m_external_io_service) ++ , m_io_context(src.m_io_context) ++ , m_external_io_context(src.m_external_io_context) + , m_acceptor(src.m_acceptor) +- , m_listen_backlog(lib::asio::socket_base::max_connections) ++ , m_listen_backlog(lib::asio::socket_base::max_listen_connections) + , m_reuse_addr(src.m_reuse_addr) + , m_elog(src.m_elog) + , m_alog(src.m_alog) + , m_state(src.m_state) + { +- src.m_io_service = NULL; +- src.m_external_io_service = false; ++ src.m_io_context = NULL; ++ src.m_external_io_context = false; + src.m_acceptor = NULL; + src.m_state = UNINITIALIZED; + } + + /*endpoint & operator= (const endpoint && rhs) { + if (this != &rhs) { +- m_io_service = rhs.m_io_service; +- m_external_io_service = rhs.m_external_io_service; ++ m_io_context = rhs.m_io_context; ++ m_external_io_context = rhs.m_external_io_context; + m_acceptor = rhs.m_acceptor; + m_listen_backlog = rhs.m_listen_backlog; + m_reuse_addr = rhs.m_reuse_addr; + m_state = rhs.m_state; + +- rhs.m_io_service = NULL; +- rhs.m_external_io_service = false; ++ rhs.m_io_context = NULL; ++ rhs.m_external_io_context = false; + rhs.m_acceptor = NULL; +- rhs.m_listen_backlog = lib::asio::socket_base::max_connections; ++ rhs.m_listen_backlog = lib::asio::socket_base::max_listen_connections; + rhs.m_state = UNINITIALIZED; + + // TODO: this needs to be updated +@@ -173,16 +173,16 @@ public: + return socket_type::is_secure(); + } + +- /// initialize asio transport with external io_service (exception free) ++ /// initialize asio transport with external io_context (exception free) + /** + * Initialize the ASIO transport policy for this endpoint using the provided +- * io_service object. asio_init must be called exactly once on any endpoint ++ * io_context object. asio_init must be called exactly once on any endpoint + * that uses transport::asio before it can be used. + * +- * @param ptr A pointer to the io_service to use for asio events ++ * @param ptr A pointer to the io_context to use for asio events + * @param ec Set to indicate what error occurred, if any. + */ +- void init_asio(io_service_ptr ptr, lib::error_code & ec) { ++ void init_asio(io_context_ptr ptr, lib::error_code & ec) { + if (m_state != UNINITIALIZED) { + m_elog->write(log::elevel::library, + "asio::init_asio called from the wrong state"); +@@ -193,34 +193,34 @@ public: + + m_alog->write(log::alevel::devel,"asio::init_asio"); + +- m_io_service = ptr; +- m_external_io_service = true; +- m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); ++ m_io_context = ptr; ++ m_external_io_context = true; ++ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_context)); + + m_state = READY; + ec = lib::error_code(); + } + +- /// initialize asio transport with external io_service ++ /// initialize asio transport with external io_context + /** + * Initialize the ASIO transport policy for this endpoint using the provided +- * io_service object. asio_init must be called exactly once on any endpoint ++ * io_context object. asio_init must be called exactly once on any endpoint + * that uses transport::asio before it can be used. + * +- * @param ptr A pointer to the io_service to use for asio events ++ * @param ptr A pointer to the io_context to use for asio events + */ +- void init_asio(io_service_ptr ptr) { ++ void init_asio(io_context_ptr ptr) { + lib::error_code ec; + init_asio(ptr,ec); + if (ec) { throw exception(ec); } + } + +- /// Initialize asio transport with internal io_service (exception free) ++ /// Initialize asio transport with internal io_context (exception free) + /** + * This method of initialization will allocate and use an internally managed +- * io_service. ++ * io_context. + * +- * @see init_asio(io_service_ptr ptr) ++ * @see init_asio(io_context_ptr ptr) + * + * @param ec Set to indicate what error occurred, if any. + */ +@@ -230,21 +230,21 @@ public: + // TODO: remove the use of auto_ptr when C++98/03 support is no longer + // necessary. + #ifdef _WEBSOCKETPP_CPP11_MEMORY_ +- lib::unique_ptr service(new lib::asio::io_service()); ++ lib::unique_ptr context(new lib::asio::io_context()); + #else +- lib::auto_ptr service(new lib::asio::io_service()); ++ lib::auto_ptr context(new lib::asio::io_context()); + #endif +- init_asio(service.get(), ec); +- if( !ec ) service.release(); // Call was successful, transfer ownership +- m_external_io_service = false; ++ init_asio(context.get(), ec); ++ if( !ec ) context.release(); // Call was successful, transfer ownership ++ m_external_io_context = false; + } + +- /// Initialize asio transport with internal io_service ++ /// Initialize asio transport with internal io_context + /** + * This method of initialization will allocate and use an internally managed +- * io_service. ++ * io_context. + * +- * @see init_asio(io_service_ptr ptr) ++ * @see init_asio(io_context_ptr ptr) + */ + void init_asio() { + // Use a smart pointer until the call is successful and ownership has +@@ -252,14 +252,14 @@ public: + // TODO: remove the use of auto_ptr when C++98/03 support is no longer + // necessary. + #ifdef _WEBSOCKETPP_CPP11_MEMORY_ +- lib::unique_ptr service(new lib::asio::io_service()); ++ lib::unique_ptr context(new lib::asio::io_context()); + #else +- lib::auto_ptr service(new lib::asio::io_service()); ++ lib::auto_ptr context(new lib::asio::io_context()); + #endif +- init_asio( service.get() ); ++ init_asio( context.get() ); + // If control got this far without an exception, then ownership has successfully been taken +- service.release(); +- m_external_io_service = false; ++ context.release(); ++ m_external_io_context = false; + } + + /// Sets the tcp pre bind handler +@@ -330,7 +330,7 @@ public: + * + * New values affect future calls to listen only. + * +- * The default value is specified as *::asio::socket_base::max_connections ++ * The default value is specified as *::asio::socket_base::max_listen_connections + * which uses the operating system defined maximum queue length. Your OS + * may restrict or silently lower this value. A value of zero may cause + * all connections to be rejected. +@@ -364,19 +364,19 @@ public: + m_reuse_addr = value; + } + +- /// Retrieve a reference to the endpoint's io_service ++ /// Retrieve a reference to the endpoint's io_context + /** +- * The io_service may be an internal or external one. This may be used to +- * call methods of the io_service that are not explicitly wrapped by the ++ * The io_context may be an internal or external one. This may be used to ++ * call methods of the io_context that are not explicitly wrapped by the + * endpoint. + * + * This method is only valid after the endpoint has been initialized with + * `init_asio`. No error will be returned if it isn't. + * +- * @return A reference to the endpoint's io_service ++ * @return A reference to the endpoint's io_context + */ +- lib::asio::io_service & get_io_service() { +- return *m_io_service; ++ lib::asio::io_context & get_io_context() { ++ return *m_io_context; + } + + /// Get local TCP endpoint +@@ -557,17 +557,15 @@ public: + lib::error_code & ec) + { + using lib::asio::ip::tcp; +- tcp::resolver r(*m_io_service); +- tcp::resolver::query query(host, service); +- tcp::resolver::iterator endpoint_iterator = r.resolve(query); +- tcp::resolver::iterator end; +- if (endpoint_iterator == end) { ++ tcp::resolver r(*m_io_context); ++ tcp::resolver::results_type endpoints = r.resolve(host, service); ++ if (endpoints.empty()) { + m_elog->write(log::elevel::library, + "asio::listen could not resolve the supplied host or service"); + ec = make_error_code(error::invalid_host_service); + return; + } +- listen(*endpoint_iterator,ec); ++ listen(*endpoints.begin(),ec); + } + + /// Set up endpoint for listening on a host and service +@@ -636,42 +634,42 @@ public: + return (m_state == LISTENING); + } + +- /// wraps the run method of the internal io_service object ++ /// wraps the run method of the internal io_context object + std::size_t run() { +- return m_io_service->run(); ++ return m_io_context->run(); + } + +- /// wraps the run_one method of the internal io_service object ++ /// wraps the run_one method of the internal io_context object + /** + * @since 0.3.0-alpha4 + */ + std::size_t run_one() { +- return m_io_service->run_one(); ++ return m_io_context->run_one(); + } + +- /// wraps the stop method of the internal io_service object ++ /// wraps the stop method of the internal io_context object + void stop() { +- m_io_service->stop(); ++ m_io_context->stop(); + } + +- /// wraps the poll method of the internal io_service object ++ /// wraps the poll method of the internal io_context object + std::size_t poll() { +- return m_io_service->poll(); ++ return m_io_context->poll(); + } + +- /// wraps the poll_one method of the internal io_service object ++ /// wraps the poll_one method of the internal io_context object + std::size_t poll_one() { +- return m_io_service->poll_one(); ++ return m_io_context->poll_one(); + } + +- /// wraps the reset method of the internal io_service object ++ /// wraps the restart method of the internal io_context object + void reset() { +- m_io_service->reset(); ++ m_io_context->restart(); + } + +- /// wraps the stopped method of the internal io_service object ++ /// wraps the stopped method of the internal io_context object + bool stopped() const { +- return m_io_service->stopped(); ++ return m_io_context->stopped(); + } + + /// Marks the endpoint as perpetual, stopping it from exiting when empty +@@ -687,7 +685,7 @@ public: + * @since 0.3.0 + */ + void start_perpetual() { +- m_work.reset(new lib::asio::io_service::work(*m_io_service)); ++ m_work.reset(new lib::asio::executor_work_guard(m_io_context->get_executor())); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -716,7 +714,7 @@ public: + */ + timer_ptr set_timer(long duration, timer_handler callback) { + timer_ptr new_timer = lib::make_shared( +- *m_io_service, ++ *m_io_context, + lib::asio::milliseconds(duration) + ); + +@@ -851,7 +849,7 @@ protected: + + // Create a resolver + if (!m_resolver) { +- m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); ++ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_context)); + } + + tcon->set_uri(u); +@@ -883,8 +881,6 @@ protected: + port = pu->get_port_str(); + } + +- tcp::resolver::query query(host,port); +- + if (m_alog->static_test(log::alevel::devel)) { + m_alog->write(log::alevel::devel, + "starting async DNS resolve for "+host+":"+port); +@@ -905,7 +901,8 @@ protected: + + if (config::enable_multithreading) { + m_resolver->async_resolve( +- query, ++ host, ++ port, + tcon->get_strand()->wrap(lib::bind( + &type::handle_resolve, + this, +@@ -918,7 +915,8 @@ protected: + ); + } else { + m_resolver->async_resolve( +- query, ++ host, ++ port, + lib::bind( + &type::handle_resolve, + this, +@@ -966,10 +964,10 @@ protected: + + void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer, + connect_handler callback, lib::asio::error_code const & ec, +- lib::asio::ip::tcp::resolver::iterator iterator) ++ lib::asio::ip::tcp::resolver::results_type endpoints) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(dns_timer->expires_from_now())) ++ lib::asio::is_neg(dns_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_resolve cancelled"); + return; +@@ -987,8 +985,8 @@ protected: + std::stringstream s; + s << "Async DNS resolve successful. Results: "; + +- lib::asio::ip::tcp::resolver::iterator it, end; +- for (it = iterator; it != end; ++it) { ++ lib::asio::ip::tcp::resolver::results_type::iterator it; ++ for (it = endpoints.begin(); it != endpoints.end(); ++it) { + s << (*it).endpoint() << " "; + } + +@@ -1014,7 +1012,7 @@ protected: + if (config::enable_multithreading) { + lib::asio::async_connect( + tcon->get_raw_socket(), +- iterator, ++ endpoints, + tcon->get_strand()->wrap(lib::bind( + &type::handle_connect, + this, +@@ -1027,7 +1025,7 @@ protected: + } else { + lib::asio::async_connect( + tcon->get_raw_socket(), +- iterator, ++ endpoints, + lib::bind( + &type::handle_connect, + this, +@@ -1077,7 +1075,7 @@ protected: + connect_handler callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(con_timer->expires_from_now())) ++ lib::asio::is_neg(con_timer->expiry() - std::chrono::steady_clock::now())) + { + m_alog->write(log::alevel::devel,"async_connect cancelled"); + return; +@@ -1119,7 +1117,7 @@ protected: + + lib::error_code ec; + +- ec = tcon->init_asio(m_io_service); ++ ec = tcon->init_asio(m_io_context); + if (ec) {return ec;} + + tcon->set_tcp_pre_init_handler(m_tcp_pre_init_handler); +@@ -1158,8 +1156,8 @@ private: + tcp_init_handler m_tcp_post_init_handler; + + // Network Resources +- io_service_ptr m_io_service; +- bool m_external_io_service; ++ io_context_ptr m_io_context; ++ bool m_external_io_context; + acceptor_ptr m_acceptor; + resolver_ptr m_resolver; + work_ptr m_work; +diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp +index 6c7d352..009063f 100644 +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -62,10 +62,10 @@ public: + /// Type of a shared pointer to this connection socket component + typedef lib::shared_ptr ptr; + +- /// Type of a pointer to the Asio io_service being used +- typedef lib::asio::io_service* io_service_ptr; +- /// Type of a pointer to the Asio io_service strand being used +- typedef lib::shared_ptr strand_ptr; ++ /// Type of a pointer to the Asio io_context being used ++ typedef lib::asio::io_context* io_context_ptr; ++ /// Type of a pointer to the Asio io_context strand being used ++ typedef lib::shared_ptr strand_ptr; + /// Type of the ASIO socket being used + typedef lib::asio::ip::tcp::socket socket_type; + /// Type of a shared pointer to the socket being used. +@@ -156,19 +156,19 @@ protected: + /// Perform one time initializations + /** + * init_asio is called once immediately after construction to initialize +- * Asio components to the io_service ++ * Asio components to the io_context + * +- * @param service A pointer to the endpoint's io_service ++ * @param service A pointer to the endpoint's io_context + * @param strand A shared pointer to the connection's asio strand + * @param is_server Whether or not the endpoint is a server or not. + */ +- lib::error_code init_asio (io_service_ptr service, strand_ptr, bool) ++ lib::error_code init_asio (io_context_ptr context, strand_ptr, bool) + { + if (m_state != UNINITIALIZED) { + return socket::make_error_code(socket::error::invalid_state); + } + +- m_socket.reset(new lib::asio::ip::tcp::socket(*service)); ++ m_socket.reset(new lib::asio::ip::tcp::socket(*context)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, *m_socket); +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index 04ac379..9f86fc1 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -71,10 +71,10 @@ public: + typedef lib::asio::ssl::stream socket_type; + /// Type of a shared pointer to the ASIO socket being used + typedef lib::shared_ptr socket_ptr; +- /// Type of a pointer to the ASIO io_service being used +- typedef lib::asio::io_service * io_service_ptr; +- /// Type of a pointer to the ASIO io_service strand being used +- typedef lib::shared_ptr strand_ptr; ++ /// Type of a pointer to the ASIO io_context being used ++ typedef lib::asio::io_context * io_context_ptr; ++ /// Type of a pointer to the ASIO io_context strand being used ++ typedef lib::shared_ptr strand_ptr; + /// Type of a shared pointer to the ASIO TLS context being used + typedef lib::shared_ptr context_ptr; + +@@ -176,13 +176,13 @@ protected: + /// Perform one time initializations + /** + * init_asio is called once immediately after construction to initialize +- * Asio components to the io_service ++ * Asio components to the io_context + * +- * @param service A pointer to the endpoint's io_service ++ * @param service A pointer to the endpoint's io_context + * @param strand A pointer to the connection's strand + * @param is_server Whether or not the endpoint is a server or not. + */ +- lib::error_code init_asio (io_service_ptr service, strand_ptr strand, ++ lib::error_code init_asio (io_context_ptr context, strand_ptr strand, + bool is_server) + { + if (!m_tls_init_handler) { +@@ -193,13 +193,13 @@ protected: + if (!m_context) { + return socket::make_error_code(socket::error::invalid_tls_context); + } +- m_socket.reset(new socket_type(*service, *m_context)); ++ m_socket.reset(new socket_type(*context, *m_context)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, get_socket()); + } + +- m_io_service = service; ++ m_io_context = context; + m_strand = strand; + m_is_server = is_server; + +@@ -381,7 +381,7 @@ private: + } + } + +- io_service_ptr m_io_service; ++ io_context_ptr m_io_context; + strand_ptr m_strand; + context_ptr m_context; + socket_ptr m_socket; +diff --git a/websocketpp/transport/debug/endpoint.hpp b/websocketpp/transport/debug/endpoint.hpp +index adc89b3..3606441 100644 +--- a/websocketpp/transport/debug/endpoint.hpp ++++ b/websocketpp/transport/debug/endpoint.hpp +@@ -60,7 +60,7 @@ public: + /// associated connection transport component + typedef typename transport_con_type::ptr transport_con_ptr; + +- // generate and manage our own io_service ++ // generate and manage our own io_context + explicit endpoint() + { + //std::cout << "transport::iostream::endpoint constructor" << std::endl; +diff --git a/websocketpp/transport/iostream/endpoint.hpp b/websocketpp/transport/iostream/endpoint.hpp +index 14cba72..257472d 100644 +--- a/websocketpp/transport/iostream/endpoint.hpp ++++ b/websocketpp/transport/iostream/endpoint.hpp +@@ -64,7 +64,7 @@ public: + /// associated connection transport component + typedef typename transport_con_type::ptr transport_con_ptr; + +- // generate and manage our own io_service ++ // generate and manage our own io_context + explicit endpoint() : m_output_stream(NULL), m_is_secure(false) + { + //std::cout << "transport::iostream::endpoint constructor" << std::endl; +diff --git a/websocketpp/transport/stub/endpoint.hpp b/websocketpp/transport/stub/endpoint.hpp +index 3bbb78f..8f8493a 100644 +--- a/websocketpp/transport/stub/endpoint.hpp ++++ b/websocketpp/transport/stub/endpoint.hpp +@@ -60,7 +60,7 @@ public: + /// associated connection transport component + typedef typename transport_con_type::ptr transport_con_ptr; + +- // generate and manage our own io_service ++ // generate and manage our own io_context + explicit endpoint() + { + //std::cout << "transport::iostream::endpoint constructor" << std::endl; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Wed, 12 Feb 2025 04:46:30 +0000 +Subject: [PATCH 2/7] updated docstrings + +(cherry picked from commit 30e77468e093e8384fa07819b345f81a0431eb37) + + Conflicts: + websocketpp/transport/asio/endpoint.hpp +--- + websocketpp/transport/asio/endpoint.hpp | 2 +- + websocketpp/transport/asio/security/none.hpp | 2 +- + websocketpp/transport/asio/security/tls.hpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 7af0915..a5e1700 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -549,7 +549,7 @@ public: + * + * @param host A string identifying a location. May be a descriptive name or + * a numeric address string. +- * @param service A string identifying the requested service. This may be a ++ * @param context A string identifying the requested service. This may be a + * descriptive name or a numeric string corresponding to a port number. + * @param ec Set to indicate what error occurred, if any. + */ +diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp +index 009063f..ff19d5c 100644 +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -158,7 +158,7 @@ protected: + * init_asio is called once immediately after construction to initialize + * Asio components to the io_context + * +- * @param service A pointer to the endpoint's io_context ++ * @param context A pointer to the endpoint's io_context + * @param strand A shared pointer to the connection's asio strand + * @param is_server Whether or not the endpoint is a server or not. + */ +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index 9f86fc1..8b27656 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -178,7 +178,7 @@ protected: + * init_asio is called once immediately after construction to initialize + * Asio components to the io_context + * +- * @param service A pointer to the endpoint's io_context ++ * @param context A pointer to the endpoint's io_context + * @param strand A pointer to the connection's strand + * @param is_server Whether or not the endpoint is a server or not. + */ +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Wed, 12 Feb 2025 04:48:13 +0000 +Subject: [PATCH 3/7] updated docstrings + +(cherry picked from commit 3d13472f7489bda718ded20d885dbaf98e36442c) +--- + websocketpp/transport/asio/endpoint.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index a5e1700..7af0915 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -549,7 +549,7 @@ public: + * + * @param host A string identifying a location. May be a descriptive name or + * a numeric address string. +- * @param context A string identifying the requested service. This may be a ++ * @param service A string identifying the requested service. This may be a + * descriptive name or a numeric string corresponding to a port number. + * @param ec Set to indicate what error occurred, if any. + */ +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Fri, 14 Feb 2025 07:48:42 +0000 +Subject: [PATCH 4/7] silenced warning about unused variable in TLS IP address + validation, improved time-to-expiry calculation (credit toonetown), added + CMake flag to compile tests and examples with ASIO standalone, fixed example + and test compilation with ASIO standalone + +(cherry picked from commit 6867ad089932fc2a786c39dae5ed152991e4ee46) + + Conflicts: + websocketpp/transport/asio/security/tls.hpp +--- + CMakeLists.txt | 5 +++ + examples/debug_client/debug_client.cpp | 12 +++--- + .../echo_server_both/echo_server_both.cpp | 16 ++++---- + .../external_io_context.cpp | 2 +- + .../external_io_context/tcp_echo_server.hpp | 28 +++++++------- + .../print_client_tls/print_client_tls.cpp | 14 +++---- + examples/testee_server/testee_server.cpp | 4 +- + test/endpoint/endpoint.cpp | 6 +-- + test/http/parser_perf.cpp | 4 +- + test/transport/asio/timers.cpp | 4 +- + test/transport/integration.cpp | 38 ++++++++++--------- + websocketpp/common/asio.hpp | 2 +- + websocketpp/transport/asio/connection.hpp | 18 ++++----- + websocketpp/transport/asio/endpoint.hpp | 4 +- + 14 files changed, 81 insertions(+), 76 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f93e24..cde4273 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,7 @@ include (CMakeHelpers) + option (ENABLE_CPP11 "Build websocketpp with CPP11 features enabled." TRUE) + option (BUILD_EXAMPLES "Build websocketpp examples." FALSE) + option (BUILD_TESTS "Build websocketpp tests." FALSE) ++option (USE_ASIO_STANDALONE "Build websocketpp examples and tests using the standalone ASIO library." FALSE) + + if (BUILD_TESTS OR BUILD_EXAMPLES) + +@@ -246,6 +247,10 @@ endif() + + ############ Add projects + ++if (USE_ASIO_STANDALONE) ++ add_definitions("-DASIO_STANDALONE -DASIO_HAS_BOOST_DATE_TIME") ++endif () ++ + # Add main library + add_subdirectory (websocketpp) + +diff --git a/examples/debug_client/debug_client.cpp b/examples/debug_client/debug_client.cpp +index d3e21ab..7b6b40e 100644 +--- a/examples/debug_client/debug_client.cpp ++++ b/examples/debug_client/debug_client.cpp +@@ -44,7 +44,7 @@ using websocketpp::lib::bind; + + // pull out the type of messages sent by our config + typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr; +-typedef websocketpp::lib::shared_ptr context_ptr; ++typedef websocketpp::lib::shared_ptr context_ptr; + typedef client::connection_ptr connection_ptr; + + +@@ -94,13 +94,13 @@ public: + + context_ptr on_tls_init(websocketpp::connection_hdl) { + m_tls_init = std::chrono::high_resolution_clock::now(); +- context_ptr ctx = websocketpp::lib::make_shared(boost::asio::ssl::context::tlsv1); ++ context_ptr ctx = websocketpp::lib::make_shared(websocketpp::lib::asio::ssl::context::tlsv1); + + try { +- ctx->set_options(boost::asio::ssl::context::default_workarounds | +- boost::asio::ssl::context::no_sslv2 | +- boost::asio::ssl::context::no_sslv3 | +- boost::asio::ssl::context::single_dh_use); ++ ctx->set_options(websocketpp::lib::asio::ssl::context::default_workarounds | ++ websocketpp::lib::asio::ssl::context::no_sslv2 | ++ websocketpp::lib::asio::ssl::context::no_sslv3 | ++ websocketpp::lib::asio::ssl::context::single_dh_use); + } catch (std::exception& e) { + std::cout << e.what() << std::endl; + } +diff --git a/examples/echo_server_both/echo_server_both.cpp b/examples/echo_server_both/echo_server_both.cpp +index 869c006..a4f6a19 100644 +--- a/examples/echo_server_both/echo_server_both.cpp ++++ b/examples/echo_server_both/echo_server_both.cpp +@@ -14,7 +14,7 @@ using websocketpp::lib::placeholders::_2; + using websocketpp::lib::bind; + + // type of the ssl context pointer is long so alias it +-typedef websocketpp::lib::shared_ptr context_ptr; ++typedef websocketpp::lib::shared_ptr context_ptr; + + // The shared on_message handler takes a template parameter so the function can + // resolve any endpoint dependent types like message_ptr or connection_ptr +@@ -41,16 +41,16 @@ std::string get_password() { + + context_ptr on_tls_init(websocketpp::connection_hdl hdl) { + std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl; +- context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1)); ++ context_ptr ctx(new websocketpp::lib::asio::ssl::context(websocketpp::lib::asio::ssl::context::tlsv1)); + + try { +- ctx->set_options(boost::asio::ssl::context::default_workarounds | +- boost::asio::ssl::context::no_sslv2 | +- boost::asio::ssl::context::no_sslv3 | +- boost::asio::ssl::context::single_dh_use); ++ ctx->set_options(websocketpp::lib::asio::ssl::context::default_workarounds | ++ websocketpp::lib::asio::ssl::context::no_sslv2 | ++ websocketpp::lib::asio::ssl::context::no_sslv3 | ++ websocketpp::lib::asio::ssl::context::single_dh_use); + ctx->set_password_callback(bind(&get_password)); + ctx->use_certificate_chain_file("server.pem"); +- ctx->use_private_key_file("server.pem", boost::asio::ssl::context::pem); ++ ctx->use_private_key_file("server.pem", websocketpp::lib::asio::ssl::context::pem); + } catch (std::exception& e) { + std::cout << e.what() << std::endl; + } +@@ -60,7 +60,7 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) { + int main() { + // set up an external io_context to run both endpoints on. This is not + // strictly necessary, but simplifies thread management a bit. +- boost::asio::io_context ios; ++ websocketpp::lib::asio::io_context ios; + + // set up plain endpoint + server_plain endpoint_plain; +diff --git a/examples/external_io_context/external_io_context.cpp b/examples/external_io_context/external_io_context.cpp +index c5ba0a4..c6132ed 100644 +--- a/examples/external_io_context/external_io_context.cpp ++++ b/examples/external_io_context/external_io_context.cpp +@@ -59,7 +59,7 @@ void on_message(ws_echo_server* s, websocketpp::connection_hdl hdl, ws_echo_serv + } + + int main() { +- asio::io_context context; ++ websocketpp::lib::asio::io_context context; + + // Add a TCP echo server on port 9003 + tcp_echo_server custom_http_server(context, 9003); +diff --git a/examples/external_io_context/tcp_echo_server.hpp b/examples/external_io_context/tcp_echo_server.hpp +index 2e14703..f132c06 100644 +--- a/examples/external_io_context/tcp_echo_server.hpp ++++ b/examples/external_io_context/tcp_echo_server.hpp +@@ -39,42 +39,40 @@ using websocketpp::lib::placeholders::_1; + using websocketpp::lib::placeholders::_2; + using websocketpp::lib::bind; + +-namespace asio = websocketpp::lib::asio; +- + struct tcp_echo_session : websocketpp::lib::enable_shared_from_this { + typedef websocketpp::lib::shared_ptr ptr; + +- tcp_echo_session(asio::io_context & context) : m_socket(context) {} ++ tcp_echo_session(websocketpp::lib::asio::io_context & context) : m_socket(context) {} + + void start() { +- m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)), ++ m_socket.async_read_some(websocketpp::lib::asio::buffer(m_buffer, sizeof(m_buffer)), + websocketpp::lib::bind( + &tcp_echo_session::handle_read, shared_from_this(), _1, _2)); + } + +- void handle_read(const asio::error_code & ec, size_t transferred) { ++ void handle_read(const websocketpp::lib::asio::error_code & ec, size_t transferred) { + if (!ec) { +- asio::async_write(m_socket, +- asio::buffer(m_buffer, transferred), ++ websocketpp::lib::asio::async_write(m_socket, ++ websocketpp::lib::asio::buffer(m_buffer, transferred), + bind(&tcp_echo_session::handle_write, shared_from_this(), _1)); + } + } + +- void handle_write(const asio::error_code & ec) { ++ void handle_write(const websocketpp::lib::asio::error_code & ec) { + if (!ec) { +- m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)), ++ m_socket.async_read_some(websocketpp::lib::asio::buffer(m_buffer, sizeof(m_buffer)), + bind(&tcp_echo_session::handle_read, shared_from_this(), _1, _2)); + } + } + +- asio::ip::tcp::socket m_socket; ++ websocketpp::lib::asio::ip::tcp::socket m_socket; + char m_buffer[1024]; + }; + + struct tcp_echo_server { +- tcp_echo_server(asio::io_context & context, short port) ++ tcp_echo_server(websocketpp::lib::asio::io_context & context, short port) + : m_context(context) +- , m_acceptor(context, asio::ip::tcp::endpoint(asio::ip::tcp::v6(), port)) ++ , m_acceptor(context, websocketpp::lib::asio::ip::tcp::endpoint(websocketpp::lib::asio::ip::tcp::v6(), port)) + { + this->start_accept(); + } +@@ -85,13 +83,13 @@ struct tcp_echo_server { + bind(&tcp_echo_server::handle_accept, this, new_session, _1)); + } + +- void handle_accept(tcp_echo_session::ptr new_session, const asio::error_code & ec) { ++ void handle_accept(tcp_echo_session::ptr new_session, const websocketpp::lib::asio::error_code & ec) { + if (!ec) { + new_session->start(); + } + start_accept(); + } + +- asio::io_context & m_context; +- asio::ip::tcp::acceptor m_acceptor; ++ websocketpp::lib::asio::io_context & m_context; ++ websocketpp::lib::asio::ip::tcp::acceptor m_acceptor; + }; +diff --git a/examples/print_client_tls/print_client_tls.cpp b/examples/print_client_tls/print_client_tls.cpp +index 43164ea..cf616e1 100644 +--- a/examples/print_client_tls/print_client_tls.cpp ++++ b/examples/print_client_tls/print_client_tls.cpp +@@ -112,7 +112,7 @@ bool verify_common_name(char const * hostname, X509 * cert) { + * and + * https://github.com/iSECPartners/ssl-conservatory + */ +-bool verify_certificate(const char * hostname, bool preverified, boost::asio::ssl::verify_context& ctx) { ++bool verify_certificate(const char * hostname, bool preverified, websocketpp::lib::asio::ssl::verify_context& ctx) { + // The verify callback can be used to check whether the certificate that is + // being presented is valid for the peer. For example, RFC 2818 describes + // the steps involved in doing this for HTTPS. Consult the OpenSSL +@@ -176,16 +176,16 @@ bool verify_certificate(const char * hostname, bool preverified, boost::asio::ss + * (websocketpp.org, for example). + */ + context_ptr on_tls_init(const char * hostname, websocketpp::connection_hdl) { +- context_ptr ctx = websocketpp::lib::make_shared(boost::asio::ssl::context::sslv23); ++ context_ptr ctx = websocketpp::lib::make_shared(websocketpp::lib::asio::ssl::context::sslv23); + + try { +- ctx->set_options(boost::asio::ssl::context::default_workarounds | +- boost::asio::ssl::context::no_sslv2 | +- boost::asio::ssl::context::no_sslv3 | +- boost::asio::ssl::context::single_dh_use); ++ ctx->set_options(websocketpp::lib::asio::ssl::context::default_workarounds | ++ websocketpp::lib::asio::ssl::context::no_sslv2 | ++ websocketpp::lib::asio::ssl::context::no_sslv3 | ++ websocketpp::lib::asio::ssl::context::single_dh_use); + + +- ctx->set_verify_mode(boost::asio::ssl::verify_peer); ++ ctx->set_verify_mode(websocketpp::lib::asio::ssl::verify_peer); + ctx->set_verify_callback(bind(&verify_certificate, hostname, ::_1, ::_2)); + + // Here we load the CA certificates of all CA's that this client trusts. +diff --git a/examples/testee_server/testee_server.cpp b/examples/testee_server/testee_server.cpp +index 13e574e..8920270 100644 +--- a/examples/testee_server/testee_server.cpp ++++ b/examples/testee_server/testee_server.cpp +@@ -87,8 +87,8 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) { + s->send(hdl, msg->get_payload(), msg->get_opcode()); + } + +-void on_socket_init(websocketpp::connection_hdl, boost::asio::ip::tcp::socket & s) { +- boost::asio::ip::tcp::no_delay option(true); ++void on_socket_init(websocketpp::connection_hdl, websocketpp::lib::asio::ip::tcp::socket & s) { ++ websocketpp::lib::asio::ip::tcp::no_delay option(true); + s.set_option(option); + } + +diff --git a/test/endpoint/endpoint.cpp b/test/endpoint/endpoint.cpp +index fa58e66..c5f5a82 100644 +--- a/test/endpoint/endpoint.cpp ++++ b/test/endpoint/endpoint.cpp +@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio ) { + + BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) { + websocketpp::server s; +- boost::asio::io_context ios; ++ websocketpp::lib::asio::io_context ios; + s.init_asio(&ios); + } + +@@ -141,8 +141,8 @@ BOOST_AUTO_TEST_CASE( listen_after_listen_failure ) { + server1.init_asio(); + server2.init_asio(); + +- boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::make_address("127.0.0.1"), 12345); +- boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::make_address("127.0.0.1"), 23456); ++ websocketpp::lib::asio::ip::tcp::endpoint ep1(websocketpp::lib::asio::ip::make_address("127.0.0.1"), 12345); ++ websocketpp::lib::asio::ip::tcp::endpoint ep2(websocketpp::lib::asio::ip::make_address("127.0.0.1"), 23456); + + server1.listen(ep1, ec); + BOOST_CHECK(!ec); +diff --git a/test/http/parser_perf.cpp b/test/http/parser_perf.cpp +index 0c76bc7..0a9cc0b 100644 +--- a/test/http/parser_perf.cpp ++++ b/test/http/parser_perf.cpp +@@ -31,11 +31,11 @@ + + class scoped_timer { + public: +- scoped_timer(std::string i) : m_id(i),m_start(std::chrono::steady_clock::now()) { ++ scoped_timer(std::string i) : m_id(i),m_start(timer_ptr::element_type::clock_type::now()) { + std::cout << "Clock " << i << ": "; + } + ~scoped_timer() { +- std::chrono::nanoseconds time_taken = std::chrono::steady_clock::now()-m_start; ++ std::chrono::nanoseconds time_taken = timer_ptr::element_type::clock_type::now()-m_start; + + //nanoseconds_per_test + +diff --git a/test/transport/asio/timers.cpp b/test/transport/asio/timers.cpp +index 391b755..d59654d 100644 +--- a/test/transport/asio/timers.cpp ++++ b/test/transport/asio/timers.cpp +@@ -106,9 +106,9 @@ struct config { + }; + + // Mock context that does no validation +-typedef websocketpp::lib::shared_ptr context_ptr; ++typedef websocketpp::lib::shared_ptr context_ptr; + context_ptr on_tls_init(websocketpp::connection_hdl) { +- return context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::sslv23)); ++ return context_ptr(new websocketpp::lib::asio::ssl::context(websocketpp::lib::asio::ssl::context::sslv23)); + } + + // Mock connection +diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp +index ab82b1a..526b243 100644 +--- a/test/transport/integration.cpp ++++ b/test/transport/integration.cpp +@@ -38,6 +38,8 @@ + #include + #include + ++#include "boost/date_time/posix_time/posix_time.hpp" ++ + struct config : public websocketpp::config::asio_client { + typedef config type; + typedef websocketpp::config::asio base; +@@ -218,19 +220,19 @@ void run_time_limited_client(client & c, std::string uri, long timeout, + } + + void run_dummy_server(int port) { +- using boost::asio::ip::tcp; ++ using websocketpp::lib::asio::ip::tcp; + + try { +- boost::asio::io_context io_context; ++ websocketpp::lib::asio::io_context io_context; + tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v6(), port)); + tcp::socket socket(io_context); + + acceptor.accept(socket); + for (;;) { + char data[512]; +- boost::system::error_code ec; +- socket.read_some(boost::asio::buffer(data), ec); +- if (ec == boost::asio::error::eof) { ++ websocketpp::lib::asio::error_code ec; ++ socket.read_some(websocketpp::lib::asio::buffer(data), ec); ++ if (ec == websocketpp::lib::asio::error::eof) { + break; + } else if (ec) { + // other error +@@ -239,26 +241,26 @@ void run_dummy_server(int port) { + } + } catch (std::exception & e) { + std::cout << e.what() << std::endl; +- } catch (boost::system::error_code & ec) { ++ } catch (websocketpp::lib::asio::error_code & ec) { + std::cout << ec.message() << std::endl; + } + } + + void run_dummy_client(std::string port) { +- using boost::asio::ip::tcp; ++ using websocketpp::lib::asio::ip::tcp; + + try { +- boost::asio::io_context io_context; ++ websocketpp::lib::asio::io_context io_context; + tcp::resolver resolver(io_context); + tcp::resolver::results_type endpoints = resolver.resolve("localhost", port); + tcp::socket socket(io_context); + +- boost::asio::connect(socket, endpoints); ++ websocketpp::lib::asio::connect(socket, endpoints); + for (;;) { + char data[512]; +- boost::system::error_code ec; +- socket.read_some(boost::asio::buffer(data), ec); +- if (ec == boost::asio::error::eof) { ++ websocketpp::lib::asio::error_code ec; ++ socket.read_some(websocketpp::lib::asio::buffer(data), ec); ++ if (ec == websocketpp::lib::asio::error::eof) { + break; + } else if (ec) { + // other error +@@ -267,7 +269,7 @@ void run_dummy_client(std::string port) { + } + } catch (std::exception & e) { + std::cout << e.what() << std::endl; +- } catch (boost::system::error_code & ec) { ++ } catch (websocketpp::lib::asio::error_code & ec) { + std::cout << ec.message() << std::endl; + } + } +@@ -360,7 +362,7 @@ public: + : m_timer(m_io_context, boost::posix_time::seconds(seconds)) + { + m_timer.async_wait(bind(&test_deadline_timer::expired, this, ::_1)); +- std::size_t (boost::asio::io_context::*run)() = &boost::asio::io_context::run; ++ std::size_t (websocketpp::lib::asio::io_context::*run)() = &websocketpp::lib::asio::io_context::run; + m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_context)); + } + ~test_deadline_timer() +@@ -370,16 +372,16 @@ public: + } + + private: +- void expired(const boost::system::error_code & ec) ++ void expired(const websocketpp::lib::asio::error_code & ec) + { +- if (ec == boost::asio::error::operation_aborted) ++ if (ec == websocketpp::lib::asio::error::operation_aborted) + return; + BOOST_CHECK(!ec); + BOOST_FAIL("Test timed out"); + } + +- boost::asio::io_context m_io_context; +- boost::asio::deadline_timer m_timer; ++ websocketpp::lib::asio::io_context m_io_context; ++ websocketpp::lib::asio::deadline_timer m_timer; + websocketpp::lib::thread m_timer_thread; + }; + +diff --git a/websocketpp/common/asio.hpp b/websocketpp/common/asio.hpp +index 3c8fa13..7322c25 100644 +--- a/websocketpp/common/asio.hpp ++++ b/websocketpp/common/asio.hpp +@@ -51,7 +51,7 @@ + + #include + #include +- #include ++ #include + #else + #include + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index eaee6bc..d1a2c20 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -374,7 +374,7 @@ public: + * fail handler is called. + * + * Primarily used if you are using mismatched asio / system_error +- * implementations such as `boost::asio` with `std::system_error`. In these ++ * implementations such as `lib::asio` with `std::system_error`. In these + * cases the transport error type is different than the library error type + * and some WebSocket++ functions that return transport errors via the + * library error code type will be coerced into a catch all `pass_through` +@@ -573,7 +573,7 @@ protected: + lib::error_code const & ec) + { + if (ec == transport::error::operation_aborted || +- (post_timer && lib::asio::is_neg(post_timer->expiry() - std::chrono::steady_clock::now()))) ++ (post_timer && lib::asio::is_neg(post_timer->expiry() - timer_ptr::element_type::clock_type::now()))) + { + m_alog->write(log::alevel::devel,"post_init cancelled"); + return; +@@ -679,7 +679,7 @@ protected: + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - timer_ptr::element_type::clock_type::now())) + { + m_elog->write(log::elevel::devel,"write operation aborted"); + return; +@@ -751,7 +751,7 @@ protected: + // Whatever aborted it will be issuing the callback so we are safe to + // return + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(m_proxy_data->timer->expiry() - std::chrono::steady_clock::now())) ++ lib::asio::is_neg(m_proxy_data->timer->expiry() - timer_ptr::element_type::clock_type::now())) + { + m_elog->write(log::elevel::devel,"read operation aborted"); + return; +@@ -1012,18 +1012,18 @@ protected: + */ + lib::error_code interrupt(interrupt_handler handler) { + if (config::enable_multithreading) { +- boost::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); ++ lib::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); + } else { +- boost::asio::post(m_io_context->get_executor(), handler); ++ lib::asio::post(m_io_context->get_executor(), handler); + } + return lib::error_code(); + } + + lib::error_code dispatch(dispatch_handler handler) { + if (config::enable_multithreading) { +- boost::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); ++ lib::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); + } else { +- boost::asio::post(m_io_context->get_executor(), handler); ++ lib::asio::post(m_io_context->get_executor(), handler); + } + return lib::error_code(); + } +@@ -1095,7 +1095,7 @@ protected: + callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(shutdown_timer->expiry() - std::chrono::steady_clock::now())) ++ lib::asio::is_neg(shutdown_timer->expiry() - timer_ptr::element_type::clock_type::now())) + { + m_alog->write(log::alevel::devel,"async_shutdown cancelled"); + return; +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 7af0915..57f784f 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -967,7 +967,7 @@ protected: + lib::asio::ip::tcp::resolver::results_type endpoints) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(dns_timer->expiry() - std::chrono::steady_clock::now())) ++ lib::asio::is_neg(dns_timer->expiry() - timer_ptr::element_type::clock_type::now())) + { + m_alog->write(log::alevel::devel,"async_resolve cancelled"); + return; +@@ -1075,7 +1075,7 @@ protected: + connect_handler callback, lib::asio::error_code const & ec) + { + if (ec == lib::asio::error::operation_aborted || +- lib::asio::is_neg(con_timer->expiry() - std::chrono::steady_clock::now())) ++ lib::asio::is_neg(con_timer->expiry() - timer_ptr::element_type::clock_type::now())) + { + m_alog->write(log::alevel::devel,"async_connect cancelled"); + return; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Fri, 14 Feb 2025 23:13:38 +0000 +Subject: [PATCH 5/7] improved variable names and fixed comments + +(cherry picked from commit dbdde20a9b4ffd49f480fd9e6e29ea212a73253b) + + Conflicts: + websocketpp/transport/asio/endpoint.hpp +--- + .../echo_server_both/echo_server_both.cpp | 8 +++--- + test/endpoint/endpoint.cpp | 4 +-- + test/transport/asio/timers.cpp | 4 +-- + test/transport/integration.cpp | 4 +-- + websocketpp/transport/asio/connection.hpp | 2 +- + websocketpp/transport/asio/endpoint.hpp | 27 +++++++++---------- + 6 files changed, 24 insertions(+), 25 deletions(-) + +diff --git a/examples/echo_server_both/echo_server_both.cpp b/examples/echo_server_both/echo_server_both.cpp +index a4f6a19..886ea7f 100644 +--- a/examples/echo_server_both/echo_server_both.cpp ++++ b/examples/echo_server_both/echo_server_both.cpp +@@ -60,12 +60,12 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) { + int main() { + // set up an external io_context to run both endpoints on. This is not + // strictly necessary, but simplifies thread management a bit. +- websocketpp::lib::asio::io_context ios; ++ websocketpp::lib::asio::io_context ctx; + + // set up plain endpoint + server_plain endpoint_plain; + // initialize asio with our external io_context rather than an internal one +- endpoint_plain.init_asio(&ios); ++ endpoint_plain.init_asio(&ctx); + endpoint_plain.set_message_handler( + bind(&on_message,&endpoint_plain,::_1,::_2)); + endpoint_plain.listen(80); +@@ -73,7 +73,7 @@ int main() { + + // set up tls endpoint + server_tls endpoint_tls; +- endpoint_tls.init_asio(&ios); ++ endpoint_tls.init_asio(&ctx); + endpoint_tls.set_message_handler( + bind(&on_message,&endpoint_tls,::_1,::_2)); + // TLS endpoint has an extra handler for the tls init +@@ -83,5 +83,5 @@ int main() { + endpoint_tls.start_accept(); + + // Start the ASIO io_context run loop running both endpoints +- ios.run(); ++ ctx.run(); + } +diff --git a/test/endpoint/endpoint.cpp b/test/endpoint/endpoint.cpp +index c5f5a82..1840278 100644 +--- a/test/endpoint/endpoint.cpp ++++ b/test/endpoint/endpoint.cpp +@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio ) { + + BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) { + websocketpp::server s; +- websocketpp::lib::asio::io_context ios; +- s.init_asio(&ios); ++ websocketpp::lib::asio::io_context ctx; ++ s.init_asio(&ctx); + } + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ +diff --git a/test/transport/asio/timers.cpp b/test/transport/asio/timers.cpp +index d59654d..84938cb 100644 +--- a/test/transport/asio/timers.cpp ++++ b/test/transport/asio/timers.cpp +@@ -79,8 +79,8 @@ void run_dummy_server(int port) { + + // Wait for the specified time period then fail the test + void run_test_timer(long value) { +- boost::asio::io_context ios; +- boost::asio::deadline_timer t(ios,boost::posix_time::milliseconds(value)); ++ boost::asio::io_context ctx; ++ boost::asio::deadline_timer t(ctx,boost::posix_time::milliseconds(value)); + boost::system::error_code ec; + t.wait(ec); + BOOST_FAIL( "Test timed out" ); +diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp +index 526b243..371c554 100644 +--- a/test/transport/integration.cpp ++++ b/test/transport/integration.cpp +@@ -252,10 +252,10 @@ void run_dummy_client(std::string port) { + try { + websocketpp::lib::asio::io_context io_context; + tcp::resolver resolver(io_context); +- tcp::resolver::results_type endpoints = resolver.resolve("localhost", port); ++ tcp::resolver::results_type results = resolver.resolve("localhost", port); + tcp::socket socket(io_context); + +- websocketpp::lib::asio::connect(socket, endpoints); ++ websocketpp::lib::asio::connect(socket, results); + for (;;) { + char data[512]; + websocketpp::lib::asio::error_code ec; +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index d1a2c20..f4c13f3 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -374,7 +374,7 @@ public: + * fail handler is called. + * + * Primarily used if you are using mismatched asio / system_error +- * implementations such as `lib::asio` with `std::system_error`. In these ++ * implementations such as `boost::asio` with `std::system_error`. In these + * cases the transport error type is different than the library error type + * and some WebSocket++ functions that return transport errors via the + * library error code type will be coerced into a catch all `pass_through` +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 57f784f..2aafd67 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -86,7 +86,7 @@ public: + /// Type of timer handle + typedef lib::shared_ptr timer_ptr; + /// Type of a shared pointer to an io_context work object +- typedef lib::shared_ptr> work_ptr; ++ typedef lib::shared_ptr> work_guard_ptr; + + /// Type of socket pre-bind handler + typedef lib::function tcp_pre_bind_handler; +@@ -108,7 +108,7 @@ public: + // Explicitly destroy local objects + m_acceptor.reset(); + m_resolver.reset(); +- m_work.reset(); ++ m_work_guard.reset(); + if (m_state != UNINITIALIZED && !m_external_io_context) { + delete m_io_context; + } +@@ -541,8 +541,7 @@ public: + /** + * Bind the internal acceptor using the given host and service. More details + * about what host and service can be are available in the Asio +- * documentation for ip::basic_resolver_query::basic_resolver_query's +- * constructors. ++ * documentation for the ip::basic_resolver::resolve function. + * + * The endpoint must have been initialized by calling init_asio before + * listening. +@@ -558,14 +557,14 @@ public: + { + using lib::asio::ip::tcp; + tcp::resolver r(*m_io_context); +- tcp::resolver::results_type endpoints = r.resolve(host, service); +- if (endpoints.empty()) { ++ tcp::resolver::results_type results = r.resolve(host, service); ++ if (results.empty()) { + m_elog->write(log::elevel::library, + "asio::listen could not resolve the supplied host or service"); + ec = make_error_code(error::invalid_host_service); + return; + } +- listen(*endpoints.begin(),ec); ++ listen(*(results.begin()),ec); + } + + /// Set up endpoint for listening on a host and service +@@ -685,7 +684,7 @@ public: + * @since 0.3.0 + */ + void start_perpetual() { +- m_work.reset(new lib::asio::executor_work_guard(m_io_context->get_executor())); ++ m_work_guard.reset(new lib::asio::executor_work_guard(m_io_context->get_executor())); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -697,7 +696,7 @@ public: + * @since 0.3.0 + */ + void stop_perpetual() { +- m_work.reset(); ++ m_work_guard.reset(); + } + + /// Call back a function after a period of time. +@@ -964,7 +963,7 @@ protected: + + void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer, + connect_handler callback, lib::asio::error_code const & ec, +- lib::asio::ip::tcp::resolver::results_type endpoints) ++ lib::asio::ip::tcp::resolver::results_type results) + { + if (ec == lib::asio::error::operation_aborted || + lib::asio::is_neg(dns_timer->expiry() - timer_ptr::element_type::clock_type::now())) +@@ -986,7 +985,7 @@ protected: + s << "Async DNS resolve successful. Results: "; + + lib::asio::ip::tcp::resolver::results_type::iterator it; +- for (it = endpoints.begin(); it != endpoints.end(); ++it) { ++ for (it = results.begin(); it != results.end(); ++it) { + s << (*it).endpoint() << " "; + } + +@@ -1012,7 +1011,7 @@ protected: + if (config::enable_multithreading) { + lib::asio::async_connect( + tcon->get_raw_socket(), +- endpoints, ++ results, + tcon->get_strand()->wrap(lib::bind( + &type::handle_connect, + this, +@@ -1025,7 +1024,7 @@ protected: + } else { + lib::asio::async_connect( + tcon->get_raw_socket(), +- endpoints, ++ results, + lib::bind( + &type::handle_connect, + this, +@@ -1160,7 +1159,7 @@ private: + bool m_external_io_context; + acceptor_ptr m_acceptor; + resolver_ptr m_resolver; +- work_ptr m_work; ++ work_guard_ptr m_work_guard; + + // Network constants + int m_listen_backlog; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Thu, 20 Feb 2025 06:19:46 +0000 +Subject: [PATCH 6/7] fixed use of deprecated boost::asio::deadline_timer in + tests + +(cherry picked from commit 096487461fe834c30fb322ac0b9088ad82e5a2d5) +--- + test/transport/asio/timers.cpp | 3 ++- + test/transport/integration.cpp | 27 ++++++++++++++------------- + 2 files changed, 16 insertions(+), 14 deletions(-) + +diff --git a/test/transport/asio/timers.cpp b/test/transport/asio/timers.cpp +index 84938cb..22a4bba 100644 +--- a/test/transport/asio/timers.cpp ++++ b/test/transport/asio/timers.cpp +@@ -80,7 +80,8 @@ void run_dummy_server(int port) { + // Wait for the specified time period then fail the test + void run_test_timer(long value) { + boost::asio::io_context ctx; +- boost::asio::deadline_timer t(ctx,boost::posix_time::milliseconds(value)); ++ boost::asio::system_timer t(ctx); ++ t.expires_after(std::chrono::milliseconds(value)); + boost::system::error_code ec; + t.wait(ec); + BOOST_FAIL( "Test timed out" ); +diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp +index 371c554..70f4442 100644 +--- a/test/transport/integration.cpp ++++ b/test/transport/integration.cpp +@@ -355,17 +355,18 @@ void close(T * e, websocketpp::connection_hdl hdl) { + e->get_con_from_hdl(hdl)->close(websocketpp::close::status::normal,""); + } + +-class test_deadline_timer ++class test_system_timer + { + public: +- test_deadline_timer(int seconds) +- : m_timer(m_io_context, boost::posix_time::seconds(seconds)) ++ test_system_timer(int seconds) ++ : m_timer(m_io_context) + { +- m_timer.async_wait(bind(&test_deadline_timer::expired, this, ::_1)); ++ m_timer.expires_after(std::chrono::seconds(seconds)); ++ m_timer.async_wait(bind(&test_system_timer::expired, this, ::_1)); + std::size_t (websocketpp::lib::asio::io_context::*run)() = &websocketpp::lib::asio::io_context::run; + m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_context)); + } +- ~test_deadline_timer() ++ ~test_system_timer() + { + m_timer.cancel(); + m_timer_thread.join(); +@@ -381,7 +382,7 @@ public: + } + + websocketpp::lib::asio::io_context m_io_context; +- websocketpp::lib::asio::deadline_timer m_timer; ++ websocketpp::lib::asio::system_timer m_timer; + websocketpp::lib::thread m_timer_thread; + }; + +@@ -427,7 +428,7 @@ BOOST_AUTO_TEST_CASE( pong_timeout ) { + websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false)); + sleep(1); // give the server thread some time to start + +- test_deadline_timer deadline(10); ++ test_system_timer deadline(10); + + run_client(c, "http://localhost:9005",false); + +@@ -448,7 +449,7 @@ BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) { + + sleep(1); // give the server thread some time to start + +- test_deadline_timer deadline(10); ++ test_system_timer deadline(10); + + run_client(c, "http://localhost:9005"); + } +@@ -464,7 +465,7 @@ BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) { + + websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false)); + +- test_deadline_timer deadline(10); ++ test_system_timer deadline(10); + + sleep(1); // give the server thread some time to start + +@@ -489,7 +490,7 @@ BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) { + + websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false)); + +- test_deadline_timer deadline(10); ++ test_system_timer deadline(10); + + sleep(1); // give the server thread some time to start + +@@ -522,7 +523,7 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) { + c.set_open_handler(bind(&delay,::_1,1)); + + websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false)); +- test_deadline_timer deadline(10); ++ test_system_timer deadline(10); + + sleep(1); // give the server thread some time to start + +@@ -534,7 +535,7 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) { + BOOST_AUTO_TEST_CASE( client_runs_out_of_work ) { + client c; + +- test_deadline_timer deadline(3); ++ test_system_timer deadline(3); + + websocketpp::lib::error_code ec; + c.init_asio(ec); +@@ -600,7 +601,7 @@ BOOST_AUTO_TEST_CASE( stop_listening ) { + c.set_open_handler(bind(&close,&c,::_1)); + + websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false)); +- test_deadline_timer deadline(5); ++ test_system_timer deadline(5); + + sleep(1); // give the server thread some time to start + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amini Allight +Date: Thu, 20 Feb 2025 17:25:03 +0000 +Subject: [PATCH 7/7] replaced uses of boost::asio::io_context::strand::wrap + with boost::asio::bind_executor to avoid future deprecation issues + +(cherry picked from commit a11fa6fe4937ca251753e90b1836a68bf57768a9) +--- + websocketpp/transport/asio/connection.hpp | 16 ++++++++-------- + websocketpp/transport/asio/endpoint.hpp | 6 +++--- + websocketpp/transport/asio/security/tls.hpp | 4 ++-- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index f4c13f3..4baa2ea 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -318,7 +318,7 @@ public: + ); + + if (config::enable_multithreading) { +- new_timer->async_wait(m_strand->wrap(lib::bind( ++ new_timer->async_wait(lib::asio::bind_executor(*m_strand, lib::bind( + &type::handle_timer, get_shared(), + new_timer, + callback, +@@ -629,7 +629,7 @@ protected: + lib::asio::async_write( + socket_con_type::get_next_layer(), + m_bufs, +- m_strand->wrap(lib::bind( ++ lib::asio::bind_executor(*m_strand, lib::bind( + &type::handle_proxy_write, get_shared(), + callback, + lib::placeholders::_1 +@@ -713,7 +713,7 @@ protected: + socket_con_type::get_next_layer(), + m_proxy_data->read_buf, + "\r\n\r\n", +- m_strand->wrap(lib::bind( ++ lib::asio::bind_executor(*m_strand, lib::bind( + &type::handle_proxy_read, get_shared(), + callback, + lib::placeholders::_1, lib::placeholders::_2 +@@ -841,7 +841,7 @@ protected: + socket_con_type::get_socket(), + lib::asio::buffer(buf,len), + lib::asio::transfer_at_least(num_bytes), +- m_strand->wrap(make_custom_alloc_handler( ++ lib::asio::bind_executor(*m_strand, make_custom_alloc_handler( + m_read_handler_allocator, + lib::bind( + &type::handle_async_read, get_shared(), +@@ -910,7 +910,7 @@ protected: + lib::asio::async_write( + socket_con_type::get_socket(), + m_bufs, +- m_strand->wrap(make_custom_alloc_handler( ++ lib::asio::bind_executor(*m_strand, make_custom_alloc_handler( + m_write_handler_allocator, + lib::bind( + &type::handle_async_write, get_shared(), +@@ -947,7 +947,7 @@ protected: + lib::asio::async_write( + socket_con_type::get_socket(), + m_bufs, +- m_strand->wrap(make_custom_alloc_handler( ++ lib::asio::bind_executor(*m_strand, make_custom_alloc_handler( + m_write_handler_allocator, + lib::bind( + &type::handle_async_write, get_shared(), +@@ -1012,7 +1012,7 @@ protected: + */ + lib::error_code interrupt(interrupt_handler handler) { + if (config::enable_multithreading) { +- lib::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); ++ lib::asio::post(m_io_context->get_executor(), lib::asio::bind_executor(*m_strand, handler)); + } else { + lib::asio::post(m_io_context->get_executor(), handler); + } +@@ -1021,7 +1021,7 @@ protected: + + lib::error_code dispatch(dispatch_handler handler) { + if (config::enable_multithreading) { +- lib::asio::post(m_io_context->get_executor(), m_strand->wrap(handler)); ++ lib::asio::post(m_io_context->get_executor(), lib::asio::bind_executor(*m_strand, handler)); + } else { + lib::asio::post(m_io_context->get_executor(), handler); + } +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 2aafd67..b9e1ae8 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -776,7 +776,7 @@ public: + if (config::enable_multithreading) { + m_acceptor->async_accept( + tcon->get_raw_socket(), +- tcon->get_strand()->wrap(lib::bind( ++ lib::asio::bind_executor(*tcon->get_strand(), lib::bind( + &type::handle_accept, + this, + callback, +@@ -902,7 +902,7 @@ protected: + m_resolver->async_resolve( + host, + port, +- tcon->get_strand()->wrap(lib::bind( ++ lib::asio::bind_executor(*tcon->get_strand(), lib::bind( + &type::handle_resolve, + this, + tcon, +@@ -1012,7 +1012,7 @@ protected: + lib::asio::async_connect( + tcon->get_raw_socket(), + results, +- tcon->get_strand()->wrap(lib::bind( ++ lib::asio::bind_executor(*tcon->get_strand(), lib::bind( + &type::handle_connect, + this, + tcon, +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index 8b27656..07651c0 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -266,7 +266,7 @@ protected: + if (m_strand) { + m_socket->async_handshake( + get_handshake_type(), +- m_strand->wrap(lib::bind( ++ lib::asio::bind_executor(*m_strand, lib::bind( + &type::handle_init, get_shared(), + callback, + lib::placeholders::_1 +@@ -326,7 +326,7 @@ protected: + + void async_shutdown(socket::shutdown_handler callback) { + if (m_strand) { +- m_socket->async_shutdown(m_strand->wrap(callback)); ++ m_socket->async_shutdown(lib::asio::bind_executor(*m_strand, callback)); + } else { + m_socket->async_shutdown(callback); + } +-- +2.48.1 + diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 828df591d7d9..4201668ee1bb 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.1.5.17-31953"; + version = "4.1.5.26-32281"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-eItxPcvlzxwqXG7IxN001aoR+9SqyVOA7y71Sh83jYI="; + hash = "sha256-hiq6L51w0ToQrmB0Lq3HrcMdwrPpVIy+ePMP899JRfg="; }; }; in diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 804099463616..365ef0679e13 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.54.0"; + version = "2.55.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ZFrfEXR3sHkcTQRZq+7vsGeIrUqSjhvBJ1pWv81rS4="; + hash = "sha256-bfz9mjvvqT6jA9CGLNGox8IaE0QzVGWRc5I/vaB6e5M="; }; proxyVendor = true; - vendorHash = "sha256-YrfOhRFB4qMuuLivwxpQ31B1zzkE6AvWzvNCqS8/yHw="; + vendorHash = "sha256-V7mNRUrKQ2BdjbhCe+aAF5LAeRaAiaRyGaEZs+MaS+k="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix index 5b7b214afecf..1769cf995062 100644 --- a/pkgs/by-name/we/weylus/package.nix +++ b/pkgs/by-name/we/weylus/package.nix @@ -102,6 +102,6 @@ rustPlatform.buildRustPackage { mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/wg/wg-ddns/package.nix b/pkgs/by-name/wg/wg-ddns/package.nix new file mode 100644 index 000000000000..c50d905f06a9 --- /dev/null +++ b/pkgs/by-name/wg/wg-ddns/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "wg-ddns"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "fernvenue"; + repo = "wg-ddns"; + tag = "v${version}"; + hash = "sha256-BV57jidn6bPWU/IhhQvIeMF4xHtTm2WZKm4MQRSMM5Y="; + }; + + vendorHash = "sha256-VfSLrWuvJF4XwAW2BQGxh+3v9RiWmPdysw/nIdt2A9M="; + + meta = { + description = "Lightweight tool that provides DDNS dynamic DNS support for WireGuard"; + homepage = "https://github.com/fernvenue/wg-ddns"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.bdim404 ]; + platforms = lib.platforms.unix; + mainProgram = "wg-ddns"; + }; +} diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-manifest.json b/pkgs/by-name/wi/widevine-cdm/x86_64-manifest.json index 07fa91d5592b..c54afe5fb095 100644 --- a/pkgs/by-name/wi/widevine-cdm/x86_64-manifest.json +++ b/pkgs/by-name/wi/widevine-cdm/x86_64-manifest.json @@ -1,6 +1,6 @@ { "platform_key": "Linux_x86_64-gcc3", - "url": "https://edgedl.me.gvt1.com/edgedl/release2/chrome_component/aclxnidwwkj5di3vduduj2gqpgpq_4.10.2891.0/oimompecagnajdejgnnjijobebaeigek_4.10.2891.0_linux_b4hin3q5s66ws2322cyyfp35lu.crx3", - "sri": "sha512-8S/4FRQQmQAO9wJ7QGJg8KUVxUQgm5/oEl6l9N2/WGAdMCIqxBoBPrCkPadrpwQUpK0WYX2fIZ8Zzfx3lNm8lA==", - "version": "4.10.2891.0" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/chrome_component/accssjtqfpf5qicscrptql4jyyxa_4.10.2934.0/oimompecagnajdejgnnjijobebaeigek_4.10.2934.0_linux_ph722a3wl2goebkpserszm6bde.crx3", + "sri": "sha512-QhIUIQoJqfntjOSC74V/HCspzhc5JA0eyZphyqPYDbM5N1InVyK99fUDSJ8Sp1MhX+igyC3jrKI3gNT/5XkusQ==", + "version": "4.10.2934.0" } diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix index 29f3949cab31..e4a44ab48a86 100644 --- a/pkgs/by-name/wi/wiki-tui/package.nix +++ b/pkgs/by-name/wi/wiki-tui/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Builditluc"; repo = "wiki-tui"; tag = "v${version}"; - hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; + hash = "sha256-hUAe2mzz/4xdpyPE2rbTq5WKk0bNa4dSFocFiCXyO4Q="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { openssl ]; - cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; + cargoHash = "sha256-0M3vHj/dzHcI2FJLramTsFMw4m/WGp9vX9Tq52dSW1o="; meta = { description = "Simple and easy to use Wikipedia Text User Interface"; @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - lom builditluc matthiasbeyer ]; diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix index 193ecc8aec8b..c2d6343c7710 100644 --- a/pkgs/by-name/wi/wiliwili/package.nix +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wiliwili"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "xfangfang"; repo = "wiliwili"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lcHKbEYlOznu9WhWX7ZoOCnxr6h/AJCLbjLmc2ZZTbg="; + hash = "sha256-NPJ1PLO6eqm4rBn4t965S0lqzT+npfYLWN6FKYCpnlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix index e0d848dd9900..5454f29d1930 100644 --- a/pkgs/by-name/wi/windmill/package.nix +++ b/pkgs/by-name/wi/windmill/package.nix @@ -47,13 +47,13 @@ let pname = "windmill"; - version = "1.587.0"; + version = "1.589.3"; src = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-RR+1khmrxDBuFV7IxFi5AeVPLGN89W/6W9tPJjplKqo="; + hash = "sha256-AZcD6eUXzxM8wxVZuLsYci34obuS7NI5vNMrSrheoA0="; }; in rustPlatform.buildRustPackage (finalAttrs: { @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTY_V8_ARCHIVE = librusty_v8; }; - cargoHash = "sha256-V4zcNmyIC+1VGQPHy1edUazD+b6+3RP3+nqaVMbkCDo="; + cargoHash = "sha256-kJOBTrq6o/BELNY4YMOChxiMLSvdvICqJiaitImOZMk="; buildFeatures = [ "agent_worker_server" @@ -195,7 +195,7 @@ rustPlatform.buildRustPackage (finalAttrs: { sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-S34ByE5kLeXWSe6Lqdns8pdT3bV9o3veG0aqYISAYZE="; + npmDepsHash = "sha256-LsH4X/FK5RlqR3etFS9BmeQ0bVlPNGztU67VsutusZs="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 3164831c7349..58c13b7a6617 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.36", + "version": "1.12.39", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-darwin-arm64-1.12.36.zip", - "sha256": "d34eea39a1b6d0f1f60c11062d7951c01b58740e3ba52b6af51516690e1674e0" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-darwin-arm64-1.12.39.zip", + "sha256": "1f1af7d5dcaf1314f86a8082dcc28406bca86b92a29048ef296107cdea72a74e" }, "x86_64-darwin": { - "version": "1.12.36", + "version": "1.12.39", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-darwin-x64-1.12.36.zip", - "sha256": "9b39e8e93cbe434549c54daa44ddd17d08f4899ca41bee64b1a709b264d28232" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-darwin-x64-1.12.39.zip", + "sha256": "f422f2148be8e1d824abcd5ed18c86838d5edbb7f91244dcc51e142e9b5ac743" }, "x86_64-linux": { - "version": "1.12.36", + "version": "1.12.39", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-linux-x64-1.12.36.tar.gz", - "sha256": "144fe8beff7de9e7764b4ef76e2a3a4e1638cd966d7ace70c06bdc268751ab67" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-linux-x64-1.12.39.tar.gz", + "sha256": "ce36ec8697ca7c9768678b99b9b8b364d33a044afed242931fea14f544581c68" } } diff --git a/pkgs/by-name/wi/wiredtiger/package.nix b/pkgs/by-name/wi/wiredtiger/package.nix index 0d5b4e3203ee..af3623f00816 100644 --- a/pkgs/by-name/wi/wiredtiger/package.nix +++ b/pkgs/by-name/wi/wiredtiger/package.nix @@ -2,83 +2,60 @@ lib, stdenv, fetchFromGitHub, - automake, - autoconf, - libtool, - - # Optional Dependencies - lz4 ? null, - snappy ? null, - zlib ? null, - bzip2 ? null, - db ? null, - gperftools ? null, - leveldb ? null, + cmake, + python3, + swig, + libsodium, + lz4, + snappy, + zlib, + zstd, + nix-update-script, }: -let - shouldUsePkg = - pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; - - optLz4 = shouldUsePkg lz4; - optSnappy = shouldUsePkg snappy; - optZlib = shouldUsePkg zlib; - optBzip2 = shouldUsePkg bzip2; - optDb = shouldUsePkg db; - optGperftools = shouldUsePkg gperftools; - optLeveldb = shouldUsePkg leveldb; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wiredtiger"; - version = "3.2.1"; + version = "11.3.1"; src = fetchFromGitHub { repo = "wiredtiger"; owner = "wiredtiger"; - rev = version; - sha256 = "04j2zw8b9jym43r682rh4kpdippxx7iw3ry16nxlbybzar9kgk83"; + tag = finalAttrs.version; + hash = "sha256-K5cZZTvZaWR6gVXF+mHNh7nHxMqi9XaEpB2qsd/pay8="; }; nativeBuildInputs = [ - automake - autoconf - libtool + cmake + python3 + swig ]; + buildInputs = [ - optLz4 - optSnappy - optZlib - optBzip2 - optDb - optGperftools - optLeveldb + libsodium + lz4 + snappy + zlib + zstd ]; - configureFlags = [ - (lib.withFeature false "attach") - (lib.withFeatureAs true "builtins" "") - (lib.enableFeature (optBzip2 != null) "bzip2") - (lib.enableFeature false "diagnostic") - (lib.enableFeature false "java") - (lib.enableFeature (optLeveldb != null) "leveldb") - (lib.enableFeature false "python") - (lib.enableFeature (optSnappy != null) "snappy") - (lib.enableFeature (optLz4 != null) "lz4") - (lib.enableFeature (optGperftools != null) "tcmalloc") - (lib.enableFeature (optZlib != null) "zlib") - (lib.withFeatureAs (optDb != null) "berkeleydb" optDb) - (lib.withFeature false "helium") + cmakeFlags = [ + (lib.cmakeBool "ENABLE_STRICT" false) + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; - preConfigure = '' - ./autogen.sh - ''; + env.NIX_CFLAGS_COMPILE = [ "-Wno-array-bounds" ]; - meta = with lib; { - homepage = "http://wiredtiger.com/"; - description = ""; + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://source.wiredtiger.com"; + description = "High performance, scalable, NoSQL, extensible platform for data management"; mainProgram = "wt"; - license = licenses.gpl2; - platforms = intersectLists platforms.unix platforms.x86_64; + license = with lib.licenses; [ + gpl2Only + gpl3Only + ]; + platforms = lib.intersectLists lib.platforms.unix lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix index a2e7631d2019..6364c202dec6 100644 --- a/pkgs/by-name/wi/wireguard-tools/package.nix +++ b/pkgs/by-name/wi/wireguard-tools/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ zx2c4 - globin ma27 ]; mainProgram = "wg"; diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix index bc9e6ec00e6f..c455e5b8a6e0 100644 --- a/pkgs/by-name/wo/woff2/package.nix +++ b/pkgs/by-name/wo/woff2/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { description = "Webfont compression reference code"; homepage = "https://github.com/google/woff2"; license = licenses.mit; - maintainers = [ maintainers.hrdinka ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix index ab688f5000d5..975af0833d29 100644 --- a/pkgs/by-name/wo/worker-build/package.nix +++ b/pkgs/by-name/wo/worker-build/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.6.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; tag = "v${version}"; - hash = "sha256-c0PXLuWEY+keYRAjQkgd84Hn7IDh17SePKDF9J4ZQ5M="; + hash = "sha256-iTeezUV2ooGDyIrUmHlvXVkIdFeTmmgykoSv9VdK1wQ="; fetchSubmodules = true; }; - cargoHash = "sha256-axK9/EVNKBb4xoYMOJ+0Y5nQvtkYyFDE6RsiL2MqxTM="; + cargoHash = "sha256-1PWOg4Y56GH01OtEgjnxJEYkPrr0PMCOayuVdR/Uvwg="; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 4a3dcdd31213..2ae20457c58d 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.51.0"; + version = "4.53.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-NYYw4/Yx4wVn7snXQsGxtppLNvqzAjg6fqQIFeKc9L4="; + hash = "sha256-YVIjmqPPgzf++eSwniR82QMun5/c1O+EerFqamZSyNY="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; fetcherVersion = 2; - hash = "sha256-utRo6lI8YgVJItqa/433HWNTp2AAHgiA3xWdJn2IELg="; + hash = "sha256-ChOQXP9eW82f6Sxna3mZ5YJMlalPZGaBvsA1C6a5kds="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' diff --git a/pkgs/by-name/wr/wrangler_1/package.nix b/pkgs/by-name/wr/wrangler_1/package.nix index af2f11ec94d2..dc27c236ef19 100644 --- a/pkgs/by-name/wr/wrangler_1/package.nix +++ b/pkgs/by-name/wr/wrangler_1/package.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { asl20 # or mit ]; - maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix index 2e626d246c86..5fd3feaf9e40 100644 --- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix +++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix @@ -2,29 +2,20 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch, }: python3Packages.buildPythonApplication rec { pname = "wyoming-openwakeword"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-openwakeword"; rev = "refs/tags/v${version}"; - hash = "sha256-edSZ5W6oSPYLKuxjQerWRkAO/C+WeTiCosNnbS2sbh0="; + hash = "sha256-yYDZ1wOhCTdYGeRmtbOgx5/zkF0Baxmha7eO/i0p49g="; }; - patches = [ - (fetchpatch { - # Expose entrypoint as wyoming-openwakeword script - url = "https://github.com/rhasspy/wyoming-openwakeword/commit/a8c8419bc65fab07a554aa0925f898a7f3b65d79.patch"; - hash = "sha256-GSViQA01RwkFYEH7CPdU1P0EQ2ml6Vp1OukQ/0VOm+Y="; - }) - ]; - build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix index 0bad3b4ec635..f69318c03b1a 100644 --- a/pkgs/by-name/wy/wyoming-piper/package.nix +++ b/pkgs/by-name/wy/wyoming-piper/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "2.0.0"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; - rev = "a9bedf7947b6813807caa9eba22c745cad68e5c1"; - hash = "sha256-Ld+UZguvtVig+g4hepLnC0PEYU/yST4cpI5bLfeTVkw="; + tag = "v${version}"; + hash = "sha256-j6QvGChAkASKdD+4XqIwC6UWdhi5oMDfYmSk6kvRrNE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix index a0756b46a437..5a6f8536cff5 100644 --- a/pkgs/by-name/x1/x11basic/package.nix +++ b/pkgs/by-name/x1/x11basic/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://x11-basic.codeberg.page"; description = "Basic interpreter and compiler with graphics capabilities"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ edwtjo ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xa/xalanc/package.nix b/pkgs/by-name/xa/xalanc/package.nix index 5a98de1b8b3d..67b46d91cbc2 100644 --- a/pkgs/by-name/xa/xalanc/package.nix +++ b/pkgs/by-name/xa/xalanc/package.nix @@ -44,6 +44,5 @@ stdenv.mkDerivation { mainProgram = "Xalan"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix index 052e1338eb6d..cf79497e1e4d 100644 --- a/pkgs/by-name/xb/xbps/package.nix +++ b/pkgs/by-name/xb/xbps/package.nix @@ -9,15 +9,15 @@ libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xbps"; - version = "0.59.2"; + version = "0.60.6"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; - rev = version; - hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14="; + tag = finalAttrs.version; + hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70="; }; nativeBuildInputs = [ @@ -37,33 +37,19 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; + # Don't try to install keys to /var/db/xbps, put in $out/share for now postPatch = '' - # _BSD_SOURCE causes cpp warning - # https://github.com/void-linux/xbps/issues/576 - substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \ - --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \ - --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE' - - # fix calloc argument cause a build failure - substituteInPlace bin/xbps-fbulk/main.c \ - --replace-fail 'calloc(sizeof(*depn), 1)' 'calloc(1UL, sizeof(*depn))' - - # fix unprefixed ranlib (needed on cross) - substituteInPlace lib/Makefile \ - --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' - - # Don't try to install keys to /var/db/xbps, put in $out/share for now substituteInPlace data/Makefile \ - --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)' + --replace-fail '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)' ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/void-linux/xbps"; description = "X Binary Package System"; - platforms = platforms.linux; # known to not work on Darwin, at least - license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + platforms = lib.platforms.linux; # known to not work on Darwin, at least + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dtzWill ]; }; -} +}) diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix index 1d36762b9958..bc0f688a512b 100644 --- a/pkgs/by-name/xc/xcaddy/package.nix +++ b/pkgs/by-name/xc/xcaddy/package.nix @@ -35,8 +35,5 @@ buildGoModule rec { description = "Build Caddy with plugins"; mainProgram = "xcaddy"; license = licenses.asl20; - maintainers = with maintainers; [ - tjni - ]; }; } diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index fe4f5d39bd16..b519f2407933 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/tarka/xcp"; changelog = "https://github.com/tarka/xcp/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ lom ]; + maintainers = [ ]; mainProgram = "xcp"; }; }) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index c0447ca2492b..fe2c17b8d469 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -3,6 +3,7 @@ stdenv, rustPlatform, fetchFromGitHub, + glib, libcosmicAppHook, pkg-config, util-linux, @@ -16,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-0PsiB/xvePSi5o1eRUgCq02UAGzuBQEe8+LlFJi5814="; separateDebugInfo = true; + strictDeps = true; nativeBuildInputs = [ libcosmicAppHook @@ -38,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ + glib libgbm pipewire ]; diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 0e66f0effb6f..5f19ef31babc 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.8.116"; + version = "0.8.118"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; tag = "v${finalAttrs.version}"; - hash = "sha256-hmDAT2LCB+kyhYhLvGkpZnEGiXxD8RsPqt29ZFfS6q4="; + hash = "sha256-etr9YTqD3faVpjDUtmOtYDGh1ZGsl/sWVLs33nOwNKQ="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index 41db2c1fdde7..dc9aac02798a 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-11-29"; + version = "0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "ce5100cbf384d441f7ccfd0269938616a345722f"; - hash = "sha256-v2RFsOFbsM14lGo//7Qf25neRfM9mSbC8cJZP1xCsms="; + rev = "0af253e230d189c79714744df1267ab18233dc96"; + hash = "sha256-k8nPqoNM+HA0LN9KjAbZL+jM/7AL9iPYNN6z9A+tuoU="; }; dontConfigure = true; diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 61698c6b9176..8a2ce99b307e 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -12,6 +12,7 @@ inih, liburcu, nixosTests, + python3, }: stdenv.mkDerivation rec { @@ -23,6 +24,11 @@ stdenv.mkDerivation rec { hash = "sha256-Ww9WqB9kEyYmb3Yq6KVjsp2Vzbzag7x5OPaM4SLx7dk="; }; + postPatch = '' + substituteInPlace {./scrub/xfs_scrub_all.py.in,./mkfs/xfs_protofile.py.in}\ + --replace-fail '#!/usr/bin/python3' '#!/usr/bin/env python3' + ''; + outputs = [ "bin" "dev" @@ -43,6 +49,7 @@ stdenv.mkDerivation rec { icu inih liburcu + (python3.withPackages (ps: [ ps.dbus-python ])) ]; propagatedBuildInputs = [ libuuid ]; # Dev headers include diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index a7aa644e5ade..1256c446b68a 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-t+zindC9mCYE5H/rqJ0AGB7alymYRNubDLQvkc5vZmo="; + hash = "sha256-uCjUzVDlqstHDvGEsXCkWgsUthrBM6MlK78IAEpogqU="; }; vendorHash = null; diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix index 85798f902184..fb9b5fd2a619 100644 --- a/pkgs/by-name/xk/xkblayout-state/package.nix +++ b/pkgs/by-name/xk/xkblayout-state/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { description = "Small command-line program to get/set the current XKB keyboard layout"; homepage = "https://github.com/nonpop/xkblayout-state"; license = licenses.gpl2; - maintainers = [ maintainers.jagajaga ]; platforms = platforms.linux; mainProgram = "xkblayout-state"; }; diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix index 6a446e80abb8..df2c5382637e 100644 --- a/pkgs/by-name/xm/xml-security-c/package.nix +++ b/pkgs/by-name/xm/xml-security-c/package.nix @@ -41,6 +41,5 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ Implementation of W3C security standards for XML"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.jagajaga ]; }; }) diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix index 2e004a88dac2..895c6f39b58c 100644 --- a/pkgs/by-name/xn/xnviewmp/package.nix +++ b/pkgs/by-name/xn/xnviewmp/package.nix @@ -25,11 +25,11 @@ let in appimageTools.wrapType2 rec { pname = "xnviewmp"; - version = "1.9.5"; + version = "1.9.7"; src = fetchurl { url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage"; - hash = "sha256-flLFyl4c0+kaQyXXzCpK/uSQ4tvRBUEYSgC4wqf4QMw="; + hash = "sha256-PUV46AmzFBtBh361dS84rtZM5N7mKBG9aLkoyvz16R0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/by-name/xo/xournalpp/package.nix similarity index 88% rename from pkgs/applications/graphics/xournalpp/default.nix rename to pkgs/by-name/xo/xournalpp/package.nix index a64f5fee2efa..11f21e9c1004 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/by-name/xo/xournalpp/package.nix @@ -25,18 +25,19 @@ zlib, # plugins withLua ? true, - lua, + lua5_3, + nix-update-script, }: stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.8"; + version = "1.2.10"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - hash = "sha256-yQN90R2gxUunUimZqT2kncnCNtDaLD36ctf1bU2vmIw="; + hash = "sha256-3M7ycbwKSmu8WUqC3anAi6GLPOex7gEndw/tDv0Ri7Q="; }; postPatch = '' @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { portaudio zlib ] - ++ lib.optional withLua lua; + ++ lib.optional withLua lua5_3; buildFlags = [ "translations" ]; @@ -79,6 +80,8 @@ stdenv.mkDerivation rec { ) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 7fd88e6e7b5f..a3bb7d0c3d0c 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-7IdNFE9kWiwEB5hJhWeH7NElMGn7N68oYep7reXTJxw="; + x86_64-linux = "sha256-osr7GeDZ3uIJq9k1aP8JKiyKeslYpZ8yOHSeaew47yQ="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "19.4"; + version = "19.5"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/xp/xplanet/package.nix b/pkgs/by-name/xp/xplanet/package.nix index e5a29cb81241..18a1b5bc9e2d 100644 --- a/pkgs/by-name/xp/xplanet/package.nix +++ b/pkgs/by-name/xp/xplanet/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ lassulus - sander ]; platforms = platforms.all; }; diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 3b1a01107264..0414b1f95bbf 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sayanarijit"; repo = "xplr"; rev = "v${version}"; - hash = "sha256-78MHWdvWxXGcptMW3AUTYrpfdAai59x1KnW4uMaUZC8="; + hash = "sha256-qldRH0OSfGBfz84i7CnkzOns+occHoeft8PWgdBOvBA="; }; - cargoHash = "sha256-qC9KutkGLUuG7xQeO/Vg3oRqh8hCQuHisJA5diYizAg="; + cargoHash = "sha256-EHQhilkyR0XWBqcj5GZz4qI3DdaAfzFXa3Ew4kaAchA="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix index 617cf66676d6..5b8c44d77599 100644 --- a/pkgs/by-name/xr/xray/package.nix +++ b/pkgs/by-name/xr/xray/package.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "xray"; - version = "25.10.15"; + version = "25.12.2"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-E3Ozd2pFLuoV1xc3rPIoh6+ErAN9MYquxwzVTvETMlA="; + hash = "sha256-QP6sPeh5j8FJ8sBxYLWB/y66BwAjRk+wJiivGC2xEls="; }; - vendorHash = "sha256-Dzml+y6KSCcRqgWk8rP3gGFE1UsGNhNpu2I5NkCBztw="; + vendorHash = "sha256-LzCjzEOREqR108v7zR5jWuDwcrb1K58rpv9RyQUxgic="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index fc71837b0a01..6e564f79f302 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -20,7 +20,7 @@ libspectre, libgxps, webkitgtk_4_1, - nodePackages, + mathjax, ninja, djvulibre, backends ? [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dmathjax-directory=${nodePackages.mathjax}" + "-Dmathjax-directory=${mathjax}" "-Dintrospection=true" ] ++ (map (x: "-D${x}=true") backends); @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { libspectre libgxps webkitgtk_4_1 - nodePackages.mathjax + mathjax djvulibre ]; diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix index 6efafad9a8f3..4ad8f2d7951e 100644 --- a/pkgs/by-name/xr/xrootd/package.nix +++ b/pkgs/by-name/xr/xrootd/package.nix @@ -3,7 +3,6 @@ stdenv, callPackage, fetchFromGitHub, - fetchpatch2, davix, cmake, gtest, @@ -31,25 +30,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "xrootd"; - version = "5.8.4"; + version = "5.9.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-r0wXAlm+K6TE6189QyZL/k3q5IKlouSBKWzWXz1Tws4="; + hash = "sha256-XClMtQfCGWpLtILGQyYCsKMcOlhLHC5i7UabzXH/imc="; }; - patches = [ - # Downgrade -Wnull-dereference from error to warning - # Should be removed in the release after next - (fetchpatch2 { - url = "https://github.com/xrootd/xrootd/commit/135b33b9631891219889fcaad449a4efb5e77d95.patch"; - hash = "sha256-t6Cy2XWp3B+sbMBxLhsh3WjQlXg4Tb7fF+rGGgYollU="; - }) - ]; - postPatch = '' patchShebangs genversion.sh substituteInPlace cmake/XRootDConfig.cmake.in \ diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index c1b65e7b7006..c6028be3f2a8 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; - version = "6.12"; + version = "6.13"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; - hash = "sha256-T/Z5ghfju7w8cza+7afoPq+/AzAawpsiNtpmoPExdkM="; + hash = "sha256-pzFI3SFifP8udRMcjgwbCV8zTGiyLgnzbTfMJ5YRZ7c="; }; outputs = [ diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index a53997d95010..97f2f708c6bd 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://invisible-island.net/xterm"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ nequissimus ]; platforms = with lib.platforms; linux ++ darwin; changelog = "https://invisible-island.net/xterm/xterm.log.html"; mainProgram = "xterm"; diff --git a/pkgs/by-name/xy/xyce/package.nix b/pkgs/by-name/xy/xyce/package.nix index 56fa6243fdeb..b8eba42a7ccf 100644 --- a/pkgs/by-name/xy/xyce/package.nix +++ b/pkgs/by-name/xy/xyce/package.nix @@ -3,10 +3,9 @@ fetchFromGitHub, fetchgit, lib, - autoconf, - automake, bison, blas, + cmake, flex, fftw, gfortran, @@ -31,21 +30,23 @@ assert withMPI -> trilinos.withMPI; let - version = "7.9.0"; + version = "7.10.0"; # using fetchurl or fetchFromGitHub doesn't include the manuals # due to .gitattributes files xyce_src = fetchgit { + name = "Xyce"; url = "https://github.com/Xyce/Xyce.git"; rev = "Release-${version}"; - sha256 = "sha256-m8tHQYBs0hjepTDswrDJFRCPY941Ew98gYRPuQMdKZA="; + hash = "sha256-8cvglBCykZVQk3BD7VE3riXfJ0PAEBwsoloqUsrMlBc="; }; regression_src = fetchFromGitHub { + name = "Xyce_Regression"; owner = "Xyce"; repo = "Xyce_Regression"; rev = "Release-${version}"; - sha256 = "sha256-7Jvt2LUw2C201pMp9CHnhOwMzxU7imfrRKCb3wu3Okk="; + hash = "sha256-aA/4UpzSb+EeJ1RVkVwSKiNh7BDcLHxNDnKXZmnCBmI="; }; in @@ -60,27 +61,15 @@ stdenv.mkDerivation rec { sourceRoot = xyce_src.name; - preConfigure = "./bootstrap"; - - configureFlags = [ - "CXXFLAGS=-O3" - "--enable-xyce-shareable" - "--enable-shared" - "--enable-stokhos" - "--enable-amesos2" - ] - ++ lib.optionals withMPI [ - "--enable-mpi" - "CXX=mpicxx" - "CC=mpicc" - "F77=mpif77" + cmakeFlags = lib.optionals withMPI [ + "-DCMAKE_C_COMPILER=mpicc" + "-DCMAKE_CXX_COMPILER=mpicxx" ]; enableParallelBuilding = true; nativeBuildInputs = [ - autoconf - automake + cmake gfortran libtool_2 ] @@ -145,7 +134,7 @@ stdenv.mkDerivation rec { checkPhase = '' XYCE_BINARY="$(pwd)/src/Xyce" EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY" - TEST_ROOT="$(pwd)/../${regression_src.name}" + TEST_ROOT="$(pwd)/../../${regression_src.name}" # Honor the TMP variable sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh @@ -171,6 +160,7 @@ stdenv.mkDerivation rec { ]; postInstall = lib.optionalString enableDocs '' + pushd ../../${xyce_src.name} local docFiles=("doc/Users_Guide/Xyce_UG" "doc/Reference_Guide/Xyce_RG" "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") @@ -192,6 +182,7 @@ stdenv.mkDerivation rec { install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf) popd done + popd ''; meta = with lib; { diff --git a/pkgs/by-name/ya/yandex-disk/package.nix b/pkgs/by-name/ya/yandex-disk/package.nix index c62d25c63aa0..e79b072d1ce5 100644 --- a/pkgs/by-name/ya/yandex-disk/package.nix +++ b/pkgs/by-name/ya/yandex-disk/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { description = "Free cloud file storage service"; maintainers = with lib.maintainers; [ smironov - jagajaga ]; platforms = [ "i686-linux" diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index 42ccebb1e014..1b16b9489a8d 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mediainfo.yazi"; - version = "25.5.31-unstable-2025-11-15"; + version = "25.5.31-unstable-2025-12-04"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "mediainfo.yazi"; - rev = "1099409ca956282efe49dea8ab53f8be95feb72a"; - hash = "sha256-K2SHIzmNtICgVchSPB1mtTboyvDPIq+hN3GEOR20hpk="; + rev = "af8bdf47a1f4dcfefe433aa2134b04eb9c75a10b"; + hash = "sha256-io3HyoUniWZu+0efZfbhXn8JoG5p2/lFeH/FguVvjSY="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix index b722b6d069d2..6f4f8b61f153 100644 --- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "recycle-bin.yazi"; - version = "0-unstable-2025-11-11"; + version = "0-unstable-2025-12-04"; src = fetchFromGitHub { owner = "uhs-robert"; repo = "recycle-bin.yazi"; - rev = "1762676a032e0de6d4712ae06d14973670621f61"; - hash = "sha256-LzqFBLqaclRgjyLKL0OxlAao+MMivh4Ww7UZf2gcOUM="; + rev = "53ad17c77746497e5146ad41fad94e6fc43e900b"; + hash = "sha256-CasCXkE8ig2INqx1mJj0wyxUVD1WFNM7aZ0SITXEsx0="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix index 369ad1d8a74a..36491b168d26 100644 --- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "restore.yazi"; - version = "25.5.31-unstable-2025-09-25"; + version = "25.5.31-unstable-2025-12-04"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "restore.yazi"; - rev = "2161735f840e36974a6b4b0007c3e4184a085208"; - hash = "sha256-W3P7UhEtmv0JfcKUd+g/HBPy4ML8qgmgnOVaYKN0TSU="; + rev = "6395e52b3af3a8832f0249970a168c41fb92b31b"; + hash = "sha256-HfXhYe3XPKkd/ivpQB85EsZyvLiflJE0tRNGVid2A9A="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix index 232b9ab4dea2..79a245de54fd 100644 --- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "starship.yazi"; - version = "25.4.8-unstable-2025-07-08"; + version = "25.4.8-unstable-2025-12-03"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "starship.yazi"; - rev = "a63550b2f91f0553cc545fd8081a03810bc41bc0"; - hash = "sha256-PYeR6fiWDbUMpJbTFSkM57FzmCbsB4W4IXXe25wLncg="; + rev = "eca186171c5f2011ce62712f95f699308251c749"; + hash = "sha256-xcz2+zepICZ3ji0Hm0SSUBSaEpabWUrIdG7JmxUl/ts="; }; meta = { diff --git a/pkgs/by-name/yb/yb/package.nix b/pkgs/by-name/yb/yb/package.nix new file mode 100644 index 000000000000..0a51e60224cc --- /dev/null +++ b/pkgs/by-name/yb/yb/package.nix @@ -0,0 +1,97 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + opensc, + openssl, + yubico-piv-tool, + yubikey-manager, +}: + +python3Packages.buildPythonApplication rec { + pname = "yb"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "douzebis"; + repo = "yb"; + rev = "v${version}"; + hash = "sha256-Eq3qFDzi/G4qQ3UUZWyl42zMYAO2C0ipV2yXxt2EAUw="; + }; + + build-system = with python3Packages; [ + setuptools + wheel + ]; + + dependencies = with python3Packages; [ + click + cryptography + prompt-toolkit + pyscard + pyyaml + yubikey-manager + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + buildInputs = [ + opensc + openssl + yubico-piv-tool + yubikey-manager + ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ + opensc + openssl + yubico-piv-tool + yubikey-manager + ]}" + "--set" + "LD_LIBRARY_PATH" + "${yubico-piv-tool}/lib" + ]; + + pythonImportsCheck = [ + "yb" + ]; + + # Run subset of tests that don't require YubiKey hardware + doCheck = true; + pytestFlagsArray = [ + "tests" + ]; + + meta = { + description = "CLI tool for securely storing and retrieving binary blobs using YubiKey"; + longDescription = '' + yb is a command-line tool that provides secure blob storage using a YubiKey device. + It leverages the YubiKey's PIV (Personal Identity Verification) application to store + encrypted or unencrypted binary data in custom PIV data objects. The tool uses hybrid + encryption (ECDH + AES-256-CBC) to protect sensitive data with hardware-backed + cryptographic keys. + + Features: + - Hardware-backed encryption using YubiKey PIV + - ~36 KB storage capacity (expandable to ~48 KB) + - PIN-protected management key mode + - Multi-device support with interactive selection + - Shell auto-completion for blob names + - Glob pattern filtering + ''; + homepage = "https://github.com/douzebis/yb"; + changelog = "https://github.com/douzebis/yb/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ douzebis ]; + mainProgram = "yb"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ye/yersinia/package.nix b/pkgs/by-name/ye/yersinia/package.nix index e2717c3c6fcc..f808289008c9 100644 --- a/pkgs/by-name/ye/yersinia/package.nix +++ b/pkgs/by-name/ye/yersinia/package.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation { autoreconfPhase = "./autogen.sh"; configureFlags = [ - "--with-pcap-includes=${libpcap}/include" - "--with-libnet-includes=${libnet}/include" + "--with-pcap-includes=${lib.getDev libpcap}/include" + "--with-libnet-includes=${lib.getDev libnet}/include" ] ++ lib.optional (!enableAdmin) "--disable-admin" ++ lib.optional (!withGtk) "--disable-gtk"; diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index d87ae42abe57..340d5d0e7a36 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -38,6 +38,13 @@ python3Packages.buildPythonApplication rec { substituteInPlace yt_dlp/networking/_curlcffi.py \ --replace-fail "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version < (0, 14)" \ "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version" + ${lib.optionalString javascriptSupport '' + # deno is required for full YouTube support (since 2025.11.12). + # This makes yt-dlp find deno even if it is used as a python dependency, i.e. in kodiPackages.sendtokodi. + # Crafted so people can replace deno with one of the other JS runtimes. + substituteInPlace yt_dlp/utils/_jsruntime.py \ + --replace-fail "path = _determine_runtime_path(self._path, '${deno.meta.mainProgram}')" "path = '${lib.getExe deno}'" + ''} ''; build-system = with python3Packages; [ hatchling ]; @@ -87,7 +94,6 @@ python3Packages.buildPythonApplication rec { # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support - # - deno: required for full YouTube support (since 2025.11.12) # - rtmpdump: download files over RTMP # - atomicparsley: embedding thumbnails makeWrapperArgs = @@ -95,7 +101,6 @@ python3Packages.buildPythonApplication rec { packagesToBinPath = lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg-headless - ++ lib.optional javascriptSupport deno ++ lib.optional rtmpSupport rtmpdump; in lib.optionals (packagesToBinPath != [ ]) [ diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 7195fb38d968..2c76dcdeaa13 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.11.27"; + version = "2025.11.28.post1"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-HkdDcTQza4pw72FuQgss+GRiiHPtKFRSCJ87fIYPdq4="; + hash = "sha256-DKlo8Cs7MVfkY8qrVT6NDPTQm6DhGtOHQ1pm3587Hj8="; }; postPatch = '' diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 96a0662e318e..2361cd1a2b31 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -1,27 +1,30 @@ { stdenv, lib, - rustPlatform, + cmake, fetchFromGitHub, - rust-jemalloc-sys, - versionCheckHook, nix-update-script, + rust-jemalloc-sys, + rustPlatform, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-FUy6S9IM+ge+7+MRdS/6hgiuQnHk9A4e/P06FXFXQ5k="; + hash = "sha256-8iPHIUESModoNFk8XEWjHZOGBOPxhOGM9gHaljWyqZg="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-OlcXUf0r79TBwkIwMiYt/uDlO1mjBHWipgQeMt+jhwM="; + cargoHash = "sha256-JZerQne+jW6xjH13dQe3g1dD07BP3j+1DSF+a/SgGXc="; + + nativeBuildInputs = [ cmake ]; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/zg/zgrab2/package.nix b/pkgs/by-name/zg/zgrab2/package.nix index 2138dd499696..51e0bcd47397 100644 --- a/pkgs/by-name/zg/zgrab2/package.nix +++ b/pkgs/by-name/zg/zgrab2/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "zgrab2"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "zmap"; repo = "zgrab2"; tag = "v${finalAttrs.version}"; - hash = "sha256-9YDrWtSFFzFMN/pp0Kaknie4NMduOb/ZNrP+7MIMT+0="; + hash = "sha256-rvQum+Mjpuz2XRgTY94CTqJ6Tvi78Kdd3CCMHvYZQgE="; }; - vendorHash = "sha256-8oidWUtSMMm/QMzrTkH07eyyBhCeZ9SUOO1+h1evbac="; + vendorHash = "sha256-ag2VWBNv2u/DXWWsSLBfRscm3++AjxgrGfw8JUlhnRo="; subPackages = [ "cmd/zgrab2" @@ -23,8 +23,8 @@ buildGoModule (finalAttrs: { meta = { description = "Fast Application Layer Scanner"; - mainProgram = "zgrab2"; homepage = "https://github.com/zmap/zgrab2"; + changelog = "https://github.com/zmap/zgrab2/releases/tag/vv${finalAttrs.version}"; license = with lib.licenses; [ asl20 isc @@ -33,5 +33,6 @@ buildGoModule (finalAttrs: { fab juliusrickert ]; + mainProgram = "zgrab2"; }; }) diff --git a/pkgs/by-name/zi/zig-shell-completions/package.nix b/pkgs/by-name/zi/zig-shell-completions/package.nix index ca2e9b50da3b..08a21f7bd948 100644 --- a/pkgs/by-name/zi/zig-shell-completions/package.nix +++ b/pkgs/by-name/zi/zig-shell-completions/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; - version = "0-unstable-2025-06-29"; + version = "0-unstable-2025-11-25"; src = fetchFromGitea { domain = "codeberg.org"; owner = "ziglang"; repo = "shell-completions"; - rev = "4f91bcbe28cec28ff707d5e032333cbdbfa01161"; - hash = "sha256-4uzM5pFnYf5dTkw3igzWUCYYsBZVTrb/mFf5iHFiGT4="; + rev = "c2983a75dcbcaf3a1df74ab563a9bd3c8e7f448e"; + hash = "sha256-+sV3BitKhALNQys3u+wsMSHTH3QxoRZ1i75fazIgOjQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix index 81b177955f73..9f15f3b57f65 100644 --- a/pkgs/by-name/zi/zigbee2mqtt/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix @@ -16,19 +16,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; tag = finalAttrs.version; - hash = "sha256-s37nI4dTzyZHQ7SS9CtpysbGpYXbCkprJxzMEXIu9BE="; + hash = "sha256-aKLgp8/BkxBu2lQwFeG4VhjzN9/X8sYuhILXjUreZBQ="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-dIN3obP//It1GoLfAdEeATWdObf9zfnkD0s1x8iQ8qo="; + hash = "sha256-XHDSjjYt/wbCdafLQ73dxDD+1ClbFtI7NejS9h5SNmE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix index f60d9b2fe338..9a615a10ede7 100644 --- a/pkgs/by-name/zi/zigpy-cli/package.nix +++ b/pkgs/by-name/zi/zigpy-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zigpy-cli"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-cli"; tag = "v${version}"; - hash = "sha256-X4sH2UOF0xHzjT1enohg7JKi+5lQ6wnJBIn09jK5Db8="; + hash = "sha256-IwL69fZLbCvoliYB7Ne6nhe9QVoy9Wu55Mwca+mbucc="; }; postPatch = '' diff --git a/pkgs/by-name/zo/zoho-mail-desktop/package.nix b/pkgs/by-name/zo/zoho-mail-desktop/package.nix index 71f88170b041..caac02759af7 100644 --- a/pkgs/by-name/zo/zoho-mail-desktop/package.nix +++ b/pkgs/by-name/zo/zoho-mail-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "zoho-mail-desktop"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://downloads.zohocdn.com/zmail-desktop/linux/zoho-mail-desktop-lite-x64-v${version}.AppImage"; - hash = "sha256-KLDJl91vfTdDtUQ5maDuCBU1HJQf4V0VEnplAc4ytZM="; + hash = "sha256-hoWOujwfm5/DS/0Kh69gqIKmc1dnVSOYJP/zypvcy8I="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix index 1a0b3a1f710d..9ace2b21e153 100644 --- a/pkgs/by-name/zs/zsh-forgit/package.nix +++ b/pkgs/by-name/zs/zsh-forgit/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "25.10.0"; + version = "25.12.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; tag = finalAttrs.version; - hash = "sha256-MG60GzRG0NFQsGXBXBedSweucxo88S/NACXTme7ixRM="; + hash = "sha256-DN2QUxCVVjYn7b4xt/7+k5g1/7dfZ+cp5Yi0nJWh1mM="; }; strictDeps = true; diff --git a/pkgs/by-name/zu/zunit/package.nix b/pkgs/by-name/zu/zunit/package.nix index 501aad737c02..7c3a51561fe7 100644 --- a/pkgs/by-name/zu/zunit/package.nix +++ b/pkgs/by-name/zu/zunit/package.nix @@ -17,8 +17,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "zunit-zsh"; repo = "zunit"; rev = "v${finalAttrs.version}"; - hash = "sha256-GkBewb795piCaniZJZpGEZFhKaNs8p8swV5z34OegPY="; - deepClone = true; # Needed in order to get "tests" folder + hash = "sha256-kXgJjD7N9pUIk57g/EEXZ8ADypuVO+Vyj8ssgwOzVCg="; + # The "tests" folder is missing in GitHub-provided download archives. + # work around with `git clone`. + # https://github.com/orgs/community/discussions/180774 + forceFetchGit = true; }; strictDeps = true; diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 4eec94e26bfc..8d427429671f 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.8.1"; + version = "11.8.2"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-KQjs9oVFUQIL9aAorQ5kZiGJdHBDfCI9ENHjfz/mdng="; + hash = "sha256-OXvdj8DzaVK+5YmFh56FToB43OOOh7+7JZvmW7IQkKE="; }; - npmDepsHash = "sha256-bucQdw3DYCUSUl78fR+/Tt8BL18o5wdtZP6rLzadoEQ="; + npmDepsHash = "sha256-388Iu0rDFNIk3FUy2/TySejgR6sFWc/9BP19KEmfQKk="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/by-name/zx/zxing/package.nix b/pkgs/by-name/zx/zxing/package.nix index 1c0a556bbe8a..937bf41036f3 100644 --- a/pkgs/by-name/zx/zxing/package.nix +++ b/pkgs/by-name/zx/zxing/package.nix @@ -6,17 +6,17 @@ }: let - version = "3.5.3"; + version = "3.5.4"; # Maven builds are hard to get right core_jar = fetchurl { url = "https://repo1.maven.org/maven2/com/google/zxing/core/${version}/core-${version}.jar"; - hash = "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI="; + hash = "sha256-cd5diTQbX89d2J2n9E6E2CXQ4ITN8+x3yaviaw8M6xM="; }; javase_jar = fetchurl { url = "https://repo1.maven.org/maven2/com/google/zxing/javase/${version}/javase-${version}.jar"; - hash = "sha256-1leVt4nvrIohVssqS2SNIOWL/gNhMWW7Xc5ocOzveY4="; + hash = "sha256-GWaDH0c9cv93IFeEGasRP2QXqXI0oXENK8zGUPWuDBI="; }; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/desktops/gnome/extensions/forge/default.nix b/pkgs/desktops/gnome/extensions/forge/default.nix new file mode 100644 index 000000000000..f51bfd14205c --- /dev/null +++ b/pkgs/desktops/gnome/extensions/forge/default.nix @@ -0,0 +1,54 @@ +{ + fetchFromGitHub, + glib, + lib, + stdenv, + ... +}: +let + uuid = "forge@jmmaranan.com"; +in +stdenv.mkDerivation { + pname = "gnome-shell-extension-forge"; + version = "49.2-development"; + + src = fetchFromGitHub { + owner = "forge-ext"; + repo = "forge"; + rev = "701e7587e88fd51cc10e0f2fc5124ac61c82cf1c"; + hash = "sha256-yKBH4Hv4b0CUVubsfs8a8fg3nIuogvGp5DJT/HjBcns="; + }; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/ + cp -r -T . $out/share/gnome-shell/extensions/${uuid} + # The makefile autogenerates a lib/prefs/metadata.js with a list of + # developers. We can just hardcode an empty one to avoid having to read the + # git history during the derivation. + echo "export const developers = []" > \ + $out/share/gnome-shell/extensions/${uuid}/lib/prefs/metadata.js + runHook postInstall + ''; + + passthru = { + extensionPortalSlug = "forge"; + extensionUuid = uuid; + }; + + meta = { + description = "Tiling and window manager for GNOME"; + homepage = "https://extensions.gnome.org/extension/4481/forge/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ agustinmista ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 0ed4252b48f4..041123ef196e 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -5,6 +5,7 @@ "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; + "forge@jmmaranan.com" = callPackage ./forge { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "guillotine@fopdoodle.net" = callPackage ./guillotine { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index f9ec48f3163a..f8f85d470b3a 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -5,8 +5,8 @@ fetchpatch, gitUpdater, testers, - # dbus-cpp not compatible with Boost 1.87 - # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8 + # Uses boost/asio/io_service.hpp + # Waiting for https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/19 to get finished & merged boost186, cmake, cmake-extras, diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index 227d9530f14f..e02025cb850d 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "biometryd"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/biometryd"; rev = finalAttrs.version; - hash = "sha256-OTK+JAm8MnlQGZwcKJPh+N1OfUOko24G+IU9GUBjOjI="; + hash = "sha256-MIyWGd4No4Qj8oEH1FQYCE4rQhyetwiAf1y6em4zk2A="; }; outputs = [ diff --git a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix index 8b5a9d33da45..0c387ce96abb 100644 --- a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-telephony-service"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-telephony-service"; tag = finalAttrs.version; - hash = "sha256-7WKKRUEEF3NL8S1xg8E1WcD3dGasrw49pydeC4CyL+c="; + hash = "sha256-CNtJPMust7zCuoXw/CpaK4NVXijTXA3Xs4YMJiZyxes="; }; postPatch = '' diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 2fd3c1ca05b1..56370d078c1d 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -5,9 +5,7 @@ gitUpdater, nixosTests, testers, - # dbus-cpp not compatible with Boost 1.87 - # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8 - boost186, + boost, cmake, cmake-extras, dbus, @@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost186 + boost cmake-extras dbus dbus-cpp diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 6e74ab44e1b5..2ca1a95f47c1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "elementary-dock"; - version = "8.3.0"; + version = "8.3.1"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "elementary"; repo = "dock"; rev = finalAttrs.version; - hash = "sha256-wf0HYpQAnABk0VeSGLXhWZPlO/SMzldt47PLVpWkav8="; + hash = "sha256-BJkJ6U9fnGSFeY/Z9tcomZ0umRDENxPl0koioUYhFYg="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 1fbd44a3e8ec..3d11bbd0a94c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "7.1.6"; + version = "7.2.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - hash = "sha256-z6trjczB+ZLPvWO/R41PTSA1tSBIVD/kMF12TupwId4="; + hash = "sha256-m6ICWL2JZoWh3myHLOhrKZ4St8zJcyVWhfozg+kdOng="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 0d2a148e2cbd..2485621ef2dd 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-ymgSe4LKtbJVwmZJOwer1Geb/VgYltp+tSNHkWtaMlg="; + sha256 = "sha256-ZjeufUC3Eg1do3GKN1kW/EceuWfAsFnOkSCmscL+vxg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 61d6d2775542..85fcbce21c47 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = "gala"; tag = version; - hash = "sha256-omsAOOZCQINLTZQg3Sew+p84jv8+R2cHSVtcHFIeUBI="; + hash = "sha256-Tb6+NfJ2/WRJb3R/W8oBJ5HIT8vwQUxiwqKul2hzlXY="; }; depsBuildBuild = [ pkg-config ]; @@ -71,11 +71,6 @@ stdenv.mkDerivation rec { --replace-fail "conf.set('PLUGINDIR', plugins_dir)" "conf.set('PLUGINDIR','/run/current-system/sw/lib/gala/plugins')" ''; - mesonFlags = [ - # https://github.com/elementary/gala/commit/1e75d2a4b42e0d853fd474e90f1a52b0bcd0f690 - "-Dold-icon-groups=true" - ]; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 3820708ad4b5..adea871bc651 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "applications-menu"; rev = version; - sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA="; + sha256 = "sha256-uc+enFOeYL91fFWaDY+43EJ4VomGqZQ7uZ3+dYm66SI="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 51e5620f3f8d..bfef347d2be9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, wayland-scanner, wrapGAppsHook3, @@ -25,24 +24,17 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "8.0.3"; + version = "8.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = "wingpanel"; - rev = version; - sha256 = "sha256-3UNtqfDqgclRE8Pe9N8rOt6i2FG6lKNfJAv5Q2OYXUU="; + tag = version; + hash = "sha256-+m1TydQtbXuA7uS6hZVC8z6JgOUxDh/QXL/4tROHhwk="; }; patches = [ ./indicators.patch - - # Fix build with gala 8.3.0 - # https://github.com/elementary/wingpanel/pull/642 - (fetchpatch { - url = "https://github.com/elementary/wingpanel/commit/4476df2573797310e254695a66c099b32afe9736.patch"; - hash = "sha256-99zzXbaeW/ijqPXN7tQexMPWsUW4pX7e0tcxASBVbvI="; - }) ]; depsBuildBuild = [ diff --git a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix index d83a0bb595d6..bf137967e14d 100644 --- a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix +++ b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pantheon-wayland"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "pantheon-wayland"; rev = finalAttrs.version; - hash = "sha256-UKGgz3G960dPmcDaFwLjDy55x+mDPdQQv2Ejs7BujLg="; + hash = "sha256-Wfulo/fXsb51ShT7E2wTg56TULAK1chB59L/ggGh2EY="; }; outputs = [ diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index e34d7a7a1650..b9cdccfbbb5a 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "pantheon-agent-polkit"; rev = version; - hash = "sha256-qqeB8SLuES/KoK7ycQ2J1YBA07HITovdnO8kSsrVcfs="; + hash = "sha256-tuugtrnamY9QMlF/ju5+4gwcEESFqH4jDH/kz790v5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 3d1f5a0e6320..ee6733e38581 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -14,12 +14,12 @@ let pname = "ex_doc"; - version = "0.39.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-edK484d5Fn5Kb/UEV1g3XinFF1rQJ1DypLEueET//Bg="; + hash = "sha256-khQIYS7iHOODlLMwFYPJTVE0MNia/gwYcin9ITpwttY="; }; in mixRelease { diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix index efcf26f1fa99..c358b760cd9d 100644 --- a/pkgs/development/beam-modules/livebook/default.nix +++ b/pkgs/development/beam-modules/livebook/default.nix @@ -9,7 +9,7 @@ beamPackages.mixRelease rec { pname = "livebook"; - version = "0.18.0"; + version = "0.18.1"; inherit (beamPackages) elixir; @@ -21,7 +21,7 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; tag = "v${version}"; - hash = "sha256-cALXl9CQZtg7kVAAWEu5CMbimrsjcfpxXLM1LhtxB/g="; + hash = "sha256-VwRCZkap8pTlNnOjcF1iTv9kwYOYFFH2YBfYojVKFcQ="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 480cdf27e5bc..6c3d79e685c1 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -14,19 +14,19 @@ let testsuite = fetchFromGitHub { owner = "WebAssembly"; repo = "testsuite"; - rev = "e05365077e13a1d86ffe77acfb1a835b7aa78422"; - hash = "sha256-yvZ5AZTPUA6nsD3xpFC0VLthiu2CxVto66RTXBXXeJM="; + rev = "4b24564c844e3d34bf46dfcb3c774ee5163e31cc"; + hash = "sha256-8VirKLRro0iST58Rfg17u4tTO57KNC/7F/NB43dZ7w4="; }; in stdenv.mkDerivation rec { pname = "binaryen"; - version = "124"; + version = "125"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-tkvO0gNESliRV6FOpXDQd7ZKujGe6q1mGX5V+twcE1o="; + hash = "sha256-QG8ZhvjcTbhIfYkVfrjxd97v9KaG/A8jO69rPg99/ME="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index c937ad95afa4..644ce3cc6be6 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + # Fix build with gcc15 + "CFLAGS=-std=gnu17" (if threadSupport then "--enable-threads" else "--disable-threads") "--with-gmp-incdir=${lib.getDev gmp}/include" "--with-gmp-libdir=${lib.getLib gmp}/lib" diff --git a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch index 4171906d5e36..a76a496ffa8a 100644 --- a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch +++ b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -1,4 +1,4 @@ -From 86fc9ce2b381748813b372f7e86909be6f955cbd Mon Sep 17 00:00:00 2001 +From 0a1c3a87ff80f8295bc60624a4e354a9ee6c181d Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 09:16:46 +0200 Subject: [PATCH] emulate clang 'sysroot + /include' logic @@ -16,14 +16,14 @@ in the include search order, right after the resource root. Hence usage of -idirafter. Clang also documents an -isystem-after flag but it doesn't appear to work --- - emcc.py | 3 +++ + tools/compile.py | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/emcc.py b/emcc.py -index 279f6d4d9..26e20e2cc 100644 ---- a/emcc.py -+++ b/emcc.py -@@ -400,6 +400,9 @@ def get_cflags(user_args, is_cxx): +diff --git a/tools/compile.py b/tools/compile.py +index 0cc5d33e3..e2586db0e 100644 +--- a/tools/compile.py ++++ b/tools/compile.py +@@ -86,6 +86,9 @@ def get_cflags(user_args): # We add these to the user's flags (newargs), but not when building .s or .S assembly files cflags = get_clang_flags(user_args) cflags.append('--sysroot=' + cache.get_sysroot(absolute=True)) @@ -34,5 +34,5 @@ index 279f6d4d9..26e20e2cc 100644 if settings.EMSCRIPTEN_TRACING: cflags.append('-D__EMSCRIPTEN_TRACING__=1') -- -2.42.0 +2.51.0 diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 4bd70c565f85..f2605d7d4d0d 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -15,9 +15,13 @@ emscripten, }: +let + pythonWithPsutil = python3.withPackages (ps: [ ps.psutil ]); +in + stdenv.mkDerivation rec { pname = "emscripten"; - version = "4.0.12"; + version = "4.0.21"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -33,7 +37,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-Pos7pSboTIpGKtlBm56hJPYb1lDydmUwW1urHetFfeQ="; + npmDepsHash = "sha256-IwiH+GELJzd4rDq31arhiF5miIRLDe7nrVsM7Yg9rTg="; dontBuild = true; @@ -46,7 +50,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-MwCUilfyum1yJb6nHEViYiYWufXlz2+krHZmXw2NAck="; + hash = "sha256-8lh7ZpzVnoQXOGE/xJgHSWkYXUDOOprbSGaEkyU+vKE="; rev = version; }; @@ -116,31 +120,28 @@ stdenv.mkDerivation rec { export EM_CACHE=$out/share/emscripten/cache mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do + for b in em++ emcc; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules} \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ --set PYTHON ${python3}/bin/python \ --run "source $appdir/locate_cache.sh" done + for b in em-config emar embuilder emcmake emconfigure emmake emranlib emrun emscons emsize; do + chmod +x $appdir/$b.py + makeWrapper $appdir/$b.py $out/bin/$b \ + --set NODE_PATH ${nodeModules} \ + --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ + --set PYTHON ${python3}/bin/python \ + --run "source $appdir/locate_cache.sh" + done # precompile libc (etc.) in all variants: pushd $TMPDIR echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c for LTO in -flto ""; do for BIND in "" "--bind"; do - # starting with emscripten 3.1.32+, - # if pthreads and relocatable are both used, - # _emscripten_thread_exit_joinable must be exported - # (see https://github.com/emscripten-core/emscripten/pull/18376) - # TODO: get library cache to build with both enabled and function exported $out/bin/emcc $LTO $BIND test.c - $out/bin/emcc $LTO $BIND -s RELOCATABLE test.c - # starting with emscripten 3.1.48+, - # to use pthreads, _emscripten_check_mailbox must be exported - # (see https://github.com/emscripten-core/emscripten/pull/20604) - # TODO: get library cache to build with pthreads at all - # $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c done done popd @@ -148,7 +149,7 @@ stdenv.mkDerivation rec { export PYTHON=${python3}/bin/python export NODE_PATH=${nodeModules} pushd $appdir - python test/runner.py test_hello_world + ${pythonWithPsutil}/bin/python test/runner.py test_hello_world popd runHook postInstall diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index f6952d58601e..0e2ba5a70507 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -1,73 +1,68 @@ { - "version": "3.38.3", - "engineVersion": "13e658725ddaa270601426d1485636157e38c34c", + "version": "3.38.4", + "engineVersion": "a5cb96369ef86c7e85abf5d662a1ca5d89775053", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-yOImlcy5p6fsPhta9yiY6BY7Ue5Hq7nqb1SNdac9dQ8=", - "x86_64-linux": "sha256-yOImlcy5p6fsPhta9yiY6BY7Ue5Hq7nqb1SNdac9dQ8=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-bgzkc+BO4USd/DoINb+1bjyrxSxeFoNTPo5b9jLcvZg=", - "x86_64-linux": "sha256-bgzkc+BO4USd/DoINb+1bjyrxSxeFoNTPo5b9jLcvZg=" + "x86_64-linux": "sha256-ILLZMfXZ3p9fKMqyaectcaq9MCLWdEEoevKze+HDkyk=" } }, - "dartVersion": "3.10.1", + "dartVersion": "3.10.3", "dartHash": { - "x86_64-linux": "sha256-fZoodwPKw0gh72leKOTib2D2zKEGv3i7oTksvWLIhws=", - "aarch64-linux": "sha256-K0vRWsoO03VVTX8Qx3W8qag7yifrMcSgbzR/WQdMUAs=", - "x86_64-darwin": "sha256-N1Qe1qrQbNr9EBu0wq++WrTUwT3Oy+9YkKWcUEYH7Es=", - "aarch64-darwin": "sha256-GqDucUnS1G/OsawUA1CDv5ofurOcoLNo/OYiajrN0Ns=" + "x86_64-linux": "sha256-6Ov/vyLRHKVaUQ7cQPWUC44Rz/jUo0UpsYKXtnBz0wM=", + "aarch64-linux": "sha256-gxmQJaaBwcfjdYDCeFJM49AK9ZMRRV2JY7ME5xwpSMA=", + "x86_64-darwin": "sha256-UbNAcVUGsbNGnPpmFt/49vJcAXLpcZp7rSFiR7yJZMo=", + "aarch64-darwin": "sha256-Mb8sgvT6UsSmoGhh5tcqjRXcnDQPCXl/0SOon9jVNBM=" }, - "flutterHash": "sha256-Dz1CIYOqLJ/29KUadvhhQGWkpMg9pBe4jE2FxabSZIc=", + "flutterHash": "sha256-HuFi01uUgYFfghe5h7/Y6LoF6ikQGEXg0v9wTGeURvw=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-1qumwznyOLmh+efREN4btWBsMp70FdGwd2uCusLhDHM=", - "aarch64-linux": "sha256-1XBit+BhAobMlyUZWwbV2Y48bjVcIbYqYFUgB7VrcJo=", - "x86_64-darwin": "sha256-1qumwznyOLmh+efREN4btWBsMp70FdGwd2uCusLhDHM=", - "x86_64-linux": "sha256-1XBit+BhAobMlyUZWwbV2Y48bjVcIbYqYFUgB7VrcJo=" + "aarch64-darwin": "sha256-bzQDGeHb/RA4+t80TMTKExGutKXOeS2NoaMjE0nUnT4=", + "aarch64-linux": "sha256-hoFcKAv51lvwhreiEuOq4wbAGXPGIDDMyUrCGWbH+LQ=", + "x86_64-darwin": "sha256-bzQDGeHb/RA4+t80TMTKExGutKXOeS2NoaMjE0nUnT4=", + "x86_64-linux": "sha256-hoFcKAv51lvwhreiEuOq4wbAGXPGIDDMyUrCGWbH+LQ=" }, "fuchsia": { - "aarch64-darwin": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", - "aarch64-linux": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", - "x86_64-darwin": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", - "x86_64-linux": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=" + "aarch64-darwin": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", + "aarch64-linux": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", + "x86_64-darwin": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", + "x86_64-linux": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=" }, "ios": { - "aarch64-darwin": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", - "aarch64-linux": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", - "x86_64-darwin": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", - "x86_64-linux": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=" + "aarch64-darwin": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", + "aarch64-linux": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", + "x86_64-darwin": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", + "x86_64-linux": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=" }, "linux": { - "aarch64-darwin": "sha256-Y9v+xgILwWDGjCx56JYrlwh7YlIDAdSDXRjrIqbFCYM=", - "aarch64-linux": "sha256-Y9v+xgILwWDGjCx56JYrlwh7YlIDAdSDXRjrIqbFCYM=", - "x86_64-darwin": "sha256-O7aX2zSR2qXLnZ8FV7K9BNbSQ9Xj346f4hJVn6WOcJ8=", - "x86_64-linux": "sha256-O7aX2zSR2qXLnZ8FV7K9BNbSQ9Xj346f4hJVn6WOcJ8=" + "aarch64-darwin": "sha256-2/Te39U1JFMZp1eOvXdilOcxr2MldG56Rtf4yN2mB1A=", + "aarch64-linux": "sha256-2/Te39U1JFMZp1eOvXdilOcxr2MldG56Rtf4yN2mB1A=", + "x86_64-darwin": "sha256-SztFHRYhuuDHnD8YHX/V4CCZe2gSA3Y0iHZKfdPSnWU=", + "x86_64-linux": "sha256-SztFHRYhuuDHnD8YHX/V4CCZe2gSA3Y0iHZKfdPSnWU=" }, "macos": { - "aarch64-darwin": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", - "aarch64-linux": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", - "x86_64-darwin": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", - "x86_64-linux": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=" + "aarch64-darwin": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", + "aarch64-linux": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", + "x86_64-darwin": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", + "x86_64-linux": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=" }, "universal": { - "aarch64-darwin": "sha256-KfFCJuJTvXOdQYYx5XgbxRuq712Lea3AqHO8jpoLGac=", - "aarch64-linux": "sha256-hrQ5qX/9Ieg5dO0PXdB3xwpCIrABhAjw6GXnbWMFuXQ=", - "x86_64-darwin": "sha256-Tr5HKxsHs3AenyAWXsMYGPL4c5XARmvAXLoWBE+eZX4=", - "x86_64-linux": "sha256-clltEas0V8MmbU1VeRLKE5g/jDaHgqk+qiYq35Yhlow=" + "aarch64-darwin": "sha256-5e70BNMP5Gv+HM1WJEGyY2UFEf883y2lCbizbbxdoDM=", + "aarch64-linux": "sha256-VBkvDDHBDXxv69R3RXTMlmP29+vJCEq8/u9wlT60ib4=", + "x86_64-darwin": "sha256-+sgwalym3dreG8f8GYgSqIMjLK6yYPMOs74iyMk/y04=", + "x86_64-linux": "sha256-ugQmK2LbpF1v3v1Cd3VAFc6g/+NYEB/LcoZNp4FKCkA=" }, "web": { - "aarch64-darwin": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", - "aarch64-linux": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", - "x86_64-darwin": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", - "x86_64-linux": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=" + "aarch64-darwin": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", + "aarch64-linux": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", + "x86_64-darwin": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", + "x86_64-linux": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=" }, "windows": { - "x86_64-darwin": "sha256-g4zesG+9KO7LiYVSpkA2Wc/+cGR3MGHTJ0cIHwL8DaY=", - "x86_64-linux": "sha256-g4zesG+9KO7LiYVSpkA2Wc/+cGR3MGHTJ0cIHwL8DaY=" + "x86_64-darwin": "sha256-CSaPe7IX34uTOJOHnRlGNujs4LoFWDGvNzHWlPjCzqE=", + "x86_64-linux": "sha256-CSaPe7IX34uTOJOHnRlGNujs4LoFWDGvNzHWlPjCzqE=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 488931f4d4f4..76b18db2a6c3 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.isDarwin then ./binary-builder-darwin.sh else - throw "Not supported on ${stdenv.hostPlatform}."; + throw "Not supported on ${stdenv.hostPlatform.system}."; meta = { description = "Free Pascal Compiler from a binary distribution"; diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 93a1d4eb5cf3..bfe11cb0b835 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -234,4 +234,9 @@ optionals noSysDirs ( url = "https://inbox.sourceware.org/gcc-patches/20250926170154.2222977-1-corngood@gmail.com/raw"; hash = "sha256-mgzMRvgPdhj+Q2VRsFhpE2WQzg0CvWsc5/FRAsSU1Es="; }) + (fetchpatch { + name = "cygwin-use-builtin_define_std-for-unix.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-3-corngood@gmail.com/raw"; + hash = "sha256-8I2G4430gkYoWgUued4unqhk8ZCajHf1dcivAeuLZ0E="; + }) ] diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index fe215fcf79ad..9d1445e074e6 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -162,7 +162,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { ] ++ oldAttrs.nativeBuildInputs; - meta = with lib; { + meta = { description = "OpenJDK fork which better supports Jetbrains's products"; longDescription = '' JetBrains Runtime is a runtime environment for running IntelliJ Platform @@ -176,7 +176,6 @@ openjdk17.overrideAttrs (oldAttrs: rec { ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk17.meta) license platforms mainProgram; - maintainers = with maintainers; [ edwtjo ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 67e11e7082cf..b5c58fb1384b 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -198,7 +198,6 @@ jdk.overrideAttrs (oldAttrs: rec { homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ - edwtjo aoli-al ]; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 806cf214b4ea..2a88fecc0b6e 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -3,6 +3,7 @@ targetPackages, lib, stdenv, + preLibcHeaders, fetchFromGitHub, overrideCC, wrapCCWith, @@ -278,7 +279,7 @@ makeScopeWithSplicing' { bintoolsNoLibc = wrapBintoolsWith { bintools = self.bintools-unwrapped; - libc = targetPackages.preLibcHeaders; + libc = targetPackages.preLibcHeaders or preLibcHeaders; }; bintools = wrapBintoolsWith { diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index b783cd7fbf0d..8b180376f10c 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -606,7 +606,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://openjdk.java.net/"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - edwtjo infinidoge ]; teams = [ lib.teams.java ]; diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index d8dde89e919f..921a946597db 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; branch = versions.majorMinor version; maintainers = with maintainers; [ - nequissimus kashw2 ]; }; diff --git a/pkgs/development/cuda-modules/backendStdenv/default.nix b/pkgs/development/cuda-modules/backendStdenv/default.nix index c7b0dbd549a5..762e0901f88b 100644 --- a/pkgs/development/cuda-modules/backendStdenv/default.nix +++ b/pkgs/development/cuda-modules/backendStdenv/default.nix @@ -30,7 +30,6 @@ let ; inherit (lib) assertMsg - extendDerivation filter findFirst flip @@ -265,7 +264,8 @@ let stdenvAdapters.useLibsFrom stdenv maybeHostStdenv; in # TODO: Consider testing whether we in fact use the newer libstdc++ -# NOTE: The assertion message we get from `extendDerivation` is not at all helpful. Instead, we use assertMsg. assert assertMsg (failedAssertionsString == "") "${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv has failed assertions:${failedAssertionsString}"; -extendDerivation true passthruExtra backendStdenv +backendStdenv.override (prevArgs: { + extraAttrs = prevArgs.extraAttrs or { } // passthruExtra; +}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af7165a8ba03..4a5e4d0325b9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -666,7 +666,7 @@ with haskellLib; # the path to the (host) tools at build time from PATH, # so we instruct it to check at runtime. enableCabalFlag "allow-relative-paths" ( - super.nix-paths { + super.nix-paths.override { nix-build = null; nix-env = null; nix-hash = null; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 35ac1db40d05..a65d84798ac1 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -323,6 +323,18 @@ self: super: ''; }) super.di-core; + # Template Haskell on Darwin fails to load an available symbol in these + # transitive dependencies since GHC 9.10.3. + # See issue https://github.com/NixOS/nixpkgs/issues/461651 + hercules-ci-agent = overrideCabal (old: { + preBuild = '' + DYLD_INSERT_LIBRARIES="''${DYLD_INSERT_LIBRARIES:+$DYLD_INSERT_LIBRARIES:}$(pkg-config --variable=libdir nix-store)/libnixstore.dylib:$(pkg-config --variable=libdir nix-util)/libnixutil.dylib" + export DYLD_INSERT_LIBRARIES + echo "DYLD_INSERT_LIBRARIES=$DYLD_INSERT_LIBRARIES" + '' + + (old.preBuild or ""); + }) super.hercules-ci-agent; + # Require /usr/bin/security which breaks sandbox http-reverse-proxy = dontCheck super.http-reverse-proxy; servant-auth-server = dontCheck super.servant-auth-server; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f434334909ef..72a4c0297010 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -2156,6 +2156,9 @@ builtins.intersectAttrs super { iserv-proxy network ; + + # Workaround for flaky test: https://github.com/basvandijk/threads/issues/10 + threads = appendPatch ./patches/threads-flaky-test.patch super.threads; } // lib.optionalAttrs pkgs.config.allowAliases ( diff --git a/pkgs/development/haskell-modules/patches/threads-flaky-test.patch b/pkgs/development/haskell-modules/patches/threads-flaky-test.patch new file mode 100644 index 000000000000..afbdf0dc4c76 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/threads-flaky-test.patch @@ -0,0 +1,13 @@ +diff --git a/test/test.hs b/test/test.hs +index 0251552..dc799a7 100644 +--- a/test/test.hs ++++ b/test/test.hs +@@ -214,7 +214,7 @@ wrap :: (ThreadGroup -> Fork a) -> (Fork a -> IO b) -> IO b + wrap doFork test = ThreadGroup.new >>= test . doFork + + test_group_single_wait :: (ThreadGroup -> Fork ()) -> Assertion +-test_group_single_wait doFork = assert $ fmap isJustTrue $ timeout (10 * a_moment) $ do ++test_group_single_wait doFork = assert $ fmap isJustTrue $ timeout (100 * a_moment) $ do + tg <- ThreadGroup.new + r <- newIORef False + _ <- doFork tg $ do diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/development/interpreters/asmrepl/default.nix index f9c701044481..1fd7375f8b8d 100644 --- a/pkgs/development/interpreters/asmrepl/default.nix +++ b/pkgs/development/interpreters/asmrepl/default.nix @@ -15,7 +15,7 @@ bundlerApp { description = "REPL for x86-64 assembly language"; homepage = "https://github.com/tenderlove/asmrepl"; license = licenses.asl20; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; platforms = platforms.x86_64; }; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 1fbd68a17c87..4b8ebe80cbe7 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.39.1"; + version = "1.40.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hd8DueT9f7vmK0QFJdRx7FgZ8BYh5prQyM++5Yb6tg4="; + hash = "sha256-BV5hVg85QgN8DXiMF2kA3IQNuvWjcsyciiuQP5+c+7c="; }; postPatch = '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 2c754ba43fc7..2f5342efd403 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -208,10 +208,16 @@ let nativeBuildInputs = [ nukeReferences ] - ++ optionals (!stdenv.hostPlatform.isDarwin && !withMinimalDeps) [ - autoconf-archive # needed for AX_CHECK_COMPILE_FLAG - autoreconfHook - ] + ++ + optionals + ( + (!stdenv.hostPlatform.isDarwin && !withMinimalDeps) + || (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) + ) + [ + autoconf-archive # needed for AX_CHECK_COMPILE_FLAG + autoreconfHook + ] ++ optionals ((!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") && !withMinimalDeps) [ diff --git a/pkgs/development/interpreters/python/cpython/freebsd-cross.patch b/pkgs/development/interpreters/python/cpython/freebsd-cross.patch index 71b45bfead27..9ad1d20899f0 100644 --- a/pkgs/development/interpreters/python/cpython/freebsd-cross.patch +++ b/pkgs/development/interpreters/python/cpython/freebsd-cross.patch @@ -1,6 +1,6 @@ --- a/configure.ac 2024-06-07 09:17:50.608162031 -0700 +++ b/configure.ac 2024-06-07 09:45:59.844518241 -0700 -@@ -554,6 +554,9 @@ +@@ -339,6 +339,9 @@ *-*-wasi) ac_sys_system=WASI ;; @@ -10,7 +10,7 @@ *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -614,6 +617,9 @@ +@@ -780,6 +783,9 @@ wasm32-*-* | wasm64-*-*) _host_cpu=$host_cpu ;; diff --git a/pkgs/development/libraries/asio/1.10.nix b/pkgs/development/libraries/asio/1.10.nix deleted file mode 100644 index 1a283bc77f1e..000000000000 --- a/pkgs/development/libraries/asio/1.10.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix ( - args - // { - version = "1.10.8"; - sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6"; - } -) diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix deleted file mode 100644 index 5508f848cc68..000000000000 --- a/pkgs/development/libraries/asio/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix ( - args - // { - version = "1.24.0"; - sha256 = "sha256-iXaBLCShGGAPb88HGiBgZjCmmv5MCr7jsN6lKOaCxYU="; - } -) diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix deleted file mode 100644 index d3ab8aa40038..000000000000 --- a/pkgs/development/libraries/asio/generic.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - boost, - openssl, - version, - sha256, - ... -}: - -stdenv.mkDerivation { - pname = "asio"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/asio/asio-${version}.tar.bz2"; - inherit sha256; - }; - - propagatedBuildInputs = [ boost ]; - - buildInputs = [ openssl ]; - - meta = with lib; { - homepage = "http://asio.sourceforge.net/"; - description = "Cross-platform C++ library for network and low-level I/O programming"; - license = licenses.boost; - broken = stdenv.hostPlatform.isDarwin && lib.versionOlder version "1.16.1"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index ff945e9d3d9f..5d81786729bc 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -65,7 +65,7 @@ let meta = { homepage = "https://aylur.github.io/astal/guide/libraries/${website-path}"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index c3d56406f597..ecd718b786a5 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -24,7 +24,7 @@ originalDrv.overrideAttrs ( `astal` namespace. This package is just a `fetchFromGitHub`, which is reused between all subpackages. ''; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 9ec7c9c82686..84a9ce8557be 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -234,7 +234,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ lovek323 - globin ]; longDescription = '' diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/c-shared-utility.nix b/pkgs/development/libraries/azure-sdk-for-cpp/c-shared-utility.nix new file mode 100644 index 000000000000..62f2b95eec9e --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/c-shared-utility.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + apple-sdk, + macro-utils-c, + umock-c, + cmake, + ninja, + pkg-config, + curl, + openssl, +}: +stdenv.mkDerivation { + pname = "azure-c-shared-utility"; + # Same version as in VCPKG as of July 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-c-shared-utility/portfile.cmake + version = "LTS_07_2022_Ref02-unstable-2025-03-31"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-c-shared-utility"; + rev = "772a4f8bc338140b4a0f404cf9c344283c5c937f"; + hash = "sha256-NSgY7EQhqR01s00mwgLJFMi8salbsCoAG2PMFrONBGk="; + }; + + # Using the cmake target instead of the variable correctly propagates + # transitive dependencies when using static libraries. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${CURL_LIBRARIES}" "CURL::libcurl" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + macro-utils-c + umock-c + ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk; + propagatedBuildInputs = [ curl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_default_uuid=ON" + "-Duse_installed_dependencies=ON" + ]; + + env = { + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + postInstall = '' + mkdir $out/include/azureiot + ''; + + meta = { + homepage = "https://github.com/Azure/azure-c-shared-utility"; + description = "Azure C SDKs common code"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix new file mode 100644 index 000000000000..c6cfa768a58d --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix @@ -0,0 +1,80 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + c-shared-utility, + macro-utils-c, + umock-c, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core-amqp"; + version = "1.0.0-beta.11"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core-amqp_1.0.0-beta.11"; + hash = "sha256-MQsz5Dmv1BwfUaN1VXMC3hPdMHihlgOBaukp5wgTNJc="; + }; + sourceRoot = "source/sdk/core/azure-core-amqp"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + core + c-shared-utility + macro-utils-c + umock-c + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DDISABLE_RUST_IN_BUILD=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core-amqp_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure SDK AMQP Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-amqp/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix new file mode 100644 index 000000000000..6977e8f144cd --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -0,0 +1,72 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + opentelemetry-cpp, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core-tracing-opentelemetry"; + version = "1.0.0-beta.4"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core-tracing-opentelemetry_1.0.0-beta.4"; + hash = "sha256-3PqHpoi7zlTUYJ4A4APKp2yPg9nVwgGiyOZ+bng4Crk="; + }; + sourceRoot = "source/sdk/core/azure-core-tracing-opentelemetry"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ opentelemetry-cpp ]; + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core-tracing-opentelemetry_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure SDK Core Tracing Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix new file mode 100644 index 000000000000..3d3faf8f2310 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix @@ -0,0 +1,77 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + curl, + libxml2, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core"; + version = "1.16.1"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core_1.16.1"; + hash = "sha256-gMINz3bH80l0QYX3iKJlL962WIMujR1wuN+t4t7g7qg="; + }; + sourceRoot = "source/sdk/core/azure-core"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + curl + libxml2 + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TRANSPORT_CURL=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core_(.*)" + ]; + }; + + # Testing this is moderately involved, see: + # https://github.com/Azure/azure-sdk-for-cpp/blob/main/CONTRIBUTING.md#testing-the-project + # Unless issues arise, it does not seem worth the effort. + doCheck = false; + + meta = ( + meta + // { + description = "Azure SDK Core Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix new file mode 100644 index 000000000000..4a5e468b04c2 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix @@ -0,0 +1,76 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + openssl, + libxml2, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-data-tables"; + version = "1.0.0-beta.6"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-data-tables_1.0.0-beta.6"; + hash = "sha256-gfkjoA16UP6ToIueYPfhQFh+LEhlVtvTk3qRJoHR5OY="; + }; + sourceRoot = "source/sdk/tables/azure-data-tables"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + openssl + libxml2 + ]; + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-data-tables_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Tables client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/tables/azure-data-tables/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/default.nix b/pkgs/development/libraries/azure-sdk-for-cpp/default.nix new file mode 100644 index 000000000000..aa56960e3b13 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/default.nix @@ -0,0 +1,62 @@ +{ + lib, + newScope, + stdenv, + cmake, + ninja, + pkg-config, + curl, + apple-sdk, + openssl, +}: +lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + # So you can override inputs for the entire scope easily. + inherit + stdenv + cmake + ninja + pkg-config + curl + openssl + apple-sdk + ; + + c-shared-utility = callPackage ./c-shared-utility.nix { }; + macro-utils-c = callPackage ./macro-utils-c.nix { }; + umock-c = callPackage ./umock-c.nix { }; + + core = callPackage ./core.nix { }; + core-amqp = callPackage ./core-amqp.nix { }; + core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; + data-tables = callPackage ./data-tables.nix { }; + identity = callPackage ./identity.nix { }; + messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; + messaging-eventhubs-checkpointstore-blob = + callPackage ./messaging-eventhubs-checkpointstore-blob.nix + { }; + security-attestation = callPackage ./security-attestation.nix { }; + security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; + security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; + security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; + security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; + storage-blobs = callPackage ./storage-blobs.nix { }; + storage-common = callPackage ./storage-common.nix { }; + storage-files-datalake = callPackage ./storage-files-datalake.nix { }; + storage-files-shares = callPackage ./storage-files-shares.nix { }; + storage-queues = callPackage ./storage-queues.nix { }; + + meta = { + homepage = "https://azure.github.io/azure-sdk-for-cpp"; + description = "Azure SDK for C++"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + } +) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix new file mode 100644 index 000000000000..5e32b14dbe7c --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix @@ -0,0 +1,72 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + openssl, + core, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-identity"; + version = "1.13.2"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-identity_1.13.2"; + hash = "sha256-864fU7BkVWXE0vVEYniXQUbrNRvLhhv6aR3wwdnjbQo="; + }; + sourceRoot = "source/sdk/identity/azure-identity"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-identity_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Identity client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/identity/azure-identity/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/macro-utils-c.nix b/pkgs/development/libraries/azure-sdk-for-cpp/macro-utils-c.nix new file mode 100644 index 000000000000..aa9deaeb48d7 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/macro-utils-c.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation { + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-macro-utils-c/portfile.cmake + pname = "azure-macro-utils-c"; + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "macro-utils-c"; + rev = "5926caf4e42e98e730e6d03395788205649a3ada"; + hash = "sha256-K5G+g+Jnzf7qfb/4+rVOpVgSosoEtNV3Joct1y1Xcdw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + + meta = { + homepage = "https://github.com/Azure/macro-utils-c"; + description = "C header file that contains a multitude of very useful C macros"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix new file mode 100644 index 000000000000..c13839413b9b --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -0,0 +1,76 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + messaging-eventhubs, + storage-blobs, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-messaging-eventhubs-checkpointstore-blob"; + version = "1.0.0-beta.1"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1"; + hash = "sha256-487IwzlxnKd09ztf9NQESbp/kZzsT18JXKgMwsG5W/Y="; + }; + sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + core + messaging-eventhubs + storage-blobs + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-messaging-eventhubs-checkpointstore-blob_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Event Hubs Blob Storage Checkpoint Store for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix new file mode 100644 index 000000000000..53f90ed64848 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -0,0 +1,75 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + core-amqp, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-messaging-eventhubs"; + version = "1.0.0-beta.10"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-messaging-eventhubs_1.0.0-beta.10"; + hash = "sha256-qGYfvRFnesI+oIp3jCRo53v66aR2qrcummSNpc5sCOw="; + }; + sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + core + core-amqp + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-messaging-eventhubs_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Event Hubs Client Package for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix new file mode 100644 index 000000000000..bc30ed100f4d --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix @@ -0,0 +1,74 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + openssl, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-attestation"; + version = "1.2.0-beta.1-unreleased-2025-03-12"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-attestation_1.1.0"; + hash = "sha256-RXCMB7MMIe5x5YgMAqAf306E/1vuRXweAlN5uDHumjA="; + }; + sourceRoot = "source/sdk/attestation/azure-security-attestation"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + substituteInPlace src/private/crypto/openssl/openssl_helpers.hpp \ + --replace-fail "#ifdef __cpp_nontype_template_parameter_auto" "#if 0" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-attestation_(.*)" + ]; + }; + + # See note in ./core.nix. + doCheck = false; + + meta = ( + meta + // { + description = "Azure Attestation Package client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/attestation/azure-security-attestation/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix new file mode 100644 index 000000000000..a5aabce2b0e3 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-administration"; + version = "4.0.0-beta.5"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-administration_4.0.0-beta.5"; + hash = "sha256-EaiJ2Q6c1VsL+RRF0MvS8jdcHwrKLeTJ0fBlySFt/+w="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-administration"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-administration_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Security KeyVault Administration client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix new file mode 100644 index 000000000000..d3282397f0d5 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-keyvault-certificates"; + version = "4.3.0-beta.4"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-certificates_4.3.0-beta.4"; + hash = "sha256-6LvqeSqSz5oDxXoR/vD7Pbxc2ksQflFhIrN7DzmMoaE="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-certificates"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-certificates_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Key Vault Certificates client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix new file mode 100644 index 000000000000..c11a3b284d33 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-keys"; + version = "4.5.0-beta.3"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-keys_4.5.0-beta.3"; + hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-keys"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-keyvault-keys_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Key Vault Key client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix new file mode 100644 index 000000000000..9e8da96a0490 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + core, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-keyvault-secrets"; + version = "4.3.0-beta.4"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-secrets_4.3.0-beta.4"; + hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-secrets"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-secrets_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Security Keyvault Secrets Package client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix new file mode 100644 index 000000000000..9e338ee0f427 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + storage-common, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-blobs"; + version = "12.15.0"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-blobs_12.15.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; + sourceRoot = "source/sdk/storage/azure-storage-blobs"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-blobs_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Storage Blobs Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-blobs/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix new file mode 100644 index 000000000000..284e2ad12e65 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix @@ -0,0 +1,76 @@ +{ + stdenv, + cmake, + ninja, + core, + openssl, + libxml2, + fetchFromGitHub, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-common"; + version = "12.11.0"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-common_12.11.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; + sourceRoot = "source/sdk/storage/azure-storage-common"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + openssl + libxml2 + ]; + propagatedBuildInputs = [ core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-common_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Storage Common Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-common/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix new file mode 100644 index 000000000000..310154dd8b2b --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix @@ -0,0 +1,74 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + storage-blobs, + storage-common, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-files-datalake"; + version = "12.13.0"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-files-datalake_12.13.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; + sourceRoot = "source/sdk/storage/azure-storage-files-datalake"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + storage-blobs + storage-common + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-files-datalake_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Storage Files Data Lake Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-datalake/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix new file mode 100644 index 000000000000..141392b262e7 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix @@ -0,0 +1,70 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + ninja, + storage-common, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-files-shares"; + version = "12.15.0"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-files-shares_12.15.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; + sourceRoot = "source/sdk/storage/azure-storage-files-shares"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-files-shares_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Storage Files Shares Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-shares/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix new file mode 100644 index 000000000000..481aefb3459f --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix @@ -0,0 +1,70 @@ +{ + stdenv, + cmake, + ninja, + storage-common, + fetchFromGitHub, + nix-update-script, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-queues"; + version = "12.5.0"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-queues_12.5.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; + sourceRoot = "source/sdk/storage/azure-storage-queues"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" + ''; + + # See note in ./core.nix. + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-queues_(.*)" + ]; + }; + + meta = ( + meta + // { + description = "Azure Storage Queues Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-queues/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/umock-c.nix b/pkgs/development/libraries/azure-sdk-for-cpp/umock-c.nix new file mode 100644 index 000000000000..a56250ef4d30 --- /dev/null +++ b/pkgs/development/libraries/azure-sdk-for-cpp/umock-c.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + macro-utils-c, +}: +stdenv.mkDerivation { + pname = "azure-umock-c"; + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/umock-c/portfile.cmake + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "umock-c"; + rev = "504193e65d1c2f6eb50c15357167600a296df7ff"; + hash = "sha256-oeqsy63G98c4HWT6NtsYzC6/YxgdROvUe9RAdmElbCM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ macro-utils-c ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_installed_dependencies=ON" + ]; + + meta = { + homepage = "https://github.com/Azure/umock-c"; + description = "Pure C mocking library"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 532f0c42502e..ecd613650b38 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = if enablePython then "python-gdcm" else "gdcm"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; tag = "v${finalAttrs.version}"; - hash = "sha256-V1UPfRlNIDZa/N9wQ6wu8uCFH6bw8Y6jomy7BB4SNEA="; + hash = "sha256-iUJrXcVHdCmL5atm6in4KvgPXbYmAYFxM6TGoZeY9EE="; }; patches = [ diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 94fc6870976e..095a313fbc2b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -32,7 +32,7 @@ emacs, ffmpeg, haskellPackages, - knot-resolver, + knot-resolver_5, ngtcp2-gnutls, ocamlPackages, pkgsStatic, @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { ffmpeg emacs qemu - knot-resolver + knot-resolver_5 samba openconnect ; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 46ecec7c2901..0eaf22962740 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -135,7 +135,7 @@ assert lib.assertMsg (invalidPlugins == [ ]) stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-rs"; - version = "0.14.2"; + version = "0.14.4"; outputs = [ "out" @@ -147,13 +147,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = finalAttrs.version; - hash = "sha256-mIq8Fo6KoxAo1cL2NQHnSMPgzUWl1eNJUujdaerGjFA="; + hash = "sha256-MZyYHMq6gFJkVxlrmeXUjOmRYsQBHj0848cnF+7mtbU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gst-plugins-rs-${finalAttrs.version}"; - hash = "sha256-Z1mqpVL2SES1v0flykOwoDX2/apZHxg7eI5If4BsP4o="; + hash = "sha256-T+fdu+Oe07Uf1YoRGYl2DMb1QgdSZVLwcOqH4bBNGXU="; }; strictDeps = true; @@ -227,6 +227,10 @@ stdenv.mkDerivation (finalAttrs: { export XDG_CACHE_HOME=$(mktemp -d) ''; + postInstall = '' + install -Dm444 -t ''${!outputDev}/lib/pkgconfig gst*.pc + ''; + doInstallCheck = (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf; installCheckPhase = '' diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix index 88fa4970da4c..d10016aef91c 100644 --- a/pkgs/development/libraries/hyphen/default.nix +++ b/pkgs/development/libraries/hyphen/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { lgpl21 mpl11 ]; - maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7c528336a9b..ec5447a751b4 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -23,6 +23,10 @@ let }; in { + icu78 = make-icu { + version = "78.1"; + hash = "sha256-Yhf1jKObIxJ2Bc/Gx+DTR1/ksNYxVwETg9cWy0FheIY="; + }; icu77 = make-icu { version = "77.1"; hash = "sha256-WI5DH3cyfDkDH/u4hDwOO8EiwhE3RIX6h9xfP6/yQGE="; diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 0ba9681e26df..e12208aedb39 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -30,9 +30,13 @@ let baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${ - lib.replaceStrings [ "." ] [ "_" ] version - }-src.tgz"; + url = + if lib.versionAtLeast version "78.1" then + "https://github.com/unicode-org/icu/releases/download/release-${version}/icu4c-${version}-sources.tgz" + else + "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${ + lib.replaceStrings [ "." ] [ "_" ] version + }-src.tgz"; inherit hash; }; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index f85f66027f0d..fe9990f873d5 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -61,6 +61,5 @@ stdenv.mkDerivation rec { homepage = "https://communi.github.io"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ hrdinka ]; }; } diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index a6c7f0ec37a4..d9761c457462 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -1,8 +1,9 @@ { lib, asioSupport ? true, - asio, + asio_1_32_0, boost, + boost186, log4cxxSupport ? false, log4cxx, snappySupport ? false, @@ -23,30 +24,6 @@ stdenv, }: -let - /* - Check if null or false - Example: - let result = enableFeature null - => "OFF" - let result = enableFeature false - => "OFF" - let result = enableFeature «derivation» - => "ON" - */ - enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; - - defaultOptionals = [ - protobuf - ] - ++ lib.optional snappySupport snappy.dev - ++ lib.optional zlibSupport zlib - ++ lib.optional zstdSupport zstd - ++ lib.optional log4cxxSupport log4cxx - ++ lib.optional asioSupport asio - ++ lib.optional (!asioSupport) boost; - -in stdenv.mkDerivation (finalAttrs: { pname = "libpulsar"; version = "3.7.2"; @@ -61,21 +38,38 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + protobuf # protoc ] - ++ defaultOptionals ++ lib.optional gtestSupport gtest.dev; buildInputs = [ jsoncpp openssl curl + protobuf ] - ++ defaultOptionals; + ++ lib.optional snappySupport snappy.dev + ++ lib.optional zlibSupport zlib + ++ lib.optional zstdSupport zstd + ++ lib.optional log4cxxSupport log4cxx + ++ lib.optionals asioSupport [ + # io_service was removed in 1.33.0 + asio_1_32_0 + boost + ] + ++ lib.optionals (!asioSupport) [ + # io_service was removed in 1.87.0 + boost186 + ]; + + strictDeps = true; cmakeFlags = [ - "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" - "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" - "-DUSE_ASIO=${enableCmakeFeature asioSupport}" + (lib.cmakeBool "BUILD_TESTS" gtestSupport) + (lib.cmakeBool "USE_LOG4CXX" log4cxxSupport) + # We enable USE_ASIO here so at least we can + # have newer boost minus boost::asio + (lib.cmakeBool "USE_ASIO" asioSupport) ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix index 4b2f04bbc8f0..bc43cfd9d6e3 100644 --- a/pkgs/development/libraries/libxml2/common.nix +++ b/pkgs/development/libraries/libxml2/common.nix @@ -73,9 +73,12 @@ stdenv'.mkDerivation (finalAttrs: { propagatedBuildInputs = [ findXMLCatalogs ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMinGW) [ - libiconv - ] + ++ + lib.optionals + (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) + [ + libiconv + ] ++ lib.optionals icuSupport [ icu ]; @@ -100,9 +103,14 @@ stdenv'.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; - preCheck = lib.optional stdenv.hostPlatform.isDarwin '' - export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" - ''; + preCheck = + lib.optional stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" + '' + # cyg prefix doesn't work for python modules + ++ lib.optional (stdenv.hostPlatform.isCygwin && pythonSupport) '' + ln -s cygxml2mod.dll python/.libs/libxml2mod.dll + ''; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 @@ -118,6 +126,12 @@ stdenv'.mkDerivation (finalAttrs: { '' + lib.optionalString (enableStatic && enableShared) '' moveToOutput lib/libxml2.a "$static" + '' + # cyg prefix doesn't work for python modules + + lib.optionalString (stdenv.hostPlatform.isCygwin && pythonSupport) '' + for packages in "$py"/lib/python*/site-packages; do + ln -s cygxml2mod.dll "$packages"/libxml2mod.dll + done ''; passthru = { diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index c3d91831ad7d..3baf30be2a1a 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 = "25.3.0"; + version = "25.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-MviXDRAbCEXM9dIzD94/CM0bjlF4zCJUVE91Xst/uII="; + hash = "sha256-ESaVKbAieCQcSs4WHyajSpBUWcHrldveXcb9PO63XWc="; }; meta = { diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index e99d86cd5489..ae83293ff650 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -25,11 +25,6 @@ stdenv.mkDerivation { meta ; - patches = [ - # Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38429 - ./fix-darwin-build.patch - ]; - outputs = [ "out" "dev" diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ffda0f7b8092..43b04d11d4fb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -20,7 +20,6 @@ libpng, libunwind, libva-minimal, - libvdpau, llvmPackages, lm_sensors, meson, @@ -272,7 +271,6 @@ stdenv.mkDerivation { libpng libunwind libva-minimal - libvdpau libX11 libxcb libXext diff --git a/pkgs/development/libraries/mesa/fix-darwin-build.patch b/pkgs/development/libraries/mesa/fix-darwin-build.patch deleted file mode 100644 index e649bb9ccfde..000000000000 --- a/pkgs/development/libraries/mesa/fix-darwin-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c -index 81b6730f8e29b3920216461858b98bcd3b7a870c..9bdfe555949482ddb6153ee926967ac5c04fe7c8 100644 ---- a/src/glx/apple/apple_cgl.c -+++ b/src/glx/apple/apple_cgl.c -@@ -34,6 +34,7 @@ - - #include "apple_cgl.h" - #include "apple_glx.h" -+#include "util/os_misc.h" - - #ifndef OPENGL_FRAMEWORK_PATH - #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL" -diff --git a/src/loader/loader.c b/src/loader/loader.c -index d06a368c1bbff180fcc9432183db66398b75f4a3..0567beb3dee569895fbb36c7e7c3df34be8b32b7 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -139,6 +139,9 @@ iris_predicate(int fd, const char *driver) - bool - nouveau_zink_predicate(int fd, const char *driver) - { -+#ifndef HAVE_LIBDRM -+ return true; -+#else - /* Never load on nv proprietary driver */ - if (!drm_fd_is_nouveau(fd)) - return false; -@@ -191,6 +194,7 @@ nouveau_zink_predicate(int fd, const char *driver) - if (!use_zink && !strcmp(driver, "nouveau")) - return true; - return false; -+#endif - } - - diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index c7a23afaa798..77407b426b04 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,8 +5,8 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.118.1"; - hash = "sha256-jpBJzXLljvobG8O8BB1JiJJmnp+Ma36SOHcl9LuimVw="; + version = "3.119"; + hash = "sha256-Lz2zWWjcneJ5X4sfOvPzEewMAKyDU7PluhWPV5E3By4="; filename = "latest.nix"; versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 9451668a5837..452c234f646a 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -293,7 +293,7 @@ effectiveStdenv.mkDerivation { cudaPropagateToOutput = "cxxdev"; postUnpack = optionalString buildContrib '' - cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" + cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/${src.name}/opencv_contrib" ''; # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. @@ -325,7 +325,7 @@ effectiveStdenv.mkDerivation { installExtraFile ade + optionalString enableIpp (installExtraFiles ippicv) + (optionalString buildContrib '' - cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") + cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/${src.name}/opencv_contrib") ${installExtraFiles vgg} ${installExtraFiles boostdesc} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d7f9a42511ad..32040cd5dd15 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -39,6 +39,8 @@ assert (securityLevel == null) || (securityLevel >= 0 && securityLevel <= 5); let + useBinaryWrapper = !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin); + common = { version, @@ -98,7 +100,10 @@ let (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform.libc != stdenv.buildPlatform.libc) '' rm test/recipes/02-test_errstr.t - ''; + '' + + lib.optionalString stdenv.hostPlatform.isCygwin '' + rm test/recipes/01-test_symbol_presence.t + ''; outputs = [ "bin" @@ -121,7 +126,7 @@ let && stdenv.cc.isGNU; nativeBuildInputs = - lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper + lib.optional useBinaryWrapper makeBinaryWrapper ++ [ perl ] ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev ++ lib.optional withZlib zlib; @@ -175,6 +180,8 @@ let "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" + else if stdenv.hostPlatform.isCygwin then + "./Configure Cygwin-${stdenv.hostPlatform.linuxArch}" else throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}" ); @@ -290,7 +297,7 @@ let '' + - lib.optionalString (!stdenv.hostPlatform.isWindows) + lib.optionalString useBinaryWrapper # makeWrapper is broken for windows cross (https://github.com/NixOS/nixpkgs/issues/120726) '' # c_rehash is a legacy perl script with the same functionality @@ -439,7 +446,11 @@ in ( if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch ) - ]; + ] + ++ + # https://cygwin.com/cgit/cygwin-packages/openssl/plain/openssl-3.0.18-skip-dllmain-detach.patch?id=219272d762128451822755e80a61db5557428598 + # and also https://github.com/openssl/openssl/pull/29321 + lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch; withDocs = true; @@ -471,7 +482,11 @@ in ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ./3.5/fix-mingw-linking.patch - ]; + ] + ++ + # https://cygwin.com/cgit/cygwin-packages/openssl/plain/openssl-3.0.18-skip-dllmain-detach.patch?id=219272d762128451822755e80a61db5557428598 + # and also https://github.com/openssl/openssl/pull/29321 + lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch; withDocs = true; diff --git a/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch b/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch new file mode 100644 index 000000000000..254fb1b30d44 --- /dev/null +++ b/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch @@ -0,0 +1,24 @@ +--- origsrc/crypto/dllmain.c ++++ src/crypto/dllmain.c +@@ -35,7 +35,9 @@ + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: ++# ifndef __CYGWIN__ + OPENSSL_thread_stop(); ++# endif + break; + case DLL_PROCESS_DETACH: + break; +--- origsrc/providers/fips/self_test.c ++++ src/providers/fips/self_test.c +@@ -95,7 +95,9 @@ + init(); + break; + case DLL_PROCESS_DETACH: ++# ifndef __CYGWIN__ + cleanup(); ++# endif + break; + default: + break; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index eaf654632af5..500ebb4fca73 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-VfuA1Xg0kudHfP/Hi1JvQfzVDuBumAkLr+SirPqSBTs="; + hash = "sha256-uTy7XUUCje57pcwACNeeEMwdLCjsMMV5nSOmg9JpeRc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index 2549454e2cb5..c08355cd34aa 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qodeassist-plugin"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Palm1r"; repo = "QodeAssist"; tag = "v${finalAttrs.version}"; - hash = "sha256-RAq6SUVE5KkkaPuDS6Hb6UUoGe8PHSnoGM1UToqrKo0="; + hash = "sha256-n+MDFJbFl/miVt8qm90PNOQE2QWc0kGgRfaQMu9MPA4="; }; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 1e2e1aaa889d..be42ad4ec53c 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation (finalAttrs: { && # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 stdenv.hostPlatform.linker == "bfd" + && + # Even with bfd linker, the above issue occurs on platforms with stricter linker requirements + # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48#note_1453201 + !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && lib.meta.availableOn stdenv.hostPlatform wayland; src = fetchurl { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 80af6d45131d..337162f1e279 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -86,7 +86,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.50.2"; + version = "2.50.3"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-Gath8tROYs1ENnOUPS1TQbhNCEBfZ6fDe3p3rTVQ+IA="; + hash = "sha256-cKAGtGlbtrLhV+gB9aDQKfQRDwUMbwiC3s2KO/WU1U8="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -118,12 +118,6 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) - - # Remove the CustomToJSObject flag to avoid a link error due to an undefined toJS() symbol - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/730bffd856d2a1e56dd3bd2a0702282f19c5242a.patch"; - hash = "sha256-QRgYzr1Flk9BOV74/H7/38sRwc44BFFBhnX+xODgYX4="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index e10756567ff0..915ad886485c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "out" "installedTests" ]; + separateDebugInfo = true; src = fetchFromGitHub { owner = "flatpak"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index c0aafbb9fbc1..66c782e212e0 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -43,12 +43,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-mpOyt9/ax3zrpaVYpYDnRmfdb+3kWFuR7vtg8Dty3yM="; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure \ - --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \ - --replace 'AR="libtool"' 'AR="${stdenv.cc.targetPrefix}ar"' \ - --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; + postPatch = + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure \ + --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \ + --replace 'AR="libtool"' 'AR="${stdenv.cc.targetPrefix}ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + '' + + lib.optionalString stdenv.hostPlatform.isCygwin '' + substituteInPlace win32/zlib.def \ + --replace-fail 'gzopen_w' "" + ''; strictDeps = true; outputs = [ @@ -59,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - dontConfigure = stdenv.hostPlatform.isMinGW; + dontConfigure = (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin); preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export CHOST=${stdenv.hostPlatform.config} @@ -112,7 +117,9 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = "-static-libgcc"; + NIX_CFLAGS_COMPILE = toString ( + [ "-static-libgcc" ] ++ lib.optional stdenv.hostPlatform.isCygwin "-DHAVE_UNISTD_H" + ); } // lib.optionalAttrs (stdenv.hostPlatform.linker == "lld") { # lld 16 enables --no-undefined-version by default @@ -126,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = [ ]; - installFlags = lib.optionals stdenv.hostPlatform.isMinGW [ + installFlags = lib.optionals (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" "LIBRARY_PATH=$(out)/lib" @@ -138,10 +145,14 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" ] - ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ++ lib.optionals (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) [ "-f" "win32/Makefile.gcc" ] + ++ lib.optionals stdenv.hostPlatform.isCygwin [ + "SHAREDLIB=cygz.dll" + "IMPLIB=libz.dll.a" + ] ++ lib.optionals shared [ # Note that as of writing (zlib 1.2.11), this flag only has an effect # for Windows as it is specific to `win32/Makefile.gcc`. diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4d02a600246e..1cf9ccb8e895 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -814,15 +814,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2314-1"; + version = "0.0.2365-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2314-1.rockspec"; - sha256 = "1540vfygbgc55nd3kl19bkz3rwgg9b04mn3w76krppnl45aq59gg"; + url = "mirror://luarocks/fzf-lua-0.0.2365-1.rockspec"; + sha256 = "14d2r59w8nlql07q5f0842lnnpz5v7dj0prwq79p0cj17aq6387h"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9a0704e8af8f8442110ff22a83b5608366b235df.zip"; - sha256 = "13ds1zl6hl8pllbs5ird4x87kjlj6g1i2zgzjdjkfzsdpc4fb4kd"; + url = "https://github.com/ibhagwan/fzf-lua/archive/0284d640fd88c56f100a43f41103c5b564699e15.zip"; + sha256 = "1n0xk82dacgr24dqpp9sskj1a7gpsa6a7y8flispzagi3glg8ww8"; }; disabled = luaOlder "5.1"; @@ -4192,15 +4192,15 @@ final: prev: { }: buildLuarocksPackage { pname = "orgmode"; - version = "0.7.1-1"; + version = "0.7.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/orgmode-0.7.1-1.rockspec"; - sha256 = "19xdq0ym9136irbj2634g5flf067vwn8c10r5rzjyd6h8z0xqvg4"; + url = "mirror://luarocks/orgmode-0.7.2-1.rockspec"; + sha256 = "1n9kcx261lj6296g60m53frvcykaa22m0qfwvz4zh6cb012n60fg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-orgmode/orgmode/archive/0.7.1.zip"; - sha256 = "09hcmljhwfs14308hmaxajmcjhi9a0cl0bw1x1hsbrkbg37h99ka"; + url = "https://github.com/nvim-orgmode/orgmode/archive/0.7.2.zip"; + sha256 = "156yhi54gqabcbcmbripwdqa6nnaf2lxirn3fy35mxnyn2mfx77j"; }; disabled = luaOlder "5.1"; @@ -4639,28 +4639,28 @@ final: prev: { buildLuarocksPackage, fetchurl, fetchzip, - luaOlder, + lua, }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "6.9.7-1"; + version = "7.0.6-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-6.9.7-1.rockspec"; - sha256 = "16vy2x8rbwxg3f9ff9qfklz8hcb6vzgg6apd1p63wd3piv6gl99w"; + url = "mirror://luarocks/rustaceanvim-7.0.6-2.rockspec"; + sha256 = "18xnr2cy3qq1qinz6y17ffwhi5cq8xjvwf1jwm4yh1bkin30yd2h"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.7.zip"; - sha256 = "12ah2vdhxxfaglylrw64dvgqsfzmp0smydz2npw76qqngklh9dlq"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.0.6.zip"; + sha256 = "1m8r2gv1py7g7sl26zbbg0paxr8jlwzri0rksy0brk0wvd1l1g5p"; }; - disabled = luaOlder "5.1"; + disabled = lua.luaversion != "5.1"; meta = { - homepage = "https://github.com/mrcjkb/rustaceanvim"; + homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.0.6.zip"; description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "GPL-2.0"; + license.fullName = "GPL-2.0-only"; }; } ) { }; @@ -4999,8 +4999,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f0caedf064aa8c926325d7fe64c141d29b8e7853"; - hash = "sha256-RrA84O25MlXvnATjgzpIehoYXH/h11vG0Zv8KR5uyIM="; + rev = "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2"; + hash = "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4="; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 81c8eae86dd0..612f5b94a8b0 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -12,7 +12,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -91,7 +91,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -156,7 +156,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -233,7 +233,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -280,7 +280,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -357,7 +357,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -404,7 +404,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -483,7 +483,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -576,7 +576,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -669,7 +669,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -762,7 +762,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -855,7 +855,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -948,7 +948,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -1041,7 +1041,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -1134,7 +1134,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -1227,7 +1227,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -1320,7 +1320,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -1413,7 +1413,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -1478,7 +1478,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1543,7 +1543,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1608,7 +1608,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1673,7 +1673,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1738,7 +1738,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1803,7 +1803,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1869,7 +1869,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1900,7 +1900,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1931,7 +1931,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1960,7 +1960,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -2010,7 +2010,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-auto", "path": "extras/google/auto", @@ -2036,7 +2036,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -2072,7 +2072,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -2101,7 +2101,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -2130,7 +2130,7 @@ } ], "displayName": "Google Play Instant Development SDK (Deprecated)", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -2168,7 +2168,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -2197,7 +2197,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -2226,7 +2226,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -2256,7 +2256,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -2285,7 +2285,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -2314,7 +2314,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2984,7 +2984,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -3030,7 +3030,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -3078,7 +3078,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -3130,7 +3130,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -3179,7 +3179,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -3229,7 +3229,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -3275,7 +3275,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -3323,7 +3323,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -3375,7 +3375,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -3431,7 +3431,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -3470,7 +3470,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -3516,7 +3516,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -3564,7 +3564,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -3616,7 +3616,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -3672,7 +3672,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -3711,7 +3711,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -3757,7 +3757,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -3811,7 +3811,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3863,7 +3863,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3919,7 +3919,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3965,7 +3965,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -4013,7 +4013,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -4121,7 +4121,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -4167,7 +4167,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -4215,7 +4215,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -4267,7 +4267,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -4316,7 +4316,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -4353,7 +4353,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -4392,7 +4392,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -4438,7 +4438,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -4484,7 +4484,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -4530,7 +4530,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -4571,7 +4571,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -4623,7 +4623,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -4675,7 +4675,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -4727,7 +4727,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -4776,7 +4776,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -4815,7 +4815,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -4861,7 +4861,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -4907,7 +4907,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -4953,7 +4953,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -4994,7 +4994,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -5046,7 +5046,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -5098,7 +5098,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -5150,7 +5150,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -5199,7 +5199,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -5243,7 +5243,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -5282,7 +5282,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -5328,7 +5328,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -5374,7 +5374,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -5420,7 +5420,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -5461,7 +5461,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -5513,7 +5513,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -5565,7 +5565,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -5617,7 +5617,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -5673,7 +5673,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -5712,7 +5712,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -5758,7 +5758,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -5804,7 +5804,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -5850,7 +5850,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -5898,7 +5898,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -5950,7 +5950,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -6002,7 +6002,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -6056,7 +6056,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -6112,7 +6112,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -6158,7 +6158,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -6202,7 +6202,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -6241,7 +6241,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -6287,7 +6287,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -6333,7 +6333,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -6374,7 +6374,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -6426,7 +6426,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -6478,7 +6478,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -6530,7 +6530,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -6584,7 +6584,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -6655,7 +6655,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -6701,7 +6701,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -6752,7 +6752,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -6796,7 +6796,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -6840,7 +6840,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -6891,7 +6891,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -6958,7 +6958,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -7025,7 +7025,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -7094,7 +7094,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -7150,7 +7150,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -7201,7 +7201,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -7245,7 +7245,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -7289,7 +7289,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -7340,7 +7340,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -7407,7 +7407,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -7476,7 +7476,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -7537,7 +7537,7 @@ } }, "displayName": "Automotive Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-android-automotive-playstore-x86", "path": "system-images/android-28/android-automotive-playstore/x86", @@ -7582,7 +7582,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -7628,7 +7628,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -7679,7 +7679,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -7716,7 +7716,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -7753,7 +7753,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -7804,7 +7804,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -7871,7 +7871,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -7938,7 +7938,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -7997,7 +7997,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -8064,7 +8064,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -8131,7 +8131,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -8192,7 +8192,7 @@ } }, "displayName": "Automotive with Play Store Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-android-automotive-playstore-x86", "path": "system-images/android-29/android-automotive-playstore/x86", @@ -8252,7 +8252,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -8291,7 +8291,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -8354,7 +8354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -8417,7 +8417,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -8468,7 +8468,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -8525,7 +8525,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -8582,7 +8582,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -8641,7 +8641,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -8722,7 +8722,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -8803,7 +8803,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -8864,7 +8864,7 @@ } }, "displayName": "Automotive with Play Store Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-android-automotive-playstore-x86_64", "path": "system-images/android-30/android-automotive-playstore/x86_64", @@ -8924,7 +8924,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -8970,7 +8970,7 @@ } }, "displayName": "China version of Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear-cn/arm64-v8a", @@ -9014,7 +9014,7 @@ } }, "displayName": "China version of Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear-cn/x86", @@ -9053,7 +9053,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -9102,7 +9102,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -9153,7 +9153,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", @@ -9220,7 +9220,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -9287,7 +9287,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -9353,7 +9353,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -9434,7 +9434,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -9515,7 +9515,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -9586,7 +9586,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -9645,7 +9645,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -9696,7 +9696,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -9745,7 +9745,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -9806,7 +9806,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -9873,7 +9873,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -9949,7 +9949,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -10016,7 +10016,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -10077,7 +10077,7 @@ } }, "displayName": "Android Automotive with Google Play arm64-v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-arm64-v8a", "path": "system-images/android-32/android-automotive-playstore/arm64-v8a", @@ -10130,7 +10130,7 @@ } }, "displayName": "Android Automotive with Google Play x86_64 System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-x86_64", "path": "system-images/android-32/android-automotive-playstore/x86_64", @@ -10185,7 +10185,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -10234,7 +10234,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -10295,7 +10295,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -10362,7 +10362,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -10438,7 +10438,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -10519,7 +10519,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -10580,7 +10580,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-automotive-arm64-v8a", "path": "system-images/android-33/android-automotive/arm64-v8a", @@ -10633,7 +10633,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-automotive-x86_64", "path": "system-images/android-33/android-automotive/x86_64", @@ -10698,7 +10698,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -10757,7 +10757,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -10803,7 +10803,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -10847,7 +10847,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -10898,7 +10898,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -10947,7 +10947,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -11008,7 +11008,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", @@ -11075,7 +11075,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", @@ -11144,7 +11144,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -11211,7 +11211,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -11286,7 +11286,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-33x-google_apis_playstore-arm64-v8a", "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a", @@ -11335,7 +11335,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-33x-google_apis_playstore-x86_64", "path": "system-images/android-33-ext4/google_apis_playstore/x86_64", @@ -11398,7 +11398,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", @@ -11458,7 +11458,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", @@ -11498,7 +11498,7 @@ } ], "displayName": "Wear OS 5 ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-android-wear-arm64-v8a", "path": "system-images/android-34/android-wear/arm64-v8a", @@ -11535,7 +11535,7 @@ } ], "displayName": "Wear OS 5 Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-android-wear-x86_64", "path": "system-images/android-34/android-wear/x86_64", @@ -11586,7 +11586,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -11635,7 +11635,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -11696,7 +11696,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", @@ -11764,7 +11764,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", @@ -11834,7 +11834,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", "path": "system-images/android-34/google_apis_playstore/arm64-v8a", @@ -11903,7 +11903,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", "path": "system-images/android-34/google_apis_playstore/x86_64", @@ -11966,7 +11966,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-arm64-v8a", "path": "system-images/android-34-ext9/android-automotive/arm64-v8a", @@ -12019,7 +12019,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-x86_64", "path": "system-images/android-34-ext9/android-automotive/x86_64", @@ -12088,7 +12088,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-34x-google_apis_playstore-arm64-v8a", "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", @@ -12137,7 +12137,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-34x-google_apis_playstore-x86_64", "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", @@ -12178,7 +12178,7 @@ } ], "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-arm64-v8a", "path": "system-images/android-35/android-wear/arm64-v8a", @@ -12210,7 +12210,7 @@ } ], "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-x86_64", "path": "system-images/android-35/android-wear/x86_64", @@ -12256,7 +12256,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35-default-arm64-v8a", "path": "system-images/android-35/default/arm64-v8a", @@ -12301,7 +12301,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35-default-x86_64", "path": "system-images/android-35/default/x86_64", @@ -12348,7 +12348,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis-arm64-v8a", "path": "system-images/android-35/google_apis/arm64-v8a", @@ -12406,7 +12406,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35-google_apis-x86_64", "path": "system-images/android-35/google_apis/x86_64", @@ -12466,7 +12466,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis_playstore-arm64-v8a", "path": "system-images/android-35/google_apis_playstore/arm64-v8a", @@ -12524,7 +12524,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35-google_apis_playstore-x86_64", "path": "system-images/android-35/google_apis_playstore/x86_64", @@ -12584,7 +12584,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-page_size_16kb-arm64-v8a", "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", @@ -12646,7 +12646,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35-page_size_16kb-x86_64", "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", @@ -12700,7 +12700,7 @@ } ], "displayName": "Wear OS 5.1 ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35x-android-wear-arm64-v8a", "path": "system-images/android-35-ext15/android-wear/arm64-v8a", @@ -12733,7 +12733,7 @@ } ], "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35x-android-wear-x86_64", "path": "system-images/android-35-ext15/android-wear/x86_64", @@ -12780,7 +12780,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-35x-google_apis-arm64-v8a", "path": "system-images/android-35-ext15/google_apis/arm64-v8a", @@ -12829,7 +12829,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35x-google_apis-x86_64", "path": "system-images/android-35-ext15/google_apis/x86_64", @@ -12880,7 +12880,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-35x-google_apis_playstore-arm64-v8a", "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a", @@ -12929,7 +12929,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-35x-google_apis_playstore-x86_64", "path": "system-images/android-35-ext15/google_apis_playstore/x86_64", @@ -12964,9 +12964,9 @@ { "arch": "all", "os": "all", - "sha1": "fbd4dcc6127e68c99278cb341041a5036a0ff690", - "size": 960176470, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-36_r02.zip" + "sha1": "ca735f3742729a7c7d74e5ed6016373a71c38f98", + "size": 963944531, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-36_r03.zip" } ], "dependencies": { @@ -12982,13 +12982,13 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-android-tv-arm64-v8a", "path": "system-images/android-36/android-tv/arm64-v8a", "revision": "36-android-tv-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:4": "arm64-v8a", @@ -13009,9 +13009,9 @@ { "arch": "all", "os": "all", - "sha1": "cccbf99ffabe763c920650aba53678748c9f5f6b", - "size": 948236448, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-36_r02.zip" + "sha1": "92ea1bfc1e4eeeda14d01c9d119d4b77047562c3", + "size": 953483981, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-36_r03.zip" } ], "dependencies": { @@ -13027,13 +13027,13 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-android-tv-x86", "path": "system-images/android-36/android-tv/x86", "revision": "36-android-tv-x86", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:4": "x86", @@ -13062,7 +13062,7 @@ } ], "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-android-wear-arm64-v8a", "path": "system-images/android-36/android-wear-signed/arm64-v8a", @@ -13095,7 +13095,7 @@ } ], "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-android-wear-x86_64", "path": "system-images/android-36/android-wear-signed/x86_64", @@ -13142,7 +13142,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis-arm64-v8a", "path": "system-images/android-36/google_apis/arm64-v8a", @@ -13191,7 +13191,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-google_apis-x86_64", "path": "system-images/android-36/google_apis/x86_64", @@ -13242,7 +13242,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis_playstore-arm64-v8a", "path": "system-images/android-36/google_apis_playstore/arm64-v8a", @@ -13291,7 +13291,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-google_apis_playstore-x86_64", "path": "system-images/android-36/google_apis_playstore/x86_64", @@ -13342,7 +13342,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-page_size_16kb-arm64-v8a", "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a", @@ -13395,7 +13395,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36-page_size_16kb-x86_64", "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64", @@ -13452,7 +13452,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36.1-google_apis-arm64-v8a", "path": "system-images/android-36.1/google_apis/arm64-v8a", @@ -13501,7 +13501,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36.1-google_apis-x86_64", "path": "system-images/android-36.1/google_apis/x86_64", @@ -13552,7 +13552,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36.1-google_apis_playstore-arm64-v8a", "path": "system-images/android-36.1/google_apis_playstore/arm64-v8a", @@ -13601,7 +13601,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36.1-google_apis_playstore-x86_64", "path": "system-images/android-36.1/google_apis_playstore/x86_64", @@ -13652,7 +13652,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36.1-page_size_16kb-arm64-v8a", "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a", @@ -13705,7 +13705,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36.1-page_size_16kb-x86_64", "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64", @@ -13762,7 +13762,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36x-google_apis-arm64-v8a", "path": "system-images/android-36-ext19/google_apis/arm64-v8a", @@ -13811,7 +13811,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36x-google_apis-x86_64", "path": "system-images/android-36-ext19/google_apis/x86_64", @@ -13862,7 +13862,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-36x-google_apis_playstore-arm64-v8a", "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a", @@ -13911,7 +13911,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-36x-google_apis_playstore-x86_64", "path": "system-images/android-36-ext19/google_apis_playstore/x86_64", @@ -13964,7 +13964,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis-arm64-v8a", "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a", @@ -14014,7 +14014,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis-x86_64", "path": "system-images/android-36.0-Baklava/google_apis/x86_64", @@ -14066,7 +14066,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis_playstore-arm64-v8a", "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a", @@ -14116,7 +14116,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis_playstore-x86_64", "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64", @@ -14168,7 +14168,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-page_size_16kb-arm64-v8a", "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a", @@ -14222,7 +14222,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-Baklava-page_size_16kb-x86_64", "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64", @@ -14280,7 +14280,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-CANARY-google_apis-arm64-v8a", "path": "system-images/android-CANARY/google_apis/arm64-v8a", @@ -14330,7 +14330,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-CANARY-google_apis-x86_64", "path": "system-images/android-CANARY/google_apis/x86_64", @@ -14382,7 +14382,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-CANARY-google_apis_playstore-arm64-v8a", "path": "system-images/android-CANARY/google_apis_playstore/arm64-v8a", @@ -14432,7 +14432,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-CANARY-google_apis_playstore-x86_64", "path": "system-images/android-CANARY/google_apis_playstore/x86_64", @@ -14484,7 +14484,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-arm-dbt-license", "name": "system-image-CANARY-page_size_16kb-arm64-v8a", "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a", @@ -14538,7 +14538,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "system-image-CANARY-page_size_16kb-x86_64", "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64", @@ -15148,7 +15148,7 @@ "build-tools": "36.1.0", "cmake": "4.1.2", "cmdline-tools": "19.0", - "emulator": "36.3.9", + "emulator": "36.3.10", "ndk": "29.0.14206865", "ndk-bundle": "22.1.7171670", "platform-tools": "36.0.0", @@ -15156,7 +15156,7 @@ "skiaparser": "8", "sources": "36.1", "tools": "26.1.1", - "fingerprint": "519227a6afa2773e" + "fingerprint": "aeb6a1bcc1fd6600" }, "licenses": { "android-googletv-license": [ @@ -15183,6 +15183,9 @@ "intel-android-sysimage-license": [ "Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.\n\nDefinitions. These terms shall have the following meanings:\n\n\"Intel\" or \"INTEL\" Intel Corporation With an Address of: 2200 Mission College Blvd. Santa Clara, CA 95052 Office of the General Counsel Mail Stop: RNB-4-51 Attn: Software and Services Group Legal\n\n\"Evaluation Software\" The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel.\n\nINTERNAL EVALUATION LICENSE TERMS AND CONDITIONS\n\n1. DEFINITIONS.\n\n1.1 Additional Defined Terms. \"Agreement\", \"Evaluation Software\", \"Intel\", \"Non-disclosure Agreement\", \"Recipient\", and \"Effective Date\" shall have the meanings ascribed to them on the signature page(s) of this Agreement.\n\n1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.\n\n1.3 \"Open Source Software\" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.4 \"Pre-Release Materials\" means \"alpha\" or \"beta\" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.\n\n2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a \"Release\") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all \"click-to-accept\" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.\n\n10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS" ], + "microxr-sysimage-license": [ + "To get started with the microXR Emulator System Image SDK, you must agree to the following terms and conditions. As described below, please note that this is a preview, emulated version of microXR, subject to change, that you use at your own risk.\n\nThis is the microXR Emulator System Image SDK License Agreement 1. Introduction\n\n1.1 The microXR Emulator System Image SDK (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files,, packaged APIs, library files (if and when they are made available), and Google applications and APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: https://source.android.com/, as updated from time to time.\n\n1.3 \"Google\" means Google LLC, organized under the laws of the State of Delaware, USA, and operating under the laws of the USA with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA.\n\n\n2. Accepting this License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept and/or using this SDK, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. 3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for microXR and/or Android XR.\n\n3.2 You may not use this SDK to develop applications for other platforms or to develop another SDK. You are of course free to develop applications for other platforms provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 The SDK is in development, and your testing and feedback are an important part of the development process. By using the SDK, you acknowledge that implementation of some features are still under development and that you should not rely on the SDK having the full functionality of a stable release.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. 6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy, which is located at the following URL: https://policies.google.com/privacy\n\n6.3 Anonymized and aggregated sets of the data may be shared with Google partners to improve the SDK. 7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware that the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. 8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n9. Terminating this License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. 11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction." + ], "mips-android-sysimage-license": [ "MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.\n\nBy clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.\n\n1. DEFINITIONS. These terms shall have the following meanings:\n\n1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085\n\n1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.\n\n1.3 “Evaluation Materials\" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.\n\n1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.\n\n2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.\n\nTHE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.\n\n\nEXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.\n\n10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\nANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement." ] @@ -15221,7 +15224,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15270,7 +15273,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15319,7 +15322,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15368,7 +15371,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15417,7 +15420,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15466,7 +15469,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15515,7 +15518,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15564,7 +15567,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15613,7 +15616,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -15661,7 +15664,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -15709,7 +15712,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15758,7 +15761,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15807,7 +15810,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15856,7 +15859,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15905,7 +15908,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15954,7 +15957,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -16002,7 +16005,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16051,7 +16054,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -16099,7 +16102,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16148,7 +16151,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -16196,7 +16199,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -16244,7 +16247,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -16292,7 +16295,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -16340,7 +16343,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -16388,7 +16391,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -16436,7 +16439,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -16484,7 +16487,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -16532,7 +16535,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -16580,7 +16583,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -16628,7 +16631,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -16676,7 +16679,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -16724,7 +16727,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -16772,7 +16775,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -16820,7 +16823,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -16868,7 +16871,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -16916,7 +16919,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -16964,7 +16967,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -17012,7 +17015,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -17060,7 +17063,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -17108,7 +17111,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17158,7 +17161,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17208,7 +17211,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -17256,7 +17259,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -17304,7 +17307,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -17352,7 +17355,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -17400,7 +17403,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17450,7 +17453,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17500,7 +17503,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17550,7 +17553,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -17598,7 +17601,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -17646,7 +17649,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -17694,7 +17697,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -17742,7 +17745,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -17790,7 +17793,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -17838,7 +17841,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -17879,7 +17882,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -17920,7 +17923,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -17961,7 +17964,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -18003,7 +18006,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -18044,7 +18047,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -18085,7 +18088,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -18126,7 +18129,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -18167,7 +18170,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -18208,7 +18211,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -18250,7 +18253,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -18292,7 +18295,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -18334,7 +18337,7 @@ } ], "displayName": "Android SDK Build-Tools 35", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.0", @@ -18375,7 +18378,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -18417,7 +18420,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -18459,7 +18462,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc3", @@ -18501,7 +18504,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc4", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc4", @@ -18543,7 +18546,7 @@ } ], "displayName": "Android SDK Build-Tools 35.0.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.1", @@ -18584,7 +18587,7 @@ } ], "displayName": "Android SDK Build-Tools 36", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/36.0.0", @@ -18625,7 +18628,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc1", @@ -18667,7 +18670,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc3", @@ -18709,7 +18712,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc4", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc4", @@ -18751,7 +18754,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc5", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc5", @@ -18793,7 +18796,7 @@ } ], "displayName": "Android SDK Build-Tools 36.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/36.1.0", @@ -18834,7 +18837,7 @@ } ], "displayName": "Android SDK Build-Tools 36.1-rc1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.1.0-rc1", @@ -18885,7 +18888,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -18926,7 +18929,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -18967,7 +18970,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -19008,7 +19011,7 @@ } ], "displayName": "CMake 3.30.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.3", @@ -19049,7 +19052,7 @@ } ], "displayName": "CMake 3.30.4", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.4", @@ -19090,7 +19093,7 @@ } ], "displayName": "CMake 3.30.5", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.5", @@ -19131,7 +19134,7 @@ } ], "displayName": "CMake 3.31.0", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.0", @@ -19172,7 +19175,7 @@ } ], "displayName": "CMake 3.31.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.1", @@ -19213,7 +19216,7 @@ } ], "displayName": "CMake 3.31.4", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.4", @@ -19254,7 +19257,7 @@ } ], "displayName": "CMake 3.31.5", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.5", @@ -19295,7 +19298,7 @@ } ], "displayName": "CMake 3.31.6", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.6", @@ -19343,7 +19346,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -19384,7 +19387,7 @@ } ], "displayName": "CMake 4.0.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.0.2", @@ -19425,7 +19428,7 @@ } ], "displayName": "CMake 4.0.3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.0.3", @@ -19466,7 +19469,7 @@ } ], "displayName": "CMake 4.1.0", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.0", @@ -19507,7 +19510,7 @@ } ], "displayName": "CMake 4.1.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.1", @@ -19548,7 +19551,7 @@ } ], "displayName": "CMake 4.1.2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.2", @@ -19591,7 +19594,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -19631,7 +19634,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -19671,7 +19674,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -19711,7 +19714,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -19751,7 +19754,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -19791,7 +19794,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -19832,7 +19835,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -19873,7 +19876,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0", @@ -19913,7 +19916,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0-alpha01", @@ -19954,7 +19957,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/17.0", @@ -19994,7 +19997,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0", @@ -20034,7 +20037,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0-alpha01", @@ -20075,7 +20078,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -20116,7 +20119,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -20156,7 +20159,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -20196,7 +20199,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -20236,7 +20239,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -20276,7 +20279,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -20316,7 +20319,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -20356,7 +20359,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -20396,7 +20399,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -21485,6 +21488,54 @@ } } }, + "36.3.10": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "90cf9a2d3d9f802998345bc8251b482a84f9c72e", + "size": 320951246, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-14472402.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "d508ad4b0fe167e278b3cc680f276b4add44ad97", + "size": 460823642, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14472402.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "42f7746cdecf679f8bf2724afe39ea2392721456", + "size": 390093951, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14472402.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "ed2012d56cb7fe5650cd5909a581399a35479a75", + "size": 447454873, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-14472402.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20429, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "36.3.10", + "revision-details": { + "major:0": "36", + "micro:2": "10", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "36.3.3": { "archives": [ { @@ -21613,7 +21664,7 @@ } ], "displayName": "Android Emulator", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "emulator", "path": "emulator", @@ -21676,6 +21727,54 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "36.4.2": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "11399ca8d84c5d4cbe7f805e7488b161d03db884", + "size": 328061962, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-14518053.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "8ba80d9dc4e3e845cc8830cd0e457d071ff7f1a7", + "size": 457500029, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14518053.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "2cb262f94590da3c5fb0b4647011604240b085f6", + "size": 390758862, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14518053.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "aaa4b065d72ea51ea9ea271d373969d8d2c71635", + "size": 425424063, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-14518053.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20429, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "36.4.2", + "revision-details": { + "major:0": "36", + "micro:2": "2", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -21801,7 +21900,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -21863,7 +21962,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -21925,7 +22024,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -21987,7 +22086,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -22050,7 +22149,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -22112,7 +22211,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -22176,7 +22275,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -22240,7 +22339,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -22302,7 +22401,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -22350,7 +22449,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -22399,7 +22498,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -22447,7 +22546,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -22503,7 +22602,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -22559,7 +22658,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -22614,7 +22713,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -22670,7 +22769,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -22725,7 +22824,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -22780,7 +22879,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -22835,7 +22934,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -22891,7 +22990,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -22946,7 +23045,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -23001,7 +23100,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -23057,7 +23156,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -23113,7 +23212,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -23169,7 +23268,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -23218,7 +23317,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -23267,7 +23366,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -23316,7 +23415,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -23364,7 +23463,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -23412,7 +23511,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -23460,7 +23559,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -23509,7 +23608,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -23558,7 +23657,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -23607,7 +23706,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -23655,7 +23754,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -23704,7 +23803,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -23753,7 +23852,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -23802,7 +23901,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -23851,7 +23950,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -23899,7 +23998,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -23947,7 +24046,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -23995,7 +24094,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -24037,7 +24136,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -24079,7 +24178,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -24120,7 +24219,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -24161,7 +24260,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -24202,7 +24301,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -24243,7 +24342,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11718014", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11718014", @@ -24285,7 +24384,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11902837", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11902837", @@ -24327,7 +24426,7 @@ } ], "displayName": "NDK (Side by side) 27.0.12077973", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.0.12077973", @@ -24368,7 +24467,7 @@ } ], "displayName": "NDK (Side by side) 27.1.12297006", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.1.12297006", @@ -24409,7 +24508,7 @@ } ], "displayName": "NDK (Side by side) 27.2.12479018", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.2.12479018", @@ -24450,7 +24549,7 @@ } ], "displayName": "NDK (Side by side) 27.3.13750724", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.3.13750724", @@ -24491,7 +24590,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12433566", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12433566", @@ -24533,7 +24632,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12674087", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12674087", @@ -24575,7 +24674,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12916984", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12916984", @@ -24617,7 +24716,7 @@ } ], "displayName": "NDK (Side by side) 28.0.13004108", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.0.13004108", @@ -24658,7 +24757,7 @@ } ], "displayName": "NDK (Side by side) 28.1.13356709", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.1.13356709", @@ -24699,7 +24798,7 @@ } ], "displayName": "NDK (Side by side) 28.2.13676358", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.2.13676358", @@ -24740,7 +24839,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13113456", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13113456", @@ -24782,7 +24881,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13599879", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13599879", @@ -24824,7 +24923,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13846066", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13846066", @@ -24866,7 +24965,7 @@ } ], "displayName": "NDK (Side by side) 29.0.14033849", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.14033849", @@ -24908,7 +25007,7 @@ } ], "displayName": "NDK (Side by side) 29.0.14206865", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk", "path": "ndk/29.0.14206865", @@ -24972,7 +25071,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25034,7 +25133,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25096,7 +25195,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25158,7 +25257,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -25221,7 +25320,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25283,7 +25382,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -25347,7 +25446,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -25411,7 +25510,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25473,7 +25572,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25521,7 +25620,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25570,7 +25669,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25618,7 +25717,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25674,7 +25773,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25730,7 +25829,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25785,7 +25884,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25841,7 +25940,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25896,7 +25995,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25951,7 +26050,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26006,7 +26105,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26062,7 +26161,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26117,7 +26216,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26172,7 +26271,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26228,7 +26327,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26284,7 +26383,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26340,7 +26439,7 @@ } }, "displayName": "NDK", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26465,7 +26564,7 @@ } ], "displayName": "Android SDK Platform-Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", @@ -26547,7 +26646,7 @@ } ], "displayName": "Android SDK Platform-Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-preview-license", "name": "platform-tools", "path": "platform-tools", @@ -26576,7 +26675,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -26615,7 +26714,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -26654,7 +26753,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -26693,7 +26792,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -26732,7 +26831,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -26771,7 +26870,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -26810,7 +26909,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -26849,7 +26948,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -26888,7 +26987,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -26927,7 +27026,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -26980,7 +27079,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -27020,7 +27119,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -27059,7 +27158,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -27098,7 +27197,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -27137,7 +27236,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -27176,7 +27275,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -27215,7 +27314,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -27254,7 +27353,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -27293,7 +27392,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -27332,7 +27431,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -27371,7 +27470,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -27424,7 +27523,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -27464,7 +27563,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -27503,7 +27602,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -27542,7 +27641,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -27581,7 +27680,7 @@ } ], "displayName": "Android SDK Platform 33", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -27621,7 +27720,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33-ext5", @@ -27656,7 +27755,7 @@ } ], "displayName": "Android SDK Platform 34", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -27702,7 +27801,7 @@ } ], "displayName": "Android SDK Platform 34-ext12", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-34-ext12", @@ -27735,7 +27834,7 @@ } ], "displayName": "Android SDK Platform 35", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35", @@ -27773,7 +27872,7 @@ } ], "displayName": "Android SDK Platform 35-ext15", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35-ext15", @@ -27806,7 +27905,7 @@ } ], "displayName": "Android SDK Platform 36", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36", @@ -27839,7 +27938,7 @@ } ], "displayName": "Android SDK Platform 36.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36.1", @@ -27872,7 +27971,7 @@ } ], "displayName": "Android SDK Platform 36-ext19", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36-ext19", @@ -27919,7 +28018,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -27973,7 +28072,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28027,7 +28126,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28067,7 +28166,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -28106,7 +28205,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -28145,7 +28244,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -28184,7 +28283,7 @@ } ], "displayName": "Android SDK Platform Baklava-ext19", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-Baklava-ext19", @@ -28218,7 +28317,7 @@ } ], "displayName": "Android SDK Platform CANARY", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-CANARY", @@ -28283,7 +28382,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28401,7 +28500,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -28522,7 +28621,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -28614,7 +28713,7 @@ } ], "displayName": "Layout Inspector image server for API 31-36", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -28641,7 +28740,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -28671,7 +28770,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -28700,7 +28799,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -28729,7 +28828,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -28758,7 +28857,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -28787,7 +28886,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -28816,7 +28915,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -28845,7 +28944,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -28874,7 +28973,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -28903,7 +29002,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -28932,7 +29031,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -28961,7 +29060,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -28990,7 +29089,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -29019,7 +29118,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -29048,7 +29147,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -29077,7 +29176,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -29106,7 +29205,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -29135,7 +29234,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -29164,7 +29263,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -29193,7 +29292,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -29223,7 +29322,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -29253,7 +29352,7 @@ } ], "displayName": "Sources for Android 35", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-35", @@ -29283,7 +29382,7 @@ } ], "displayName": "Sources for Android 36", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-36", @@ -29311,7 +29410,7 @@ } ], "displayName": "Sources for Android 36.1", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "sources", "path": "sources/android-36.1", @@ -29378,7 +29477,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 20410, + "last-available-day": 20429, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4adc8777608b..16fd9f469563 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -213,6 +213,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) js-beautify; # Added 2025-11-06 + inherit (pkgs) jsdoc; # Added 2025-11-29 inherit (pkgs) jshint; # Added 2025-11-06 json = throw "'json' has been removed because it was unmaintained upstream"; # Added 2025-11-14 inherit (pkgs) json-diff; # Added 2025-11-07 @@ -241,6 +242,7 @@ mapAliases { inherit (pkgs) markdown-link-check; # added 2024-06-28 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 + inherit (pkgs) mathjax; # Added 2025-11-28 inherit (pkgs) mathjax-node-cli; # added 2023-11-02 mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a2e265514692..451c2ada5380 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,9 +17,7 @@ , "grunt-cli" , "gulp-cli" , "js-yaml" -, "jsdoc" , "lcov-result-merger" -, "mathjax" , "node2nix" , "postcss" , "prebuild-install" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f00f8ff18403..7738d5f99059 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1155,15 +1155,6 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsdoc/salty-0.2.9" = { - name = "_at_jsdoc_slash_salty"; - packageName = "@jsdoc/salty"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.9.tgz"; - sha512 = "yYxMVH7Dqw6nO0d5NIV8OQWnitU8k6vXH8NtgqAfIa/IUqRMxRv/NUJJ08VEKbAakwxlgBl5PJdrU0dMPStsnw=="; - }; - }; "@jsep-plugin/assignment-1.3.0" = { name = "_at_jsep-plugin_slash_assignment"; packageName = "@jsep-plugin/assignment"; @@ -2532,15 +2523,6 @@ let sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; - "@types/linkify-it-5.0.0" = { - name = "_at_types_slash_linkify-it"; - packageName = "@types/linkify-it"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz"; - sha512 = "sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q=="; - }; - }; "@types/lodash-4.17.16" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -2550,15 +2532,6 @@ let sha512 = "HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g=="; }; }; - "@types/markdown-it-14.1.2" = { - name = "_at_types_slash_markdown-it"; - packageName = "@types/markdown-it"; - version = "14.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz"; - sha512 = "promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog=="; - }; - }; "@types/mdast-3.0.15" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; @@ -2568,15 +2541,6 @@ let sha512 = "LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ=="; }; }; - "@types/mdurl-2.0.0" = { - name = "_at_types_slash_mdurl"; - packageName = "@types/mdurl"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz"; - sha512 = "RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg=="; - }; - }; "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; @@ -3873,15 +3837,6 @@ let sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; "bmp-js-0.1.0" = { name = "bmp-js"; packageName = "bmp-js"; @@ -4494,15 +4449,6 @@ let sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; }; }; - "catharsis-0.9.0" = { - name = "catharsis"; - packageName = "catharsis"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz"; - sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; - }; - }; "ccount-2.0.1" = { name = "ccount"; packageName = "ccount"; @@ -6870,15 +6816,6 @@ let sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; - "escape-string-regexp-2.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; - }; - }; "escape-string-regexp-4.0.0" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -9633,15 +9570,6 @@ let sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; }; - "js2xmlparser-4.0.2" = { - name = "js2xmlparser"; - packageName = "js2xmlparser"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz"; - sha512 = "6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA=="; - }; - }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -10011,15 +9939,6 @@ let sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; }; - "klaw-3.0.0" = { - name = "klaw"; - packageName = "klaw"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; - sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; - }; - }; "kleur-4.1.5" = { name = "kleur"; packageName = "kleur"; @@ -10155,15 +10074,6 @@ let sha512 = "wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A=="; }; }; - "linkify-it-5.0.0" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz"; - sha512 = "5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ=="; - }; - }; "listr2-8.2.5" = { name = "listr2"; packageName = "listr2"; @@ -10767,24 +10677,6 @@ let sha512 = "CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="; }; }; - "markdown-it-14.1.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "14.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz"; - sha512 = "a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg=="; - }; - }; - "markdown-it-anchor-8.6.7" = { - name = "markdown-it-anchor"; - packageName = "markdown-it-anchor"; - version = "8.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz"; - sha512 = "FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA=="; - }; - }; "markdown-table-3.0.4" = { name = "markdown-table"; packageName = "markdown-table"; @@ -10794,15 +10686,6 @@ let sha512 = "wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw=="; }; }; - "marked-4.3.0" = { - name = "marked"; - packageName = "marked"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz"; - sha512 = "PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A=="; - }; - }; "math-intrinsics-1.1.0" = { name = "math-intrinsics"; packageName = "math-intrinsics"; @@ -11010,15 +10893,6 @@ let sha512 = "GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="; }; }; - "mdurl-2.0.0" = { - name = "mdurl"; - packageName = "mdurl"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz"; - sha512 = "Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="; - }; - }; "mem-8.1.1" = { name = "mem"; packageName = "mem"; @@ -13827,15 +13701,6 @@ let sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; - "punycode.js-2.3.1" = { - name = "punycode.js"; - packageName = "punycode.js"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz"; - sha512 = "uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA=="; - }; - }; "pupa-2.1.1" = { name = "pupa"; packageName = "pupa"; @@ -14493,15 +14358,6 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "requizzle-0.2.4" = { - name = "requizzle"; - packageName = "requizzle"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz"; - sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw=="; - }; - }; "reserved-words-0.1.2" = { name = "reserved-words"; packageName = "reserved-words"; @@ -16824,15 +16680,6 @@ let sha512 = "z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew=="; }; }; - "uc.micro-2.1.0" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz"; - sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; - }; - }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -16878,15 +16725,6 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "underscore-1.13.7" = { - name = "underscore"; - packageName = "underscore"; - version = "1.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz"; - sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="; - }; - }; "undici-5.28.4" = { name = "undici"; packageName = "undici"; @@ -18255,15 +18093,6 @@ let sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; }; }; - "xmlcreate-2.0.4" = { - name = "xmlcreate"; - packageName = "xmlcreate"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz"; - sha512 = "nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg=="; - }; - }; "xmlhttprequest-ssl-2.1.2" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; @@ -21839,55 +21668,6 @@ in bypassCache = true; reconstructLock = true; }; - jsdoc = nodeEnv.buildNodePackage { - name = "jsdoc"; - packageName = "jsdoc"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz"; - sha512 = "zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw=="; - }; - dependencies = [ - sources."@babel/helper-string-parser-7.25.9" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@babel/parser-7.26.10" - sources."@babel/types-7.26.10" - sources."@jsdoc/salty-0.2.9" - sources."@types/linkify-it-5.0.0" - sources."@types/markdown-it-14.1.2" - sources."@types/mdurl-2.0.0" - sources."argparse-2.0.1" - sources."bluebird-3.7.2" - sources."catharsis-0.9.0" - sources."entities-4.5.0" - sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.11" - sources."js2xmlparser-4.0.2" - sources."klaw-3.0.0" - sources."linkify-it-5.0.0" - sources."lodash-4.17.21" - sources."markdown-it-14.1.0" - sources."markdown-it-anchor-8.6.7" - sources."marked-4.3.0" - sources."mdurl-2.0.0" - sources."mkdirp-1.0.4" - sources."punycode.js-2.3.1" - sources."requizzle-0.2.4" - sources."strip-json-comments-3.1.1" - sources."uc.micro-2.1.0" - sources."underscore-1.13.7" - sources."xmlcreate-2.0.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "API documentation generator for JavaScript"; - homepage = "https://github.com/jsdoc/jsdoc#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -21942,24 +21722,6 @@ in bypassCache = true; reconstructLock = true; }; - mathjax = nodeEnv.buildNodePackage { - name = "mathjax"; - packageName = "mathjax"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz"; - sha512 = "Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Beautiful and accessible math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source "; - homepage = "https://github.com/mathjax/MathJax#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 539005aac186..649fcf6bb08d 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -18,13 +18,13 @@ buildDunePackage (finalAttrs: { pname = "dns"; - version = "10.2.2"; + version = "10.2.3"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz"; - hash = "sha256-USPXFn9fs6WrcM8LPMyWUInsRA3Aft6r+MBWjuc3p/A="; + hash = "sha256-yJWy0RLEqmDAmHoJ61nw2WAr2AT+z0EkeVvhbkqGc0o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/dockerfile/default.nix b/pkgs/development/ocaml-modules/dockerfile/default.nix index 7b738a49adfd..5ef6e3835ad6 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.3"; + version = "8.3.4"; src = fetchFromGitHub { owner = "ocurrent"; repo = "ocaml-dockerfile"; tag = finalAttrs.version; - hash = "sha256-F58KnC4YpsS0ehmi6efFMT+WG5BDuYfQOA1RsFVtO/8="; + hash = "sha256-q8yzuRkGVe/t0N0HFLFqOPNyvWSxf4WHApZVk1CG1qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 57df8a3f5232..cc458db986fa 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage, alcotest, graphql, - ocaml_lwt, + lwt, }: buildDunePackage { @@ -10,11 +10,9 @@ buildDunePackage { inherit (graphql) version src; - duneVersion = "3"; - propagatedBuildInputs = [ graphql - ocaml_lwt + lwt ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 9370117bcc10..f541c53ea100 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -4,7 +4,7 @@ lwt, logs, cstruct, - mirage-clock, + mirage-mtime, }: buildDunePackage { @@ -12,13 +12,11 @@ buildDunePackage { inherit (mirage-flow) version src; - duneVersion = "3"; - propagatedBuildInputs = [ lwt logs cstruct - mirage-clock + mirage-mtime mirage-flow ]; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index c1239ce00f25..6957aa3f0014 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -7,15 +7,13 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-flow"; - version = "4.0.2"; - - minimalOCamlVersion = "4.05"; + version = "5.0.0"; src = fetchurl { - url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-${version}.tbz"; - hash = "sha256-SGXj3S4b53O9JENUFuMl3I+QoiZ0QSrYu7zTet7q+1o="; + url = "https://github.com/mirage/mirage-flow/releases/download/v${finalAttrs.version}/mirage-flow-${finalAttrs.version}.tbz"; + hash = "sha256-N8p5yuDtmycLh3Eu3LOXpd7Eqzk1eygQfgDapshVMyM="; }; propagatedBuildInputs = [ @@ -30,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 3571676f395d..3bacb8f16123 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -3,7 +3,7 @@ fmt, logs, mirage-flow, - ocaml_lwt, + lwt, cstruct, alcotest, mirage-flow-combinators, @@ -14,18 +14,11 @@ buildDunePackage { inherit (mirage-flow) version src; - duneVersion = "3"; - - # Make tests compatible with alcotest 1.4.0 - postPatch = '' - substituteInPlace test/test.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' - ''; - propagatedBuildInputs = [ fmt logs mirage-flow - ocaml_lwt + lwt cstruct ]; diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix index e3539194e111..00dc61f326af 100644 --- a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -4,26 +4,22 @@ fetchurl, }: -buildDunePackage rec { - minimumOCamlVersion = "4.02.3"; - +buildDunePackage (finalAttrs: { pname = "ocaml-syntax-shims"; version = "1.0.0"; src = fetchurl { - url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9"; + url = "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/${finalAttrs.version}/ocaml-syntax-shims-${finalAttrs.version}.tbz"; + hash = "sha256-ibLhk+kKDBaLbsXd9v7wkDNoG9y2ThGRPJdECici6Mg="; }; - useDune2 = true; - doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims"; description = "Backport new syntax to older OCaml versions"; mainProgram = "ocaml-syntax-shims"; - license = licenses.mit; - maintainers = with maintainers; [ sternenseemann ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index eaf87e5684f8..ceffbbfb914f 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,27 +1,26 @@ { lib, - fetchFromGitHub, + fetchurl, buildDunePackage, + menhir, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "opam-file-format"; - version = "2.1.6"; + version = "2.2.0"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = pname; - rev = version; - sha256 = "sha256-Ka9pMYB99kM+5X7wf9F13gUrjouZucGevvkSY0TaXGg="; + src = fetchurl { + url = "https://github.com/ocaml/opam-file-format/releases/download/${finalAttrs.version}/opam-file-format-${finalAttrs.version}.tar.gz"; + hash = "sha256-SrU1Cw3L1EwFmrDFnYE2jzSvdwccDmXYHGpbm/ql6Ck="; }; - useDune2 = true; + nativeBuildInputs = [ menhir ]; - meta = with lib; { + meta = { description = "Parser and printer for the opam file syntax"; - license = licenses.lgpl21; - maintainers = with maintainers; [ vbgl ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ vbgl ]; homepage = "https://github.com/ocaml/opam-file-format/"; - changelog = "https://github.com/ocaml/opam-file-format/raw/${version}/CHANGES"; + changelog = "https://github.com/ocaml/opam-file-format/raw/${finalAttrs.version}/CHANGES"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/oui/default.nix b/pkgs/development/ocaml-modules/oui/default.nix index 98c9d2e12c73..61515bc7968d 100644 --- a/pkgs/development/ocaml-modules/oui/default.nix +++ b/pkgs/development/ocaml-modules/oui/default.nix @@ -15,15 +15,15 @@ buildDunePackage (finalAttrs: { pname = "oui"; - version = "0-unstable-2025-10-08"; + version = "0-unstable-2025-12-02"; - minimalOCamlVersion = "4.10"; + minimalOCamlVersion = "4.13"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-universal-installer"; - rev = "2fe2e33c3f8e1744fdd4dab04458043451bf9f62"; - hash = "sha256-ALQIQ3Ab1Gs2xST9OwsO5IxixzgKlUg7uHZvfHMbv7Q="; + rev = "202dae889c4850674f7b40ca8d541f98afa2ba0f"; + hash = "sha256-pwvp6bJF18NzKh/JSet05VHoJNZ7FKr0Hsi/RJ/TK4U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index cf0a68ef576a..b5c6020c5947 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -6,29 +6,25 @@ dune-configurator, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pcre"; - version = "8.0.4"; - - useDune2 = true; - - minimalOCamlVersion = "4.12"; + version = "8.0.5"; src = fetchurl { - url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz"; - sha256 = "sha256-CIoy3Co4YnVZ5AkEjkUarqV0u08ZAqU0IQsaL1SnuCA="; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/${finalAttrs.version}/pcre-${finalAttrs.version}.tbz"; + hash = "sha256-7ZvPiNeBdnrWp8BICv8J1YifL8UA3aDRYgoXhtTkRJA="; }; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ pcre ]; - meta = with lib; { + meta = { homepage = "https://mmottl.github.io/pcre-ocaml"; description = "Efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ vbmithr ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/prometheus/app.nix b/pkgs/development/ocaml-modules/prometheus/app.nix new file mode 100644 index 000000000000..4e21e1972e80 --- /dev/null +++ b/pkgs/development/ocaml-modules/prometheus/app.nix @@ -0,0 +1,47 @@ +{ + buildDunePackage, + prometheus, + asetmap, + astring, + cohttp-lwt, + cohttp-lwt-unix, + cmdliner, + fmt, + logs, + lwt, + re, + alcotest, + alcotest-lwt, +}: + +buildDunePackage { + pname = "prometheus-app"; + inherit (prometheus) + version + src + ; + + propagatedBuildInputs = [ + asetmap + astring + cmdliner + cohttp-lwt + cohttp-lwt-unix + fmt + logs + lwt + prometheus + re + ]; + + doCheck = true; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + meta = prometheus.meta // { + description = "A web-server reporting prometheus metrics."; + }; +} diff --git a/pkgs/development/ocaml-modules/prometheus/default.nix b/pkgs/development/ocaml-modules/prometheus/default.nix index 859043639858..93ebde2a443f 100644 --- a/pkgs/development/ocaml-modules/prometheus/default.nix +++ b/pkgs/development/ocaml-modules/prometheus/default.nix @@ -4,35 +4,31 @@ buildDunePackage, astring, asetmap, - fmt, re, lwt, - alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "prometheus"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://github.com/mirage/prometheus/releases/download/v${version}/prometheus-${version}.tbz"; - sha256 = "sha256-g2Q6ApprbecdFANO7i6U/v8dCHVcSkHVg9wVMKtVW8s="; + url = "https://github.com/mirage/prometheus/releases/download/v${finalAttrs.version}/prometheus-${finalAttrs.version}.tbz"; + hash = "sha256-4C0UzwaCgqtk5SGIY89rg0dxdrKm63lhdcOaQAa20L8="; }; - duneVersion = "3"; - propagatedBuildInputs = [ astring asetmap - fmt re lwt - alcotest ]; meta = { + homepage = "https://github.com/mirage/prometheus"; description = "Client library for Prometheus monitoring"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.ulrikstrid ]; + changelog = "https://raw.githubusercontent.com/mirage/prometheus/v${finalAttrs.version}/CHANGES.md"; }; -} +}) diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix index bd64ad0e9547..5abba9e3fad4 100644 --- a/pkgs/development/python-modules/actron-neo-api/default.nix +++ b/pkgs/development/python-modules/actron-neo-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "actron-neo-api"; - version = "0.1.84"; + version = "0.1.87"; pyproject = true; src = fetchFromGitHub { owner = "kclif9"; repo = "actronneoapi"; tag = "v${version}"; - hash = "sha256-ihIg264ZX0tCfRwVLkiq62ke2G125ObcrVabPCDrc4c="; + hash = "sha256-8Y1vl+KjjAnobb9wORZCcXTLStuGOth3dlX0Goq+pxE="; }; build-system = [ diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 4830eb75481c..7e637fa6c461 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -14,17 +14,17 @@ buildPythonPackage rec { pname = "aggdraw"; - version = "1.3.19"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "pytroll"; repo = "aggdraw"; - rev = "v${version}"; - hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA="; + tag = "v${version}"; + hash = "sha256-rBasRGdlM6/NsUd8+KsgHoZMsWhAhneSWjTeZ/QQZZ8="; }; - nativeBuildInputs = [ + build-system = [ packaging setuptools pkgconfig @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "High quality drawing interface for PIL"; homepage = "https://github.com/pytroll/aggdraw"; + changelog = "https://github.com/pytroll/aggdraw/blob/${src.tag}CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index 8be76a60d0b3..1adf0ba2249d 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "8.0.1"; + version = "10.0.0"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-q8wmBBXZSu69BAZ1wY4/tlW/usiWwlwVCnAEOOZs5TE="; + hash = "sha256-OS6qROAnH3JnlhAJJWevfLvMq5PQGL/lQM4XToqHZEU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 1e644bd325ba..05233f59e0e0 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "42.9.0"; + version = "42.10.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-wcDK84oAz+h8M0DEMpNxSq7/Un5AOfmdBtWueD8bfBo="; + hash = "sha256-My61UXXOe7YNuq7eBltXqXmX6OqnDWUk7HJofAgR2I8="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index b3f1b2d1fb51..10901fa9e15f 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -11,7 +11,6 @@ pytest-cov-stub, pytest-httpx, pytestCheckHook, - pythonOlder, setuptools, typer, uvicorn, @@ -19,16 +18,14 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.23.1"; + version = "0.24.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-66VT0+eHJ0Z1Q3aYNmBs1DRmaQBCUbVk3XrfJzGFj5E="; + hash = "sha256-mFUSrkVziN+A980w24ZupGLld5g4YG/6A4qa+Cpwe4Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index 30ee6d4f2316..15af58fac398 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; tag = "v${version}"; - hash = "sha256-J0G0vRFkYZDDVBYxd4Dc/tSZJ991H1F2Acsew0zf9Oo="; + hash = "sha256-sz/8b0iTtvS4RPBJynvGKf5oiRPJ9Lu/z6leZ1Hoqns="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioonkyo/default.nix b/pkgs/development/python-modules/aioonkyo/default.nix index a19c17d9d008..577401cb3c67 100644 --- a/pkgs/development/python-modules/aioonkyo/default.nix +++ b/pkgs/development/python-modules/aioonkyo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioonkyo"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "arturpragacz"; repo = "aioonkyo"; tag = version; - hash = "sha256-xGSvwfCwWfWHZTl4+Uf+vgI5JkjeO5affbURqpLsCuk="; + hash = "sha256-hLtyQWChWBddefDUT/+7e/w6i/DPEm/zw+EqOPgGsUI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 73b44e34abd1..23961641d9f7 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.22.0"; + version = "13.23.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-SrnmEh+Re/DM3IM5rn/80D/ZqJeeWsn3kPtBJTGrYl0="; + hash = "sha256-qjFxEKA6tSMYmGMV3Hx1GWEZ2BlRVi9SWSyp9djwTXU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index b625e4777b7f..47f54c0f1c20 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "4.0.2"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cole"; repo = "aiosmtplib"; tag = "v${version}"; - hash = "sha256-LpD2bSgpClUpNguZaRy11WEwQviiCjqMJlRl6CRp50o="; + hash = "sha256-ICG7yVH2UcvQAsVGbxu7LibWUj/NEPV/f5iDc25XuzU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 10f676f7b721..89b92f988449 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -14,25 +14,22 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, - pythonOlder, requests, uvicorn, }: buildPythonPackage rec { pname = "aiosonic"; - version = "0.26.0"; + version = "0.30.1"; pyproject = true; - disabled = pythonOlder "3.8"; - __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "sonic182"; repo = "aiosonic"; tag = version; - hash = "sha256-sYd7qjOiRENO6hPhJ01RLsr+2RtTITrXjcT6/ZaGfAU="; + hash = "sha256-VqtPl/dZmxjB7z9AjwBfmYmcxFae2NhWEnsw4l9+IYg="; }; postPatch = '' @@ -119,6 +116,11 @@ buildPythonPackage rec { "test_proxy_request" ]; + disabledTestPaths = [ + # tests hang + "tests/test_sse.py" + ]; + meta = { changelog = "https://github.com/sonic182/aiosonic/blob/${src.tag}/CHANGELOG.md"; description = "Very fast Python asyncio http client"; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 1c233d8f9f2c..990d249e4e95 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -3,7 +3,9 @@ buildPythonPackage, fetchFromGitHub, pg8000, + psycopg, pytest-asyncio, + pytest-postgresql, pytestCheckHook, pythonOlder, setuptools, @@ -14,21 +16,19 @@ buildPythonPackage rec { pname = "aiosql"; - version = "13.4"; + version = "14.1"; pyproject = true; - disabled = pythonOlder "3.8"; - outputs = [ - "doc" "out" + "doc" ]; src = fetchFromGitHub { owner = "nackjicholson"; repo = "aiosql"; tag = version; - hash = "sha256-a3pRzcDMXdaDs0ub6k5bPRwnk+RCbxZ7ceIt8/fMSPg="; + hash = "sha256-BNsjVVyYRfp3sNdzQwHy9nQveP2AHfXGK10DLybat9I="; }; sphinxRoot = "docs/source"; @@ -40,10 +40,11 @@ buildPythonPackage rec { sphinxHook ]; - propagatedBuildInputs = [ pg8000 ]; - nativeCheckInputs = [ + pg8000 + psycopg pytest-asyncio + pytest-postgresql pytestCheckHook ]; diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix index e247c3b3f018..25b6a47366a8 100644 --- a/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { description = "Algebraic data types for Python"; homepage = "https://github.com/jspahrsummers/adt"; license = licenses.mit; - maintainers = with maintainers; [ uri-canva ]; }; } diff --git a/pkgs/development/python-modules/altgraph/default.nix b/pkgs/development/python-modules/altgraph/default.nix index 7c8d02bdf615..441c1b99b722 100644 --- a/pkgs/development/python-modules/altgraph/default.nix +++ b/pkgs/development/python-modules/altgraph/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "altgraph"; - version = "0.17.4"; + version = "0.17.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; + hash = "sha256-yHs5XdEvq96cmVc6l0nWfajSnvneASXH9TZpm0qbyec="; }; dependencies = [ diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 3e3bb16f84a6..de2a7f1f76f5 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "25.11.0"; + version = "25.12.0"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-UzrZOUWKeU/4tnc7o5JQqNKsFcLhCKVwXT+2hZXXcbw="; + hash = "sha256-nn0NKX6rqNKrSZd+p/oq/LmESAgvTkSOA08wq1xLY2I="; }; build-system = [ @@ -86,6 +86,6 @@ buildPythonPackage rec { homepage = "https://github.com/ansible/ansible-compat"; changelog = "https://github.com/ansible/ansible-compat/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dawidd6 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index fd96ee93aaa1..21e9d4c6d787 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -32,9 +32,7 @@ buildPythonPackage rec { pname = "ansible-core"; - # IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix - # There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here - version = "2.19.4"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -43,7 +41,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "ansible"; tag = "v${version}"; - hash = "sha256-TjafUlPKuxpXrfREK65D88SoGThGBzpbfCHr0ZkviI0="; + hash = "sha256-4kTBzDHDfdHR/W4edxrGtWhg6TRLMtdEgUZYcn8cFQg="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix index 4d5da8a1c5c3..f68c6e73e8f4 100644 --- a/pkgs/development/python-modules/approval-utilities/default.nix +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -11,9 +11,10 @@ buildPythonPackage { inherit (approvaltests) version src; pyproject = true; - postPatch = approvaltests.postPatch or "" + '' - mv setup.approval_utilities.py setup.py - ''; + postPatch = '' + mv setup/setup.approval_utilities.py setup.py + '' + + approvaltests.postPatch or ""; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index dac819f912b2..7d737d062646 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -20,21 +20,25 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "15.3.2"; + version = "16.1.0"; pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y="; + hash = "sha256-9zBpq4/jAH441eeMMV2WS767Rz+1qCX/QIfbToUHnAQ="; }; postPatch = '' + test -f setup.py || mv setup/setup.py . + touch setup/__init__.py + substituteInPlace setup.py \ + --replace-fail "from setup_utils" "from setup.setup_utils" + echo 'version_number = "${version}"' > version.py - mv .github approvaltests approval_utilities tests setup - cd setup - rm setup.cfg + + patchShebangs internal_documentation/scripts ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/apykuma/default.nix b/pkgs/development/python-modules/apykuma/default.nix index bf1e35f08dcb..e6222c640d42 100644 --- a/pkgs/development/python-modules/apykuma/default.nix +++ b/pkgs/development/python-modules/apykuma/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/PerchunPak/apykuma"; changelog = "https://github.com/PerchunPak/apykuma/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index bf52312777c5..f4d804ab8731 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -11,10 +11,10 @@ buildPythonPackage rec { pname = "array-record"; - version = "0.8.1"; + version = "0.8.3"; format = "wheel"; - disabled = pythonOlder "3.10" || pythonAtLeast "3.14"; + disabled = pythonOlder "3.11" || pythonAtLeast "3.15"; src = let @@ -29,9 +29,10 @@ buildPythonPackage rec { platform = "manylinux2014_x86_64.manylinux_2_17_x86_64"; hash = { - cp311 = "sha256-CQ2ChYqTHjdU4QYvXGLCCudk8+XyTnnqkFQ5OAQ4Oo0="; - cp312 = "sha256-AF+29PToM7LeHE5RxiCtajCok7RtwWgDnZuzG3FGYHA="; - cp313 = "sha256-N7uALh/cmO22CoWVUsfn1JThQc85C/tzUKz9Y0Z9rq4="; + cp311 = "sha256-9ABPzOt5YaLMAJACjmij7rkdP1s4wA1gtTP3AE0dP3s="; + cp312 = "sha256-RY9mWN6GyTabI//mTcsxOTqRm5GuLxUUfuK+sgELEio="; + cp313 = "sha256-E98a7Js4r+mJc79f489SP4PKkEsEI9hTGZMIdxRbjyg="; + cp314 = "sha256-idLPX0cJvjxsKzDA02YAUiM3VjP/zmbcsT2SegvcUig="; } .${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; diff --git a/pkgs/development/python-modules/asusrouter/default.nix b/pkgs/development/python-modules/asusrouter/default.nix index 85344c68253c..fffac4b05163 100644 --- a/pkgs/development/python-modules/asusrouter/default.nix +++ b/pkgs/development/python-modules/asusrouter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "asusrouter"; - version = "1.21.0"; + version = "1.21.1"; pyproject = true; src = fetchFromGitHub { owner = "Vaskivskyi"; repo = "asusrouter"; tag = version; - hash = "sha256-SMQ1jEEMRngl0idWXi7R7KinxR9NnH39vB/itVi7A4A="; + hash = "sha256-y7qJOwKPbVadaiOPyQ7JSrZeOgMDlurONLSvDLauuLI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/asyncer/default.nix b/pkgs/development/python-modules/asyncer/default.nix index 6047204329b7..db2a6b3b3ddf 100644 --- a/pkgs/development/python-modules/asyncer/default.nix +++ b/pkgs/development/python-modules/asyncer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncer"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "asyncer"; tag = version; - hash = "sha256-LjQOhcnCwM4Vcw+lBq6bexPYewRuhkU/R/pkDTEVHWQ="; + hash = "sha256-Akp76yZKkI/LRJH/tdLMviIB1tcfsLay7l0pCbvZThk="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 55aefcb1db0c..8e943f23357f 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/atom"; changelog = "https://github.com/nucleic/atom/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix index 0ceac6eae01e..b9a1c4b24b9b 100644 --- a/pkgs/development/python-modules/atproto/default.nix +++ b/pkgs/development/python-modules/atproto/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "atproto"; - version = "0.0.62"; + version = "0.0.63"; format = "pyproject"; # use GitHub, pypi does not include tests @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "MarshalX"; repo = "atproto"; tag = "v${version}"; - hash = "sha256-T1Jdg62fSV+5qC486Agsuk6qrDhGSNHq75uvOyvOwpA="; + hash = "sha256-ECqBlvKa0DK96AM0yJNuw2mq0SvZohPHFgxJ2jVHZ5s="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index 742bcf09c4d0..c2503316d3bb 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "6.4.2"; + version = "6.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-t6Ya/JGDtrXGYd5ZylhvnHIARFpAnFjN8gSdb3FjbVE="; + hash = "sha256-T7y9WFQFS7HdeHDbA3J7hxuWsYFH21cllWHAWGA5h9c="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index fd6cebfe657c..ecd33ab50f7a 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -11,6 +11,7 @@ mock, pytest-asyncio, pytestCheckHook, + python-multipart, pythonOlder, requests, setuptools, @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.6.3"; + version = "1.6.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-AzIjfUH89tYZwVnOpdSwEzaGNpedfQ50k9diKUfH+Fg="; + hash = "sha256-lz2cPqag6lZ9PXb3O/SV4buIPDDzhI71/teqWHLG+vE="; }; build-system = [ setuptools ]; @@ -46,6 +47,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook + python-multipart requests starlette werkzeug diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index dcb2884f4844..d5460d814e8d 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/venth/aws-adfs"; changelog = "https://github.com/venth/aws-adfs/releases/tag/${src.tag}"; license = licenses.psfl; - maintainers = with maintainers; [ bhipple ]; mainProgram = "aws-adfs"; }; } diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index b28894a6c475..a23d82403998 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.29.1"; + version = "0.29.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-j8MEr19vg+fnMJb7QutR1Khfp6kEVkZu8ihyCV1MpG8="; + hash = "sha256-x42BsTCNQv2h6yHSf88mV5E3uCEEPlKFUPLPxsCauf8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 61075e86b880..57bd7fff1ceb 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.14.2"; + version = "7.14.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_servicebus"; inherit version; - hash = "sha256-QBS3rIguDZ/4dqMwKBhgfhpkC5Pp1IIHPWOfWwQmblw="; + hash = "sha256-cKYzhFV67AvucndA57Jd7Snp5wG3dhF2RXf9dAI4lAI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix index cbcce0a60d9c..fb1c6ef011f0 100644 --- a/pkgs/development/python-modules/backrefs/default.nix +++ b/pkgs/development/python-modules/backrefs/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "backrefs"; - version = "6.0.1"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "backrefs"; tag = version; - hash = "sha256-7kB8z8pNU6eLuz4eSYXkSDL5npowlYsm0hjjh8zcAK0="; + hash = "sha256-MeQsEKHIB7WnITMUtRP4vLLr2DjvrorKHKWxgd07qko="; }; build-system = [ diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix index f71c4c195fc8..8b014288cd0b 100644 --- a/pkgs/development/python-modules/basedmypy/default.nix +++ b/pkgs/development/python-modules/basedmypy/default.nix @@ -140,6 +140,6 @@ buildPythonPackage rec { changelog = "https://github.com/KotlinIsland/basedmypy/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "mypy"; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/basedtyping/default.nix b/pkgs/development/python-modules/basedtyping/default.nix index 63f3359ada54..8309ac503752 100644 --- a/pkgs/development/python-modules/basedtyping/default.nix +++ b/pkgs/development/python-modules/basedtyping/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/KotlinIsland/basedtyping"; changelog = "https://github.com/KotlinIsland/basedtyping/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 0e405eb970be..f422d509e471 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.47.2"; + version = "0.48.0"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-1gWmXrRCYmU0VemhW5TCn1/rnOmz07q8bQ6W3a2mXro="; + hash = "sha256-KZ4VmtHQnQ+t9q/ZtzmlObpnBIxlgkT44nt11f/1FpQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index a3a34d2ca910..b1db00398b2b 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -8,6 +8,8 @@ libiconv, }: +# r-ryantm wants to downgrade +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "biliass"; version = "2.3.1"; diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index 90d6b92443e7..a5d69d47e235 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "binsync"; - version = "5.7.11"; + version = "5.8.0"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "binsync"; tag = "v${version}"; - hash = "sha256-Rn5ytC7j8HI64NQhvV4QjjBWDeYNkINJGUWDmZ7nQ3w="; + hash = "sha256-AF5V1MBhWQQNtmwWZT1oT0CLj0impP4zqBTM5IHwzcI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix index ea8e22a52cc6..4d7c00430a9c 100644 --- a/pkgs/development/python-modules/bip32/default.nix +++ b/pkgs/development/python-modules/bip32/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bip32"; - version = "3.4"; + version = "5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "darosior"; repo = "python-bip32"; rev = version; - hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE="; + hash = "sha256-QO1gS9bx/eQPaLuB1ZNZuXj4DmeO4/La2hG9NCXjd+4="; }; pythonRelaxDeps = [ "coincurve" ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index ba990aceb186..d685d1563756 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/ilanschnell/bitarray"; changelog = "https://github.com/ilanschnell/bitarray/raw/${version}/CHANGE_LOG"; license = licenses.psfl; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 290aa1913b81..36decbb1bef3 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "6.2.0"; + version = "6.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ej6JQRi4pZn9gNPsGm1Mx85OWIKxMXp+G6abVulfmR8="; + hash = "sha256-bzuRscCgK7mni1pFTJJQaqD98Zfh1eEU0uAMb2QwbSI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 8fd97203fc4e..7a00dac08740 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, async-timeout, bluez, buildPythonPackage, @@ -10,6 +11,9 @@ pytestCheckHook, pythonOlder, typing-extensions, + pyobjc-core, + pyobjc-framework-CoreBluetooth, + pyobjc-framework-libdispatch, }: buildPythonPackage rec { @@ -26,7 +30,7 @@ buildPythonPackage rec { hash = "sha256-z0Mxr1pUQWNEK01PKMV/CzpW+GeCRcv/+9BADts1FuU="; }; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # bleak checks BlueZ's version with a call to `bluetoothctl --version` substituteInPlace bleak/backends/bluezdbus/version.py \ --replace-fail \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" @@ -35,7 +39,16 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + pyobjc-core + pyobjc-framework-CoreBluetooth + pyobjc-framework-libdispatch + ] + ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ @@ -54,7 +67,7 @@ buildPythonPackage rec { homepage = "https://github.com/hbldh/bleak"; changelog = "https://github.com/hbldh/bleak/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix index a92ed1b08aca..4d6cf2ca2a29 100644 --- a/pkgs/development/python-modules/bluecurrent-api/default.nix +++ b/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluecurrent-api"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluecurrent"; repo = "HomeAssistantAPI"; tag = "v${version}"; - hash = "sha256-a0IqtRj761h1P8Q3xrFY1XPFl6J6HaArv6IfO88OJco="; + hash = "sha256-px4kZOvMUP5aGOQ1uxWnY6w77Woie/hVVdyylW8uSX4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 9be9a91d1d57..190536103055 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.41.5"; + version = "1.42.4"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-UUokKCFHdgrx7G+QNcLEUckceIF9GEV8UNhB7lLaoIg="; + hash = "sha256-xsKFPlGz0zD+mGL/qjjgBL7egkfnnZeom+oJ340MNgg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index f1fabd52389e..fe670420f369 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.41.6"; + version = "1.42.4"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-K1NXTE6k+NWIflFu8iCLmW/ZiPwqYT9nbqkURZfyDNI="; + hash = "sha256-W45jofYoAJRdzIJFFPoEZfeK0sj+elkrWfd8oZ8aoQs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 8e25d0bd94d2..9213248b67cb 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "btrees"; - version = "6.2"; + version = "6.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SnxwN2aEfrD6tYrpudacyAWIy/1uNFcrur1FU+B5/is="; + hash = "sha256-Fga9/6erKMaACYRUC2le7oSPbhWwFF2Fj/SwxiZOjtI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index bbff613096a2..e6835896bd1a 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,11 +1,15 @@ { lib, buildPythonPackage, + dnspython, fetchFromGitHub, icalendar, + icalendar-searcher, lxml, + manuel, pytestCheckHook, python, + radicale, recurring-ical-events, requests, hatchling, @@ -21,14 +25,14 @@ buildPythonPackage rec { pname = "caldav"; - version = "2.0.1"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-n7ZKTBXg66firbS34J41NrTM/PL/OrKMnS4iguRz4Ho="; + hash = "sha256-FsIF4BcwAUyYw8J7o4j4CnSd8eIc1Yd5WtxErC6RZ7Y="; }; build-system = [ @@ -37,25 +41,29 @@ buildPythonPackage rec { ]; dependencies = [ - vobject + dnspython lxml requests icalendar + icalendar-searcher recurring-ical-events ]; nativeCheckInputs = [ + manuel proxy-py pyfakefs pytestCheckHook + (toPythonModule (radicale.override { python3 = python; })) tzlocal - (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) + vobject writableTmpDirAsHomeHook + (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) ]; - disabledTestPaths = [ - "tests/test_docs.py" - "tests/test_examples.py" + disabledTests = [ + # test contacts CalDAV servers on the internet + "test_rfc8764_test_conf" ]; pythonImportsCheck = [ "caldav" ]; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index a3a2bf11142d..cf2f1a59990b 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "cantools"; - version = "41.0.1"; + version = "41.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WycDUgKJuRFR5fPFT8wBxoijgrqDqjf6RnQxV4Pl8uk="; + hash = "sha256-XJGmbl4DpKxXJ/ICB98dpWgXSKFUwryF71Mv754BCdE="; }; build-system = [ diff --git a/pkgs/development/python-modules/celery-batches/default.nix b/pkgs/development/python-modules/celery-batches/default.nix index 7a6893fc0749..e129dcf10248 100644 --- a/pkgs/development/python-modules/celery-batches/default.nix +++ b/pkgs/development/python-modules/celery-batches/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ + # https://github.com/clokep/celery-batches/pull/100 + "celery" + ]; + dependencies = [ celery ]; # requires a running celery diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index ab0889594166..0dbddb329633 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -10,6 +10,7 @@ click-repl, click, cryptography, + exceptiongroup, fetchFromGitHub, gevent, google-cloud-firestore, @@ -29,6 +30,7 @@ python-dateutil, pyyaml, setuptools, + tzlocal, vine, # The AMQP REPL depends on click-repl, which is incompatible with our version # of click. @@ -37,14 +39,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.5.3"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "celery"; repo = "celery"; tag = "v${version}"; - hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w="; + hash = "sha256-BKF+p35Z5r/WRjuOaSFtESkbo+N+tbd0R40EWl0iU9I="; }; patches = lib.optionals (!withAmqpRepl) [ @@ -58,8 +60,10 @@ buildPythonPackage rec { click click-didyoumean click-plugins + exceptiongroup kombu python-dateutil + tzlocal vine ] ++ lib.optionals withAmqpRepl [ @@ -108,6 +112,7 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + "test_uses_utc_timezone" # seems to only fail on higher core counts # AssertionError: assert 3 == 0 "test_setup_security_disabled_serializers" @@ -133,7 +138,7 @@ buildPythonPackage rec { meta = { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; - changelog = "https://github.com/celery/celery/releases/tag/v${version}"; + changelog = "https://github.com/celery/celery/blob/${src.tag}/Changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "celery"; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index b448def48013..2e5a5bf16390 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.4.0"; + version = "3.4.0.post5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = "cheetah3"; tag = version; - hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI="; + hash = "sha256-qWV6ncSe4JbGZD7sLc/kEXY1pUM1II24UgsS/zX872Y="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix index 2d697adc97f2..6ebdbe142851 100644 --- a/pkgs/development/python-modules/click-command-tree/default.nix +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -30,6 +30,5 @@ buildPythonPackage rec { description = "Click plugin to show the command tree of your CLI"; homepage = "https://github.com/whwright/click-command-tree"; license = licenses.mit; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 237fa9cc886b..0c5b3b3c1152 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.21"; + version = "2.0.22"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-tReoNsSg90wReH/SVa2LAdy5q7DCnWJwnamisPkIuXs="; + hash = "sha256-FZcDjrK5+oHC3dVBSXf+txW6hofP6OkmkjO4NJF05YQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmake/default.nix b/pkgs/development/python-modules/cmake/default.nix index 312b634161f5..44211597c026 100644 --- a/pkgs/development/python-modules/cmake/default.nix +++ b/pkgs/development/python-modules/cmake/default.nix @@ -35,6 +35,5 @@ buildPythonPackage { ''; homepage = "https://github.com/scikit-build/cmake-python-distributions"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 8df2b0f42f91..f69e6f81827c 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; # pypi source doesn't include tests @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cocotb"; repo = "cocotb"; tag = "v${version}"; - hash = "sha256-BpshczKA83ZeytGDrHEg6IAbI5FxciAUnzwE10hgPC0="; + hash = "sha256-LXQNqFlvP+WBaDGWPs5+BXBtW2dhDu+v+7lR/AMG21M="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index d459e1c6342d..c50db9a69826 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.129.2"; + version = "1.129.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lzjJfIQbEZjrjf4GClkgaW+r4yl34uvCudgt7DK4Y8w="; + hash = "sha256-r1Y6SfU2sfEISYWh7raAXGyT/hcHoGAs0oF92uVkT54="; }; build-system = [ diff --git a/pkgs/development/python-modules/colbert-ai/default.nix b/pkgs/development/python-modules/colbert-ai/default.nix index 5b4ebfdeb2c4..1acc4f3ef12a 100644 --- a/pkgs/development/python-modules/colbert-ai/default.nix +++ b/pkgs/development/python-modules/colbert-ai/default.nix @@ -23,26 +23,15 @@ buildPythonPackage rec { pname = "colbert-ai"; - version = "0.2.21"; + version = "0.2.22"; pyproject = true; src = fetchPypi { inherit version; pname = "colbert_ai"; - hash = "sha256-qNb9tOInLysI7Tf45QlgchYNhBXR5AWFdRiYt35iW6s="; + hash = "sha256-AK/P711xXw06cGvpDStbdKK7fEAgc4B861UVwAJqiIY="; }; - # ImportError: cannot import name 'AdamW' from 'transformers' - # https://github.com/stanford-futuredata/ColBERT/pull/390 - postPatch = '' - substituteInPlace colbert/training/training.py \ - --replace-fail \ - "from transformers import AdamW, get_linear_schedule_with_warmup" \ - "from transformers import get_linear_schedule_with_warmup; from torch.optim import AdamW" - ''; - - pythonRemoveDeps = [ "git-python" ]; - build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/coloraide/default.nix b/pkgs/development/python-modules/coloraide/default.nix index bba8d188d903..556ccb3fc3cb 100644 --- a/pkgs/development/python-modules/coloraide/default.nix +++ b/pkgs/development/python-modules/coloraide/default.nix @@ -1,21 +1,24 @@ { - lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, hatchling, + lib, + pytestCheckHook, typing-extensions, }: let - pname = "coloraide"; - version = "5.1"; + version = "6.1"; in buildPythonPackage { - inherit pname version; + pname = "coloraide"; + inherit version; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-DfBmpjbb2EgZgfrEkCQNPtkGtANDx8AXErPfVC8rJ1A="; + src = fetchFromGitHub { + owner = "facelessuser"; + repo = "coloraide"; + tag = version; + hash = "sha256-hsuFouesw4B9rr17NCQVB6LyYUdNRm9Cj2Cqj+MdLkc="; }; build-system = [ @@ -30,12 +33,17 @@ buildPythonPackage { "coloraide" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = { - description = "Color library for Python"; - homepage = "https://pypi.org/project/coloraide/"; + description = "Library to aid in using colors"; + homepage = "https://github.com/facelessuser/coloraide"; license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years + lib.maintainers.djacu ]; }; } diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix index 41b7b6f3e0a7..19f6890bb191 100644 --- a/pkgs/development/python-modules/colorful/default.nix +++ b/pkgs/development/python-modules/colorful/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "colorful"; - version = "0.5.7"; + version = "0.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "timofurrer"; repo = "colorful"; tag = "v${version}"; - hash = "sha256-iJ63Txn8wbZFlBrplTiHfkMfrCZfXxqlPRQgaMrwHCo="; + hash = "sha256-nztVTfBimRDXwPYk3LNMZKa1ItbgqM2ukgZs8hI8TwE="; }; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,6 +29,9 @@ buildPythonPackage rec { homepage = "https://github.com/timofurrer/colorful"; changelog = "https://github.com/timofurrer/colorful/releases/tag/${src.tag}"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ + kalbasit + l33tname + ]; }; } diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix index 79de2d7596fd..6e453e9488e7 100644 --- a/pkgs/development/python-modules/compressai/default.nix +++ b/pkgs/development/python-modules/compressai/default.nix @@ -10,14 +10,17 @@ # dependencies einops, - numpy, matplotlib, + numpy, pandas, pytorch-msssim, scipy, + tomli, torch, torch-geometric, torchvision, + tqdm, + typing-extensions, # optional-dependencies ipywidgets, @@ -30,14 +33,14 @@ buildPythonPackage rec { pname = "compressai"; - version = "1.2.6"; + version = "1.2.8"; pyproject = true; src = fetchFromGitHub { owner = "InterDigitalInc"; repo = "CompressAI"; tag = "v${version}"; - hash = "sha256-xvzhhLn0iBzq3h1nro8/83QWEQe9K4zRa3RSZk+hy3Y="; + hash = "sha256-Fgobh7Q1rKomcqAT4kJl2RsM1W13ErO8sFB2urCqrCk="; fetchSubmodules = true; }; @@ -46,16 +49,22 @@ buildPythonPackage rec { setuptools ]; + pythonRelaxDeps = [ + "numpy" + ]; dependencies = [ einops - numpy matplotlib + numpy pandas pytorch-msssim scipy + tomli torch torch-geometric torchvision + tqdm + typing-extensions ]; optional-dependencies = { @@ -70,11 +79,9 @@ buildPythonPackage rec { "compressai._CXX" ]; + # We have to delete the source because otherwise it is used intead the installed package. preCheck = '' - # We have to delete the source because otherwise it is used intead the installed package. rm -rf compressai - - export HOME=$(mktemp -d) ''; nativeCheckInputs = [ @@ -91,6 +98,7 @@ buildPythonPackage rec { "test_pretrained" # Flaky (AssertionError: assert 0.08889999999999998 < 0.064445) + "test_compiling" "test_find_close" ]; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 98f5b7f6b5dc..f4947ed4b438 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -1,34 +1,122 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch, + setuptools, requests, - six, - pytest, + pythonOlder, + pytestCheckHook, + aiohttp, + pytest-asyncio, + pytest-cov-stub, + python, + docker, }: buildPythonPackage rec { - pname = "python-consul"; - version = "1.1.0"; - format = "setuptools"; + pname = "py-consul"; + version = "1.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "168f1fa53948047effe4f14d53fc1dab50192e2a2cf7855703f126f469ea11f4"; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "criteo"; + repo = "py-consul"; + tag = "v${version}"; + hash = "sha256-kNIFpY8rXdfGmaW2GAq7SvjK+4ahgaFnyXEqcUrXoEs="; }; - buildInputs = [ - requests - six - pytest + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/python-team/packages/python-consul/-/raw/master/debian/patches/avoir-usr-requirements.txt.patch"; + hash = "sha256-lB9Irzuc2IpbQOIP/C3JQ4iYqugf1U6CVlAEXrrFUfI="; + }) ]; - # No tests distributed. https://github.com/cablehead/python-consul/issues/133 - doCheck = false; + build-system = [ + setuptools + ]; + + dependencies = [ + requests + aiohttp + ]; + + # Exclude sphinx config from installation + postInstall = '' + rm -r $out/${python.sitePackages}/docs + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-cov-stub + docker + ]; + + # Most tests want to run a consul docker container ("hashicorp/consul:{version}" in conftest.py) + # See also https://salsa.debian.org/python-team/packages/python-consul/-/blob/936c1d9ce3acaac3fa2b6e9384102e843adbbe0b/debian/rules + disabledTests = [ + "test_acl_token_permission_denied" + "test_acl_token_list" + "test_acl_token_read" + "test_acl_token_create" + "test_acl_token_clone" + "test_acl_token_update" + "test_acl_policy_list" + "test_acl_policy_read" + "test_agent_checks" + "test_service_multi_check" + "test_service_dereg_issue_156" + "test_agent_checks_service_id" + "test_agent_register_check_no_service_id" + "test_agent_register_enable_tag_override" + "test_agent_service_maintenance" + "test_agent_node_maintenance" + "test_agent_members" + "test_agent_self" + "test_agent_services" + "test_coordinate" + "test_event" + "test_event_targeted" + "test_health_service" + "test_health_state" + "test_health_service" + "test_health_state" + "test_health_node" + "test_health_checks" + "test_kv" + "test_kv_wait" + "test_kv_encoding" + "test_kv_put_cas" + "test_kv_put_flags" + "test_kv_recurse" + "test_kv_delete" + "test_kv_delete_cas" + "test_kv_acquire_release" + "test_kv_keys_only" + "test_kv_acquire_release" + "test_kv_keys_only" + "test_operator" + "test_session" + "test_session_delete_ttl_renew" + "test_status_leader" + "test_status_peers" + "test_transaction" + "test_consul_ctor" + "test_acl_token_delete" + ]; + + pythonImportsCheck = [ "consul" ]; meta = with lib; { description = "Python client for Consul (https://www.consul.io/)"; - homepage = "https://github.com/cablehead/python-consul"; + homepage = "https://github.com/criteo/py-consul"; license = licenses.mit; + maintainers = with maintainers; [ + panicgh + ]; }; } diff --git a/pkgs/development/python-modules/country-list/default.nix b/pkgs/development/python-modules/country-list/default.nix new file mode 100644 index 000000000000..8e4ee9ab6d95 --- /dev/null +++ b/pkgs/development/python-modules/country-list/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "country-list"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bulv1ne"; + repo = "country_list"; + tag = "v${version}"; + hash = "sha256-jG2AC8c6mgWjHVBX7XW021PLPliLTwEBkN6+HSecfL4="; + fetchSubmodules = true; + }; + + build-system = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "country_list" + ]; + + meta = { + description = "List of all countries with names and ISO 3166-1 codes in all languages"; + homepage = "https://github.com/bulv1ne/country_list"; + changelog = "https://github.com/bulv1ne/country_list/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/countryguess/default.nix b/pkgs/development/python-modules/countryguess/default.nix index 3b9fb18d34d2..dab183ec48e7 100644 --- a/pkgs/development/python-modules/countryguess/default.nix +++ b/pkgs/development/python-modules/countryguess/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "countryguess"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; src = fetchFromGitea { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "plotski"; repo = "countryguess"; tag = "v${version}"; - hash = "sha256-yZyEOFXwbaYAIDl6LoHkwoqlhVzqShY8ZXPasB6unQ8="; + hash = "sha256-XP84p9zX9dKhNaTPLmSQrYdYmPjym+m3EZL5A8AbgfM="; }; build-system = [ diff --git a/pkgs/development/python-modules/cron-converter/default.nix b/pkgs/development/python-modules/cron-converter/default.nix index 188f4028162a..64622f735215 100644 --- a/pkgs/development/python-modules/cron-converter/default.nix +++ b/pkgs/development/python-modules/cron-converter/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "cron-converter"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Sonic0"; repo = pname; rev = "v${version}"; - hash = "sha256-o5rqzOP1svAMj0R6qhMui3uYgyEJEGQOaA8cy5U77hk="; + hash = "sha256-zNDEBckvSwnqBfNyh5Gv7ICOsPaSx2NKl92ZlyDfukw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 44cb281c3714..f14894abc9db 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.10"; + version = "0.3.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; tag = version; - hash = "sha256-K8s/ocvja3ae8AOw3N8JFVYmrn5QSCzXkGG6Z3V59IE="; + hash = "sha256-NVAIVUfh1bizg/HG1z7Ze6o5w6wto744Ogq0LPg0gXg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cs50/default.nix b/pkgs/development/python-modules/cs50/default.nix new file mode 100644 index 000000000000..9159e9707599 --- /dev/null +++ b/pkgs/development/python-modules/cs50/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flask, + packaging, + setuptools, + sqlalchemy, + sqlparse, + termcolor, + wheel, +}: + +buildPythonPackage rec { + pname = "cs50"; + version = "9.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cs50"; + repo = "python-cs50"; + tag = "v${version}"; + hash = "sha256-g7ws5ikzLt2ciS0QTPTJDRAqePyYPDCYIpJuwnWHJNQ="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + flask + packaging + sqlalchemy + sqlparse + termcolor + ]; + + # Tests require docker containers, which are pulled from the internet. + pythonImportsCheck = [ "cs50" ]; + + meta = { + description = "CS50 Library for Python"; + homepage = "https://github.com/cs50/python-cs50/"; + changelog = "https://github.com/cs50/python-cs50/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + amadejkastelic + ethancedwards8 + ]; + }; +} diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index a5a5f32c6584..59158e100072 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { standard library and on the strengths of Python as a high-level programming language. ''; - maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 92f82f16877d..14f5d0a0458b 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.7.4"; + version = "1.7.5"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; tag = "v${version}"; - hash = "sha256-z/3ErQbYxO4OiJv2AgtuRqtf4zOu/UZxrIcREdG43Hw="; + hash = "sha256-ze9znWob/Asba20AVpNeVCuz7UayiYeW40nc7eZlXHU="; }; postPatch = @@ -94,6 +94,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/cvxpy/cvxpy//releases"; changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 862271e58341..b87c39e09357 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "11.5.0"; + version = "11.6.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-AN3PjJ1HAERDXlmE9K8k2OGLAh5vs1286EhJShH0xE4="; + hash = "sha256-LnXunfYUz76XIHEXhaFJymBMFln8sIH0yxCodRmKdY0="; }; pythonRelaxDeps = [ "py-serializable" ]; diff --git a/pkgs/development/python-modules/cyrtranslit/default.nix b/pkgs/development/python-modules/cyrtranslit/default.nix index 6631f1a19680..13cb468bf827 100644 --- a/pkgs/development/python-modules/cyrtranslit/default.nix +++ b/pkgs/development/python-modules/cyrtranslit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cyrtranslit"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; # Pypi tarball doesn't contain tests/ @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "opendatakosovo"; repo = "cyrillic-transliteration"; tag = "v${version}"; - hash = "sha256-t8UTOmjGqjmxU7+Po0/HmOPWAvcgZibaUC9dMlttA/0="; + hash = "sha256-hE5fru9Y5gU4zG2Kz76w5HbVXKBua/cJdhItz3ou0kY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index fb8e804edde4..64d95c66e6e6 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "datafusion"; - version = "50.0.0"; + version = "50.1.0"; pyproject = true; src = fetchFromGitHub { @@ -32,12 +32,12 @@ buildPythonPackage rec { tag = version; # Fetch arrow-testing and parquet-testing (tests assets) fetchSubmodules = true; - hash = "sha256-to1GJQqI4aJOW8pGhWvU44ePrRo0cgeNwEGRJlb9grM="; + hash = "sha256-+r3msFc9yu3aJBDRI66A/AIctCbLxfZB3Ur/raDV3x8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-ZACp7bBLYKmuZVAWEa2YxoCbQqwALv2bWf+zz6jbV9w="; + hash = "sha256-XJ2x/EtMZu/fdS6XB/IydMfHmlaxEWJ3XJPY73WoGqs="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index e74bf9d319aa..6c814ab806d3 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -61,6 +61,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-bigquery"; changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/${version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 2051f9f045fa..79c2b8a759c7 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.10.13"; + version = "1.10.15"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-core"; tag = "v${version}"; - hash = "sha256-uXuoOyo/F7eaZva45EARES9e8GpQJEz6ka39eLOhENE="; + hash = "sha256-n/tU34XUf/s4m/SbPth/jlfo2xKhQk1hVjP3vLA/67s="; }; sourceRoot = "${src.name}/core"; @@ -124,7 +124,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mausch - tjni ]; mainProgram = "dbt"; }; diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix index 9474194a4eb3..6566c4731cc4 100644 --- a/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/pkgs/development/python-modules/dbt-extractor/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ mausch - tjni ]; }; } diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index 2db1292cb24c..0b831ab2e73e 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -46,6 +46,5 @@ buildPythonPackage rec { description = "Plugin enabling dbt to work with a Postgres database"; homepage = "https://github.com/dbt-labs/dbt-core"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 91b9d9b30b1c..de7c86ca1d6a 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -52,6 +52,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-redshift"; changelog = "https://github.com/dbt-labs/dbt-redshift/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 3bf8f1f59817..9236175562fd 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-snowflake"; changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-snowflake/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index d7606c49001b..bf1aa352522d 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -32,15 +32,20 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; tag = "v${version}"; - hash = "sha256-U9WeWAX0qDusWcMsFaI1ct4YKlGQEHUYlKZfRiYhma0="; + + # Upstream uses .gitattributes to inject information about the revision + # hash and the refname into `src/debugpy/_version.py`, see: + # + # - https://git-scm.com/docs/gitattributes#_export_subst and + # - https://github.com/microsoft/debugpy/blob/v1.8.17/src/debugpy/_version.py#L24-L30 + postFetch = '' + sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py" + ''; + + hash = "sha256-eAiCtSJUqLASapxnYCyq1UCiGz6QmKQum7Vs3MoU1s8="; }; patches = [ - # Use nixpkgs version instead of versioneer - (replaceVars ./hardcode-version.patch { - inherit version; - }) - # Fix importing debugpy in: # - test_nodebug[module-launch(externalTerminal)] # - test_nodebug[module-launch(integratedTerminal)] diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch deleted file mode 100644 index 00e77bd75b94..000000000000 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/setup.py b/setup.py -index d16a27c5..a7e407e1 100644 ---- a/setup.py -+++ b/setup.py -@@ -12,7 +12,6 @@ import sys - - - sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) --import versioneer # noqa - - del sys.path[0] - -@@ -145,13 +144,13 @@ if __name__ == "__main__": - if platforms is not None: - extras["platforms"] = platforms - -- cmds = versioneer.get_cmdclass() -+ cmds = {} - override_build(cmds) - override_build_py(cmds) - - setuptools.setup( - name="debugpy", -- version=versioneer.get_version(), -+ version="@version@", - description="An implementation of the Debug Adapter Protocol for Python", # noqa - long_description=long_description, - long_description_content_type="text/markdown", -diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py -index c61a2607..f26f8272 100644 ---- a/src/debugpy/public_api.py -+++ b/src/debugpy/public_api.py -@@ -7,8 +7,6 @@ from __future__ import annotations - import functools - import typing - --from debugpy import _version -- - - # Expose debugpy.server API from subpackage, but do not actually import it unless - # and until a member is invoked - we don't want the server package loaded in the -@@ -192,4 +190,4 @@ def trace_this_thread(__should_trace: bool): - """ - - --__version__: str = _version.get_versions()["version"] -+__version__: str = "@version@" diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index c856765d088b..8ff88995f9a6 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "16.4.0"; + version = "17.0.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -31,12 +31,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-R62z102kvdsZVdRcE0lBtwgynl3SECOXCoyaj0xXv2s="; + hash = "sha256-QreF2ivdPfu2KiYY4At3zpif8bx7d7AzbpXNgL3zXzE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-ir3HZ3DiHcL34kGtyUwyKQZA6fiSj45eXBKL/71eqCs="; + hash = "sha256-n3lvezBP7oT9jLqPCFZ7hwdBGuSJYos+hob9HBX2zIY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index 08913d0bacc8..9aa1bd3f5473 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.95"; + version = "0.0.96"; pyproject = true; src = fetchFromGitHub { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-BLbDW/NBeLKFcijMSeYfYxSFmqfG8WYHbVQpFyvMEZY="; + hash = "sha256-UusTzMZl7ITKFbMTZI457Y2K9knO2U1n9LurJZhUJ0A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/delorean/default.nix b/pkgs/development/python-modules/delorean/default.nix index f056cde2a6e8..62f89be90f63 100644 --- a/pkgs/development/python-modules/delorean/default.nix +++ b/pkgs/development/python-modules/delorean/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Delorean: Time Travel Made Easy"; homepage = "https://github.com/myusuf3/delorean"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 30ba3551f269..767af0ded1a2 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -44,6 +44,5 @@ buildPythonPackage rec { homepage = "https://github.com/uqfoundation/dill/"; changelog = "https://github.com/uqfoundation/dill/releases/tag/dill-${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 52fb4dfeae6d..1e41576bc20d 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, lz4, python-lzo, - pythonOlder, setuptools, setuptools-scm, zstandard, @@ -14,16 +13,14 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.10"; + version = "1.11"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.squashfs"; tag = version; - hash = "sha256-DFcC633TboQAwpLUKlRsVLN4PBGS8acOh/zCrv8ao8Y="; + hash = "sha256-glmrsbNkhgYBhcL+qgEnBfJnGL4ViHH1L5HN9rGlUNM="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 11c4227e4f3c..d7a8a6ae35c1 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "65.12.0"; + version = "65.13.1"; pyproject = true; src = fetchFromGitea { @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "allauth"; repo = "django-allauth"; tag = version; - hash = "sha256-LM9XU8oMzg2WlYnwPmmZY+8gzZWT1br2ciZ7gCTbH7I="; + hash = "sha256-tmCOJ15l8UnvFZFCiqH2ACBeIEDqYKNwf9gkCUHTKPE="; }; nativeBuildInputs = [ gettext ]; @@ -69,6 +69,10 @@ buildPythonPackage rec { ''; optional-dependencies = { + headless = [ + pyjwt + ] + ++ pyjwt.optional-dependencies.crypto; headless-spec = [ pyyaml ]; idp-oidc = [ oauthlib diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index 8812b5dd5333..d760900fae4b 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-appconf"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django-compressor"; repo = "django-appconf"; tag = "v${version}"; - hash = "sha256-raK3Q+6cDSOiK5vrgZG65qDUiFOrRhDKxsPOQv/lz8w="; + hash = "sha256-kpytEpvibnumkQGfHBDKA0GzSB0R8o0g0f51Rv6KEhA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 61b66c736806..ca505c3114e0 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; tag = "v${version}"; - hash = "sha256-159p82PT3za3wp2XhekGxy+NYxLyQfAyUOyhDjyr2CI="; + hash = "sha256-ZOCLlS9SUY8W3jfA+51gy5yUchJr+rpBzH+Sx1G/kUM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-cache-memoize/default.nix b/pkgs/development/python-modules/django-cache-memoize/default.nix index 67928827aec5..962900229795 100644 --- a/pkgs/development/python-modules/django-cache-memoize/default.nix +++ b/pkgs/development/python-modules/django-cache-memoize/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "django-cache-memoize"; - version = "0-unstable-2025-05-05"; + version = "0-unstable-2025-12-05"; pyproject = true; src = fetchFromGitHub { owner = "peterbe"; repo = "django-cache-memoize"; # No tags. See . - rev = "e35862db483318ed751467eb576c0022015caa88"; - hash = "sha256-bXGlbU6doU28dztP4GBPFLm3frRY8FIAvguD0dyfdnU="; + rev = "603602f633b4137af2cb4ff8373831cbef8f27b1"; + hash = "sha256-PGPnNOjxkyhj5cxWyh3PA6jmdc2Mz3/1y7KBqE63bwU="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix index 8057e33e6b19..10ee6f9dc3b1 100644 --- a/pkgs/development/python-modules/django-cms/default.nix +++ b/pkgs/development/python-modules/django-cms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-cms"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-cms"; tag = version; - hash = "sha256-bhF1FJO+EHg49ZnwykVmyM/kkdXMCyfoV+EFQ5IZFF4="; + hash = "sha256-s7sgENs1A5weAiZ2zQYIbAKFOWR3Jmhbsli3vLyqi/4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index 06cbb3fc2c68..a254022b68dc 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "6.4"; + version = "6.4.1"; pyproject = true; src = fetchFromGitHub { owner = "wagtail"; repo = "django-modelcluster"; tag = "v${version}"; - hash = "sha256-JoDDHvZ9N+7hcIxRsbVrYW8/95iUcNHDQkvtmDVUzws="; + hash = "sha256-LVCYjbKN53740hr5Tl0JRbx17g35fnauZHIKQNkb5Kc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index 907e3180d0f0..5702ea88d7c8 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-otp"; - version = "1.6.1"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; tag = "v${version}"; - hash = "sha256-//i2KSsrkofcNE2JUlIG9zPCe/cIzBo/zmueC4I5g7I="; + hash = "sha256-sYwt41YWQQN6nKXGmrrZ75t/i1XNVjIgRKVElVaCGRc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix index db2044f9b565..facd4fca9050 100644 --- a/pkgs/development/python-modules/django-pgactivity/default.nix +++ b/pkgs/development/python-modules/django-pgactivity/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pgactivity"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "AmbitionEng"; repo = "django-pgactivity"; tag = version; - hash = "sha256-PDJJf0PI5aqFn1HODv6wRSgTCr9ajfpPSDCB8twrFcQ="; + hash = "sha256-e+PodpFsGxx4SE6zQD2qVDAXx44xeIdsBO7YsdbSjiU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-pghistory/default.nix b/pkgs/development/python-modules/django-pghistory/default.nix index acdbe30965b1..b90a22ae0246 100644 --- a/pkgs/development/python-modules/django-pghistory/default.nix +++ b/pkgs/development/python-modules/django-pghistory/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pghistory"; - version = "3.8.3"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "Opus10"; repo = "django-pghistory"; tag = version; - hash = "sha256-Sx2dR5l86D+2t+1DViW1PfI74zyLmgwNm81zVmZ7IH8="; + hash = "sha256-v0Qya5IuRA2nD8LjVEtliDRL9Qxnanod6WhPCu5RJ90="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix index e2c4344a2ac0..2778f8e35320 100644 --- a/pkgs/development/python-modules/django-rosetta/default.nix +++ b/pkgs/development/python-modules/django-rosetta/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-rosetta"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mbi"; repo = "django-rosetta"; tag = "v${version}"; - hash = "sha256-NqDrCDvvyZsce7/VWXujAStAW8UtNSro8aelrDi4EEs="; + hash = "sha256-VnKbtzLY2+3RTk4gNZASuVSDGzfgoyr06RUNB2r0eDw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 1cbd4d7c3011..e0ceb3a42fb4 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, hatchling, @@ -8,22 +9,22 @@ rq, prometheus-client, sentry-sdk, - psycopg, pytest-django, pytestCheckHook, + pyyaml, redisTestHook, }: buildPythonPackage rec { pname = "django-rq"; - version = "3.1"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "rq"; repo = "django-rq"; tag = "v${version}"; - hash = "sha256-TnOKgw52ykKcR0gHXcdYfv77js7I63PE1F3POdwJgvc="; + hash = "sha256-oHBQpGRiNJFt07KEPC+KcCF6qM5PgSTyr0t35iyYhK4="; }; build-system = [ hatchling ]; @@ -41,7 +42,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_rq" ]; - doCheck = false; # require redis-server + # redis hook does not support darwin + doCheck = !stdenv.hostPlatform.isDarwin; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + pyyaml + redisTestHook + ] + ++ lib.concatAttrValues optional-dependencies; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; meta = with lib; { description = "Simple app that provides django integration for RQ (Redis Queue)"; diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index a357a92ad576..0ca06217e42f 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "mbi"; repo = "django-simple-captcha"; tag = "v${version}"; - hash = "sha256-hOvZQCAAlMYaNpAN+junhfgWej92shto7ejhKUPqbX0="; + hash = "sha256-Fee7YfIWGyKMsN7XQz10bjIhbjUYRuY7Oe4Q8n8ILz0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix index c6090fd39460..c1bdd128bb0d 100644 --- a/pkgs/development/python-modules/django-soft-delete/default.nix +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-soft-delete"; - version = "1.0.21"; + version = "1.0.22"; pyproject = true; src = fetchPypi { pname = "django_soft_delete"; inherit version; - hash = "sha256-VCvUZQ0naRBaQ2Pqe7f72zwoQp26pmQXFg+PS13GidU="; + hash = "sha256-MtC7lfGAwopAFj54pViswYkB/VYBH5H47nNcFxptQkQ="; }; build-system = [ hatchling ]; @@ -27,6 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_softdelete" ]; meta = { + changelog = "https://github.com/san4ezy/django_softdelete/blob/master/CHANGELOG.md"; description = "Soft delete models, managers, queryset for Django"; homepage = "https://github.com/san4ezy/django_softdelete"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix index e8d556f773b4..415108364e3d 100644 --- a/pkgs/development/python-modules/django-tasks/default.nix +++ b/pkgs/development/python-modules/django-tasks/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -13,6 +14,7 @@ fakeredis, pytestCheckHook, pytest-django, + redisTestHook, }: buildPythonPackage rec { @@ -48,12 +50,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_tasks" ]; + # redis hook does not support darwin + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ - dj-database-url django-rq + dj-database-url fakeredis pytestCheckHook pytest-django + redisTestHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/django-treenode/default.nix b/pkgs/development/python-modules/django-treenode/default.nix index a445a478121d..60432e4b83f5 100644 --- a/pkgs/development/python-modules/django-treenode/default.nix +++ b/pkgs/development/python-modules/django-treenode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-treenode"; - version = "0.23.2"; + version = "0.23.3"; pyproject = true; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "django-treenode"; tag = version; - hash = "sha256-9AG8ntuXHB3jUHRKFDh7OOT5c0Nt8uAZnf5dR7xC/Bc="; + hash = "sha256-EinTO794JMUjH25WFo5LJh5HWQoOjq8hI0RR2z7u6+c="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index 9e60ca4554d1..b4791aa59494 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.10.2"; + version = "3.10.3"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-71US/jW0d38dA+hY9uPxtCWmrD9Rl43Ozx5cS3fGEtM="; + hash = "sha256-eX0dnXh+WB/TIgKJzkpp1SOqJ2KSxoOD4JL+nsfqkLM="; }; build-system = [ diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 811e370ffc78..65598e73f619 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; - version = "2025.8.1"; + version = "2025.10.1"; pyproject = true; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; rev = version; - hash = "sha256-H2eHFX7VG7YqLztEV/G4QnVYytkfADeHxgBTRlmKt50="; + hash = "sha256-npBrBdJN0OVJ2Qj4g82CSZ2OSkttWOpBjh3DzLpIblM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 016d8dee79b6..c72c1de623c3 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.63.0"; + version = "3.64.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -74,7 +74,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; tag = version; - hash = "sha256-7wuxNPELHdxQSHKHQo8KTQ9yj8KW8RVEN0ykJN/he9E="; + hash = "sha256-zbqxJ6rlxiYZWFYmdqAlu00jkMLS0aIabVqMy5NAvUk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ebooklib/default.nix b/pkgs/development/python-modules/ebooklib/default.nix index a253169235be..a39d7b0f35c0 100644 --- a/pkgs/development/python-modules/ebooklib/default.nix +++ b/pkgs/development/python-modules/ebooklib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ebooklib"; - version = "0.19"; + version = "0.20"; format = "setuptools"; src = fetchFromGitHub { owner = "aerkalov"; repo = "ebooklib"; tag = "v${version}"; - hash = "sha256-al5iSw3sIIjIYRZPrYgbBQ7V324f6OTxmtrnoOHafSQ="; + hash = "sha256-XrciVPaVU8tKhgNMJdN4uwGJT36iccyF8QMj/shSahw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/emoji-country-flag/default.nix b/pkgs/development/python-modules/emoji-country-flag/default.nix new file mode 100644 index 000000000000..cd7817e3caa8 --- /dev/null +++ b/pkgs/development/python-modules/emoji-country-flag/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + pytestCheckHook, + emoji, +}: + +buildPythonPackage rec { + pname = "emoji-country-flag"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "cvzi"; + repo = "flag"; + tag = "v${version}"; + hash = "sha256-Te3RJ+rHkr3q93C7hLE5xCZz91QC2IsFR0FluVEJOv4="; + }; + + build-system = [ + setuptools + ]; + + doCheck = true; + + nativeCheckInputs = [ + pytestCheckHook + emoji + ]; + + pythonImportsCheck = [ "flag" ]; + + meta = { + description = "Flag emoji from country codes for Python"; + homepage = "https://github.com/cvzi/flag"; + changelog = "https://github.com/cvzi/flag/releases/tag/v${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + skohtv + aleksana + ]; + }; +} diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix index 1e29bead57fb..22933e51d6b2 100644 --- a/pkgs/development/python-modules/emulated-roku/default.nix +++ b/pkgs/development/python-modules/emulated-roku/default.nix @@ -8,29 +8,30 @@ buildPythonPackage rec { pname = "emulated-roku"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "mindigmarton"; repo = "emulated_roku"; - rev = version; - hash = "sha256-7DbJl1e1ESWPCNuQX7m/ggXNDyPYZ5eNGwSz+jnxZj0="; + tag = version; + hash = "sha256-lPe0mXtl1IQx//IydnmddpV11CpOi/MKq9TUOAKuoeU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # no tests implemented doCheck = false; pythonImportsCheck = [ "emulated_roku" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/martonperei/emulated_roku/releases/tag/${src.tag}"; description = "Library to emulate a roku server to serve as a proxy for remotes such as Harmony"; homepage = "https://github.com/mindigmarton/emulated_roku"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/energyid-webhooks/default.nix b/pkgs/development/python-modules/energyid-webhooks/default.nix new file mode 100644 index 000000000000..0f7dc6424104 --- /dev/null +++ b/pkgs/development/python-modules/energyid-webhooks/default.nix @@ -0,0 +1,46 @@ +{ + aiohttp, + backoff, + buildPythonPackage, + fetchFromGitHub, + lib, + requests, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "energyid-webhooks"; + version = "0.0.14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "EnergieID"; + repo = "energyid-webhooks-py"; + tag = "v${version}"; + hash = "sha256-43JfRBtRoERHYkhXjslxjohm8ypzgObRBmzbEwuzu7M="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + aiohttp + backoff + requests + ]; + + pythonImportsCheck = [ "energyid_webhooks" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Light weight Python package to interface with EnergyID Webhooks"; + homepage = "https://github.com/EnergieID/energyid-webhooks-py"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/essent-dynamic-pricing/default.nix b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix new file mode 100644 index 000000000000..73e8eb909fbf --- /dev/null +++ b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix @@ -0,0 +1,44 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + hatchling, + lib, + mashumaro, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "essent-dynamic-pricing"; + version = "0.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaapp"; + repo = "py-essent-dynamic-pricing"; + tag = version; + hash = "sha256-jYSyFZ4b6zyfIvT9KkvffH2CteHgy844O76UjUcaTq0="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + mashumaro + ]; + + pythonImportsCheck = [ "essent_dynamic_pricing" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + description = "Async client for Essent dynamic energy prices"; + homepage = "https://github.com/jaapp/py-essent-dynamic-pricing"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/eval-type-backport/default.nix b/pkgs/development/python-modules/eval-type-backport/default.nix index 8c952c2867bc..ab36c93c7773 100644 --- a/pkgs/development/python-modules/eval-type-backport/default.nix +++ b/pkgs/development/python-modules/eval-type-backport/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Like `typing._eval_type`, but lets older Python versions use newer typing features"; homepage = "https://github.com/alexmojaki/eval_type_backport"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 87b76bc6a068..8e1157597db2 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -6,30 +6,27 @@ fetchFromGitHub, flask, pymongo, - pythonOlder, setuptools, simplejson, }: buildPythonPackage rec { pname = "eve"; - version = "2.2.3"; + version = "2.2.4"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pyeve"; repo = "eve"; tag = "v${version}"; - hash = "sha256-SnypLhUGAw3e0KQ2CjP6NHTIypMJdN18zzzYAG14m7Y="; + hash = "sha256-58PYwDzeQMmCLdqJfxp153+/AYNzO4JNzs7llyr7GJc="; }; pythonRelaxDeps = [ "events" ]; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cerberus events flask @@ -45,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source Python REST API framework designed for human beings"; homepage = "https://python-eve.org/"; - changelog = "https://github.com/pyeve/eve/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/pyeve/eve/blob/${src.tag}/CHANGES.rst"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index f94d44a2dac5..6cc7db132743 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.12"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; tag = version; - hash = "sha256-4eV050Yikr+5ZIj1v11cPQQ1pAlQYckbZXVFHHfYmpA="; + hash = "sha256-8oeW6NWqYcZF+s2kRfeoVAp8JBbuDn+NQ0RU6nxVTAc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 10dc8a3bf455..386a978d64e1 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "0.9.8"; + version = "0.9.9"; pname = "eyed3"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nicfit"; repo = "eyeD3"; tag = "v${version}"; - hash = "sha256-erjTgHjtrUMBj09/s3sZzct6Tg979a16a4fVGnwT0qk="; + hash = "sha256-Brtxi0B52kvSU12va5X+KNtNV9cyK2TUefyZYZI87JQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix index d9bfea658144..38b6f00bedb4 100644 --- a/pkgs/development/python-modules/fabio/default.nix +++ b/pkgs/development/python-modules/fabio/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fabio"; - version = "2024.9.0"; + version = "2025.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+HPfUfRoUxwRqufgzYihTyIfTvCUMfvFpspnse1HU1s="; + hash = "sha256-wZdjvPoCp4pQfz2RS1ZKiZfIimqntPh/nbTOf6OX0lY="; }; pythonImportsCheck = [ "fabio" ]; diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index cc7a97b00954..cb800b7e522c 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.8.4"; + version = "2.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AmQoXZxnaNepeJzlw3A6jhIfVg9ABneRI4uV1WbkJY4="; + hash = "sha256-kq7ndxj8h5nBJTZ8wVenqSquZ6CoqTyde4lQO9rFybY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index 2607c8bc70f7..7ed356dcaae4 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { homepage = "https://github.com/pbrady/fastcache"; changelog = "https://github.com/pbrady/fastcache/blob/v${version}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/fava/default.nix b/pkgs/development/python-modules/fava/default.nix index ef71e0884464..c8c5f7c2461b 100644 --- a/pkgs/development/python-modules/fava/default.nix +++ b/pkgs/development/python-modules/fava/default.nix @@ -103,7 +103,6 @@ buildPythonPackage { changelog = "https://beancount.github.io/fava/changelog.html"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - bhipple prince213 sigmanificient ]; diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index 1978b17eec50..59c176fa4d4b 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -1,40 +1,36 @@ { lib, - astunparse, buildPythonPackage, - distutils, fetchFromGitHub, - flit-core, + hatchling, numpy, pytestCheckHook, + stdlib-list, torch, torchvision, - stdlib-list, }: buildPythonPackage rec { pname = "fickling"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "fickling"; tag = "v${version}"; - hash = "sha256-EgVtMYPwSVBlw1bmX3qEeUKvEY7Awv6DOB5tgSLG+xQ="; + hash = "sha256-ExyjOTpIkDM2PmHxYUbe8xNhhQChqfUqTtsNR8Z7ZEk="; }; build-system = [ - distutils - flit-core + hatchling ]; dependencies = [ - astunparse stdlib-list ]; - pythonRelaxDeps = [ "stdlib_list" ]; + pythonRelaxDeps = [ "stdlib-list" ]; optional-dependencies = { torch = [ @@ -59,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/trailofbits/fickling"; changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sarahec ]; }; } diff --git a/pkgs/development/python-modules/fiscalyear/default.nix b/pkgs/development/python-modules/fiscalyear/default.nix new file mode 100644 index 000000000000..94ce0129a5fe --- /dev/null +++ b/pkgs/development/python-modules/fiscalyear/default.nix @@ -0,0 +1,34 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "fiscalyear"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adamjstewart"; + repo = "fiscalyear"; + tag = "v${version}"; + hash = "sha256-2wejJRTmVHWiM8LoodyaOyMbMqCx5It6JHCQUWpGsxs="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "fiscalyear" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/adamjstewart/fiscalyear/releases/tag/${src.tag}"; + description = "Utilities for managing the fiscal calendar"; + homepage = "https://github.com/adamjstewart/fiscalyear"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/fitparse/default.nix b/pkgs/development/python-modules/fitparse/default.nix new file mode 100644 index 000000000000..7caf8d2b866d --- /dev/null +++ b/pkgs/development/python-modules/fitparse/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + lib, + setuptools, +}: +buildPythonPackage rec { + pname = "fitparse"; + version = "1.2.0"; + + pyproject = true; + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "dtcooper"; + repo = "python-fitparse"; + tag = "v${version}"; + hash = "sha256-aO4djG9omc0jogalLitvT5i58cYKXqtvJ5WGBiCv448="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_utils" + ]; + + pythonImportsCheck = [ + "fitparse" + ]; + + meta = { + description = "Python library to parse ANT/Garmin .FIT files"; + homepage = "https://pythonhosted.org/fitparse/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/development/python-modules/formatron/default.nix b/pkgs/development/python-modules/formatron/default.nix new file mode 100644 index 000000000000..0353fc4d7b8b --- /dev/null +++ b/pkgs/development/python-modules/formatron/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + general-sam, + setuptools, + kbnf, + frozendict, + jsonschema, + pydantic, + transformers, + vllm, +}: +buildPythonPackage rec { + pname = "formatron"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dan-wanna-M"; + repo = "formatron"; + rev = "v${version}"; + hash = "sha256-LQJza8F5wPcQO1y7Ino4slv7zoJMsZBn4LKLWYO9818="; + fetchSubmodules = true; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + frozendict + general-sam + jsonschema + kbnf + pydantic + ]; + + optional-dependencies = { + transformers = [ + transformers + ]; + vllm = [ + vllm + ]; + }; + + pythonImportsCheck = [ + "formatron" + ]; + + meta = { + description = "Control the output format of language models"; + homepage = "https://github.com/Dan-wanna-M/formatron"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/development/python-modules/gdstk/default.nix b/pkgs/development/python-modules/gdstk/default.nix new file mode 100644 index 000000000000..47390eb908c4 --- /dev/null +++ b/pkgs/development/python-modules/gdstk/default.nix @@ -0,0 +1,93 @@ +{ + lib, + buildPythonPackage, + libgdstk, + + # build-system + build, + scikit-build-core, + + # deps + numpy, + typing-extensions, + + # deps (optional) + matplotlib, + sphinx, + sphinx-inline-tabs, + sphinx-rtd-theme, + + # build-time + cmake, + ninja, + + # run-time + zlib, + qhull, + + # tests + pytestCheckHook, +}: + +buildPythonPackage { + pname = "gdstk"; + inherit (libgdstk) src version; + + pyproject = true; + strictDeps = true; + + # scikit is supposed to handle the module build + dontUseCmakeConfigure = true; + + build-system = [ + build + cmake + ninja + numpy + scikit-build-core + ]; + + dependencies = [ + numpy + typing-extensions + ]; + + optional-dependencies = { + docs = [ + matplotlib + sphinx + sphinx-inline-tabs + sphinx-rtd-theme + ]; + }; + + buildInputs = [ + zlib + qhull + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # remove the `gdstk` source directory, else pytest will attempt to import it + # instead of the actual module + preCheck = '' + rm -rf gdstk + ''; + + pythonImportsCheck = [ + "gdstk" + ]; + + meta = { + inherit (libgdstk.meta) + description + homepage + changelog + license + maintainers + teams + ; + }; +} diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 3e192bea29c0..bcfbf5e8dad5 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -1,52 +1,50 @@ { lib, aiohttp, + beautifulsoup4, bidict, buildPythonPackage, + cryptography, fetchPypi, humanize, - lxml, - pythonOlder, + pytestCheckHook, requests, setuptools, - slixmpp, websockets, }: buildPythonPackage rec { pname = "gehomesdk"; - version = "2025.5.0"; + version = "2025.11.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-YMw0W9EWz3KY1+aZMdtE4TRvFd9yqTHkfw0X3+ZDCfQ="; + hash = "sha256-HS33yTE+3n0DKRD4+cr8zAE+xcW1ca7q8inQ7qwKJMA="; }; build-system = [ setuptools ]; dependencies = [ aiohttp + beautifulsoup4 bidict humanize - lxml requests - slixmpp websockets ]; - # Tests are not shipped and source is not tagged - # https://github.com/simbaja/gehome/issues/32 - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + cryptography + ]; pythonImportsCheck = [ "gehomesdk" ]; meta = with lib; { description = "Python SDK for GE smart appliances"; homepage = "https://github.com/simbaja/gehome"; - changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md"; + changelog = "https://github.com/simbaja/gehome/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "gehome-appliance-data"; diff --git a/pkgs/development/python-modules/general-sam/default.nix b/pkgs/development/python-modules/general-sam/default.nix new file mode 100644 index 000000000000..9611dfaf988d --- /dev/null +++ b/pkgs/development/python-modules/general-sam/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + cargo, + rustc, +}: + +buildPythonPackage rec { + pname = "general-sam"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ModelTC"; + repo = "general-sam-py"; + rev = "v${version}"; + hash = "sha256-++6Z9Ocee4QFN1u0nK/g9uGdmB1UYnfHhhJj74zboCE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-8HHIM1Abz5KxnVphFFNJp6L3D6iPeoB7qVmxy11CUZs="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + optional-dependencies = { + test = [ + pytest + ]; + }; + + pythonImportsCheck = [ + "general_sam" + ]; + + meta = { + description = "General suffix automaton implementation"; + homepage = "https://github.com/ModelTC/general-sam-py"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix index a12dd528531e..c6866c361872 100644 --- a/pkgs/development/python-modules/get-video-properties/default.nix +++ b/pkgs/development/python-modules/get-video-properties/default.nix @@ -34,6 +34,6 @@ buildPythonPackage { description = "Get video properties"; homepage = "https://github.com/mvasilkov/python-get-video-properties"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index e33d009e8748..d32b2f905345 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "glueviz"; - version = "1.23.0"; + version = "1.24.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "glue-viz"; repo = "glue"; tag = "v${version}"; - hash = "sha256-Ql5eMyMm48zNLQ3tkPyqM4+r3QfxqVAGHx1/LcLUiyo="; + hash = "sha256-21XFH1fIt8vLd0blZJn6ZRmLJaof/E30zHrBVLjXOaA="; }; buildInputs = [ pyqt-builder ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index fa2b082e5a93..ce41dba500c3 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.12.4"; + version = "6.12.5"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${version}"; - hash = "sha256-kT2FpfqDb5q3eJJ1K1zpaeR0dSUrXlFvYTeCpAQNdAo="; + hash = "sha256-15H12JMMb7Mw1Kaix95jsqAz9g49ee0vfFBCd/Vhvf0="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index f68b9bcc1efa..8ab8261a5e15 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "9.1.1"; + version = "9.1.2"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-qbw5KryI/h+uBddFrYBCQHXxFAhXR1SHdkuIeUKxbVw="; + hash = "sha256-yElmh+ajNVbjhsnNsUtQ3mJw9fvJtXqgS58iow+Nwi8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 85a752ea301d..ecd811b2ff00 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.12.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "stumpylog"; repo = "gotenberg-client"; tag = version; - hash = "sha256-+beO1Pp+ikfk4gqpfvIEHCOPZGLanGX6Kw4mqJglJTI="; + hash = "sha256-JYb0+Dj4QowcN+I6MMoWlv+Q5YoK4nfzYB/UNwhnRu8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 5bbceb734299..2d0a95898814 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.5.6"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA="; + hash = "sha256-Jj75ycr9Y0aCTP5YGzd6um/7emWKqqegUDB7HpTfTcM="; }; # Granian forces a custom allocator for all the things it runs, @@ -39,7 +39,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM="; + hash = "sha256-Q7BWwvkK5rRuhVobxW4qXLo6tnusOaQYN8mBoNVoulw="; }; nativeBuildInputs = with rustPlatform; [ @@ -79,6 +79,12 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/" ]; + disabledTests = [ + # SSLCertVerificationError: certificate verify failed: certificate has expired + "test_asgi_ws_scope" + "test_rsgi_ws_scope" + ]; + pythonImportsCheck = [ "granian" ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/development/python-modules/granian/no-alloc.patch b/pkgs/development/python-modules/granian/no-alloc.patch index 1d0b4456a828..28fff30c74f0 100644 --- a/pkgs/development/python-modules/granian/no-alloc.patch +++ b/pkgs/development/python-modules/granian/no-alloc.patch @@ -1,26 +1,26 @@ diff --git a/Cargo.toml b/Cargo.toml -index cbf1cdb..e819e14 100644 +index c7d1647..d5710bd 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -41,7 +41,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] } +@@ -41,7 +41,6 @@ hyper = { version = "=1.8", features = ["http1", "http2", "server"] } hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] } itertools = "0.14" log = "0.4" --mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls"], optional = true } +-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls", "v3"], optional = true } mime_guess = "=2.0" pem = "=3.0" percent-encoding = "=2.3" -@@ -52,7 +51,6 @@ pyo3-log = "=0.12" +@@ -52,7 +51,6 @@ pyo3-log = { version = "=0.13", git = "https://github.com/gi0baro/pyo3-log.git", rustls-pemfile = "2.2" socket2 = { version = "=0.6", features = ["all"] } - sysinfo = "=0.36" + sysinfo = "=0.37" -tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true } - tls-listener = { version = "=0.11", features = ["rustls-ring"] } + tls-listener = { version = "=0.11", git = "https://github.com/gi0baro/tls-listener.git", branch = "0.11.x", features = ["rustls-ring", "rustls-tls12"] } tokio = { version = "1.45", features = ["full"] } tokio-stream = "0.1" @@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] } [build-dependencies] - pyo3-build-config = "=0.25" + pyo3-build-config = "=0.27" -[features] -jemalloc = ["dep:tikv-jemallocator"] diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 1ac7962800a6..52c3119e435f 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -89,14 +89,14 @@ buildPythonPackage rec { (lib.mesonEnable "tests" gst-python.doInstallCheck) ]; - # Tests are very flaky on Darwin. - # See: https://github.com/NixOS/nixpkgs/issues/454955 - doCheck = !stdenv.hostPlatform.isDarwin; - # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase` # empty. It renames `doCheck` from its arguments, but not `checkPhase`. # See: https://github.com/NixOS/nixpkgs/issues/47390 - installCheckPhase = "mesonCheckPhase"; + installCheckPhase = '' + runHook preCheck + mesonCheckPhase + runHook postCheck + ''; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${gst_all_1.gst-plugins-base}/lib" diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index edb99a84f127..257d14049555 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "5.7.0"; + version = "5.8.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; tag = "v${version}"; - hash = "sha256-1/KbehOIQdclPskp2HtJ3fut4DqkKw/+FdqwmVvfZmU="; + hash = "sha256-VbD4fAOZtDtPIGGYb3ISP7c9YLBXAXeOIICqf9Pm5ho="; }; build-system = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 66c13729c251..3af023c0f9ee 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -10,6 +10,7 @@ cryptography, fetchFromGitHub, freezegun, + grpcio, josepy, litellm, pycognito, @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-LBJPzMosSgfdONu2preIBKmlKhY4P+jFTmR8u2BKCZI="; + hash = "sha256-22DCn6ITrpH4bevAvfogA1f4llwuk5vIn3rKieedVfg="; }; postPatch = '' @@ -63,6 +64,7 @@ buildPythonPackage rec { attrs ciso8601 cryptography + grpcio josepy litellm pycognito diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 0f20119deaa0..15aa2a036ab0 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "3.4.0"; + version = "3.5.0"; in buildPythonPackage rec { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-rroljEJ0xXW15iKmW6C64+h8epNB6XJzKtylA/wKyWQ="; + hash = "sha256-ei4+eGNCzBZQYghgVuQIPgFA2Y1kf8aNtl6ZjwzxIEE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hatch-deps-selector/default.nix b/pkgs/development/python-modules/hatch-deps-selector/default.nix new file mode 100644 index 000000000000..5d9e42e8a5ea --- /dev/null +++ b/pkgs/development/python-modules/hatch-deps-selector/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, +}: + +buildPythonPackage rec { + pname = "hatch-deps-selector"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jupyter-book"; + repo = "hatch-deps-selector"; + tag = "v${version}"; + hash = "sha256-AaHVBUDENF3d+yzDt5mvMnfqO+DSYQafMdHNDyEtz2s="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ "hatch_deps_selector" ]; + + # No tests + doCheck = false; + + meta = { + description = "Select additional dependencies for pyproject.toml from the environment"; + homepage = "https://github.com/jupyter-book/hatch-deps-selector"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 61b5824ba7b7..fef25b9aeaae 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -49,6 +49,5 @@ buildPythonPackage rec { mainProgram = "hatch-fancy-pypi-readme"; homepage = "https://github.com/hynek/hatch-fancy-pypi-readme"; license = licenses.mit; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index e38280b67f6d..c0dc4509ec43 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.14.0.post4"; + version = "0.15.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SPziU+Um0XtmP7+ZicccfvdlPO1fS+ZfFDfDE/s9vfY="; + hash = "sha256-7LwmXL6Le4h1X0IeC6JfCECR7FUMK5D/no3dT81UAxE="; }; build-system = [ diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index a36fc0735ca3..e6bc6c169a1e 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hiredis"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "hiredis-py"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-WaHjqp/18FquYU2H9ftPQSyunLMG29FVpu3maB3/0bs="; + hash = "sha256-9KIbXmEk4K2xdGM7SUV64mcSEPGQdDez9mAb/920gZs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index c997be940b04..fd7f8c813e00 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/hjson/hjson-py"; changelog = "https://github.com/hjson/hjson-py/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; mainProgram = "hjson"; }; } diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index b908e4126552..9d17983e152a 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -53,7 +53,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ mausch - tjni ]; }; } diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 6d4111eb616d..1db18fe05203 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -2,22 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "hstspreload"; - version = "2025.1.1"; + version = "2025.12.3"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "sethmlarson"; repo = "hstspreload"; tag = version; - hash = "sha256-2KtQZroKhRzqFg0xL/gXMA3jP0FgYSPYy1eP3x78rQo="; + hash = "sha256-K44Lzom7AQMsnJGN9RYNfZuD+wbbZtTGStjJtS/4NcE="; }; build-system = [ setuptools ]; @@ -28,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "hstspreload" ]; meta = with lib; { - description = "Chromium HSTS Preload list as a Python package and updated daily"; + description = "Chromium HSTS Preload list"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index a72fa89f79ab..75ab7886ad01 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -11,7 +11,6 @@ pytest-trio, pytestCheckHook, python-socks, - pythonOlder, setuptools, starlette, tiny-proxy, @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.10.1"; + version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "romis2012"; repo = "httpx-socks"; tag = "v${version}"; - hash = "sha256-1NDsIKJ8lWpjaTnlv5DrwTsEJU4gYwEUuqKpn+2QVhg="; + hash = "sha256-/8nz/5LqEuSr8A8/BWzJM9vHuum6fOYIS2rozr4Omi4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hueble/default.nix b/pkgs/development/python-modules/hueble/default.nix new file mode 100644 index 000000000000..f21782994f9f --- /dev/null +++ b/pkgs/development/python-modules/hueble/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + bleak, + bleak-retry-connector, +}: + +buildPythonPackage rec { + pname = "hueble"; + version = "2.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "flip-dots"; + repo = "HueBLE"; + tag = "v${version}"; + hash = "sha256-1KDKfmP7fNe66ZMHbOsNvnikkm1/AGQPBKTh7h9ku6Y="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + pythonImportsCheck = [ "HueBLE" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/flip-dots/HueBLE/blob/${src.tag}/CHANGELOG.rst"; + description = "Python module for controlling Bluetooth Philips Hue lights"; + homepage = "https://github.com/flip-dots/HueBLE"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 47dad295c46e..d5ed08950081 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.4"; + version = "2.5.5"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "huey"; tag = version; - hash = "sha256-PIMnPb6QQh20/LPfk8LaidhLHMrL8dHigLigyy2ki4Q="; + hash = "sha256-fpnaf0hk26Sm+d3pggW/GfT0oSbYpSm5xotejbOWeJY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 67429f81efe0..19edfec9439f 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-G4XjMg6GQt2C8jTbYyU82haagXWJ6CNxPcX8qDEZseI="; + hash = "sha256-4AVq2QZOeSPodOZ2kBWwMlgLY54pJG9asQRPeVnBx+A="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index e6075d20ef78..b11474f7b28c 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -23,14 +23,14 @@ let in buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.28"; + version = "0.7.29"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-U7MGa3xzNzx0TCeSaO1yaDEgOSFwoSm02yqskmOIMiM="; + hash = "sha256-gfrcUIJVtEFUvDLejaP3DyxW1kTHSOA0EwzWZggEyxA="; }; env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib"; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 3bf77da5c93e..f991b776c43c 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512031"; + version = "0.1.202512091"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-x0+zE4xpK4ZOHhl/yyVN/w4G69iS7WCzAPghaFo0r+I="; + hash = "sha256-y6DlcmPRC/yG++ejpbzVCOgPmj53pKwEWilxdep6x7Q="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5f79a568bf34..f58fa2958a03 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,7 +5,6 @@ pyjwt, pytestCheckHook, python-dateutil, - pythonAtLeast, pythonOlder, requests, responses, @@ -68,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/IBM/python-sdk-core"; changelog = "https://github.com/IBM/python-sdk-core/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 2727df3995fb..8af57edb8956 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/watson-developer-cloud/python-sdk"; changelog = "https://github.com/watson-developer-cloud/python-sdk/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/icalendar-searcher/default.nix b/pkgs/development/python-modules/icalendar-searcher/default.nix new file mode 100644 index 000000000000..7f74cb63aa2c --- /dev/null +++ b/pkgs/development/python-modules/icalendar-searcher/default.nix @@ -0,0 +1,53 @@ +{ + buildPythonPackage, + fetchFromGitHub, + icalendar, + lib, + poetry-core, + poetry-dynamic-versioning, + pyicu, + pytestCheckHook, + recurring-ical-events, +}: + +buildPythonPackage rec { + pname = "icalendar-searcher"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-caldav"; + repo = "icalendar-searcher"; + tag = "v${version}"; + hash = "sha256-RwWm41+7AyoqwVGBaa+50ljUILJG5kCD4LMsULWjVEM="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + icalendar + recurring-ical-events + ]; + + optional-dependencies = { + collation = [ pyicu ]; + }; + + pythonImportsCheck = [ "icalendar_searcher" ]; + + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues optional-dependencies; + + meta = { + changelog = "https://github.com/python-caldav/icalendar-searcher/blob/${src.tag}/CHANGELOG.md"; + description = "Search, filter and sort iCalendar components"; + homepage = "https://github.com/python-caldav/icalendar-searcher"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 29b055ba916a..f6cbbb13c2de 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,7 +2,7 @@ lib, pkgs, buildPythonPackage, - fetchFromGitea, + fetchFromGitHub, replaceVars, colord, setuptools, @@ -25,8 +25,9 @@ buildPythonPackage rec { version = "0.6.1"; pyproject = true; - src = fetchFromGitea { - domain = "gitlab.mister-muffin.de"; + # gitlab.mister-muffin.de produces a 500 error on 0.6.1 + # when upgrading, switch src attribute back to gitlab if fixed. + src = fetchFromGitHub { owner = "josch"; repo = "img2pdf"; tag = version; diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix index b3e56625b2c6..35c17612f972 100644 --- a/pkgs/development/python-modules/inject/default.nix +++ b/pkgs/development/python-modules/inject/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/ivankorobkov/python-inject"; changelog = "https://github.com/ivankorobkov/python-inject/blob/${version}/CHANGES.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index b6cffd906c58..67c18054eedb 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -15,24 +15,20 @@ pdfminer-six, phonenumbers, python-magic, - pythonOlder, readabilipy, setuptools, }: buildPythonPackage rec { pname = "iocsearcher"; - version = "2.4.8"; + version = "2.5.7"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "malicialab"; repo = "iocsearcher"; - # https://github.com/malicialab/iocsearcher/issues/6 - rev = "be29cb4090284155b49a358e7fe2d24371b6a981"; - hash = "sha256-LMpFK1Z1KaKUCm/X9Sh+Gp9GNKrGWp7N4UjAOVkhmSU="; + tag = "v${version}"; + hash = "sha256-qykPMtdGjys6d1cdP6cM/lmtU5WR/jk9tc9g+8uc31E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iometer/default.nix b/pkgs/development/python-modules/iometer/default.nix index 5c0c271c98c2..beba41d64809 100644 --- a/pkgs/development/python-modules/iometer/default.nix +++ b/pkgs/development/python-modules/iometer/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "iometer"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "iometer-gmbh"; repo = "iometer.py"; tag = "v${version}"; - hash = "sha256-EKMbNAKhPRubLbCfvr93Lif2fhJ71eH2IByizG9RNZQ="; + hash = "sha256-rr+t8VPiPX9/r7mHo9DjLRjoZ7x/4IadhmDtIi2T0C4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 0f08c6891bee..aa8347189ee2 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "json-stream-rs-tokenizer"; - version = "0.4.31"; + version = "0.4.32"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "smheidrich"; repo = "py-json-stream-rs-tokenizer"; tag = "v${version}"; - hash = "sha256-n+ZPB1BGUHEanpLpe4ZO6LjbxTALJ4Ns9/Hn7nE3mpc="; + hash = "sha256-J68feE7C4I0zHmRjop7Pexx2ApkzUefz/lokYTINSiI="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index ea241918cdbc..2cb170527d3a 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.3.4"; + version = "1.0.0"; pyproject = true; build-system = [ hatchling ]; src = fetchPypi { pname = "jsonrpclib_pelix"; inherit version; - hash = "sha256-6C1vTakHp9ER75P9I2HIwgt50ki+T+mWeOCGJqqPy+8="; + hash = "sha256-Wx6hTabjcdur7bGr7QqLoc9ZZCg1DNnQGI88bGyO94Q="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix index 18fe43fef07f..9edefcca3db2 100644 --- a/pkgs/development/python-modules/jsonschema-rs/default.nix +++ b/pkgs/development/python-modules/jsonschema-rs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jsonschema-rs"; - version = "0.33.0"; + version = "0.37.4"; pyproject = true; @@ -21,12 +21,12 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "jsonschema_rs"; - hash = "sha256-PRi2xwfGra6cgSynLldOHp+HKeVPwAFGFYintXfUPc8="; + hash = "sha256-Z/NvHERccPmXXReoTON/eVk/YjTX6ykoMNd0nl+lj/Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-P305DiFzU4UfD1PLLU4ayCfLS714VzkWlB3AM4U5ovk="; + hash = "sha256-4M20NK2d2NfWr0P1GUSjukOWyDwzvUAexSH+1k7eS1Y="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 729289a8a4b7..dbfcd863f534 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -2,130 +2,76 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchNpmDeps, # build-system + hatch-deps-selector, + hatch-jupyter-builder, + hatch-nodejs-version, hatchling, + # nativeBuildInputs + nodejs, + npmHooks, + # dependencies - click, - jinja2, - jsonschema, - linkify-it-py, - myst-nb, - myst-parser, - pyyaml, - sphinx, - sphinx-comments, - sphinx-copybutton, - sphinx-external-toc, - sphinx-jupyterbook-latex, - sphinx-design, - sphinx-thebe, - sphinx-book-theme, - sphinx-togglebutton, - sphinxcontrib-bibtex, - sphinx-multitoc-numbering, + jupyter-core, + jupyter-server, + ipykernel, + nodeenv, # tests - jupytext, - pytest-regressions, - pytest-xdist, - pytestCheckHook, - sphinx-inline-tabs, - texsoup, - writableTmpDirAsHomeHook, + versionCheckHook, }: buildPythonPackage rec { pname = "jupyter-book"; - version = "1.0.4"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-book"; repo = "jupyter-book"; tag = "v${version}"; - hash = "sha256-04I9mzJMXCpvMiOeMD/Bg8FiymkRgHf/Yo9C1VcyTsw="; + hash = "sha256-Wh3ggKbV0mmcIbpIMsF09UH9ZyVOgpYAx4ppTSUHIKo="; }; - build-system = [ hatchling ]; + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-oNTVzpjDb4bXIpuZcO/6f82UfOVxbkMMluwOKaNM5tE="; + }; - pythonRelaxDeps = [ - "myst-parser" - "sphinx" + build-system = [ + hatch-deps-selector + hatch-jupyter-builder + hatch-nodejs-version + hatchling + ]; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + # jupyter-book requires node at runtime + propagatedBuildInputs = [ + nodejs ]; dependencies = [ - click - jinja2 - jsonschema - linkify-it-py - myst-nb - myst-parser - pyyaml - sphinx - sphinx-comments - sphinx-copybutton - sphinx-external-toc - sphinx-jupyterbook-latex - sphinx-design - sphinx-thebe - sphinx-book-theme - sphinx-togglebutton - sphinxcontrib-bibtex - sphinx-multitoc-numbering + ipykernel + jupyter-core + jupyter-server + nodeenv ]; - pythonImportsCheck = [ - "jupyter_book" - "jupyter_book.cli.main" - ]; + pythonImportsCheck = [ "jupyter_book" ]; + # No python tests nativeCheckInputs = [ - jupytext - pytest-regressions - pytest-xdist - pytestCheckHook - sphinx-inline-tabs - texsoup - writableTmpDirAsHomeHook + versionCheckHook ]; - - disabledTests = [ - # touch the network - "test_create_from_cookiecutter" - - # flaky? - "test_execution_timeout" - - # require texlive - "test_toc" - "test_toc_latex_parts" - "test_toc_latex_urllink" - - # AssertionError: assert 'There was an error in building your book' in '1' - "test_build_errors" - - # WARNING: Executing notebook failed: CellExecutionError [mystnb.exec] - "test_build_dirhtml_from_template" - "test_build_from_template" - "test_build_page" - "test_build_singlehtml_from_template" - - # pytest.PytestUnraisableExceptionWarning: Exception ignored in: - # ResourceWarning: unclosed database in - "test_clean_book" - "test_clean_html" - "test_clean_html_latex" - "test_clean_latex" - ]; - - disabledTestPaths = [ - # require texlive - "tests/test_pdf.py" - ]; - - __darwinAllowLocalNetworking = true; + versionCheckProgramArg = "--version"; meta = { description = "Build a book with Jupyter Notebooks and Sphinx"; diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index a053c43f87e6..c93acec4b909 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_ydoc"; tag = "v${version}"; - hash = "sha256-PGZu3CVF8X9LeFr8HRD7G6LcYoq/RPbqztopopFcAuA="; + hash = "sha256-XGvtGgzTmgulrOtzRy/3sVpUtBi1HaQ2W3d5bWY575E="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index f21a7add8327..1d229c637587 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.27.3"; + version = "2.28.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-6zbKylnnRHGYjwriXHeUVhC4h/d3JVqiH4Bl3vnlHtQ="; + hash = "sha256-NbqoGJixX5NXPi3spQ0RrArkB+u2iCmdOlITJlAzcSw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 5a95b9481025..d4c5d57c6518 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.4.5"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab"; tag = "v${version}"; - hash = "sha256-Joc8gtUJS8J2SLJqBV3f4bzmOje1grdgIMUkcwl9K44="; + hash = "sha256-3vKz79/19F4kZeTjHSChgwAsM8quzIVBmjiRekA/8vo="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src; sourceRoot = "${src.name}/jupyterlab/staging"; - hash = "sha256-EwR1gVrEy7QV8DnJBPx1AlbWY10FFngpLXdAIKn1HI0="; + hash = "sha256-3Gvbsi/oi8lTRrCYut126zsksjSSWmfJCoRxDmjne1E="; }; preBuild = '' diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index e7a0978bb415..c239604f6b90 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kajiki"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jackrosenthal"; repo = "kajiki"; tag = "v${version}"; - hash = "sha256-5qsRxKeWCndi2r1HaIX/bm92oOWU4J4eM9aud6ai8ZQ="; + hash = "sha256-bAgUMA9PlwsO7FRjwiKCsFffLWNU+Go1DToblmyWprk="; }; propagatedBuildInputs = [ linetable ]; diff --git a/pkgs/development/python-modules/kbnf/Cargo.lock b/pkgs/development/python-modules/kbnf/Cargo.lock new file mode 100644 index 000000000000..b6a8bd49edf6 --- /dev/null +++ b/pkgs/development/python-modules/kbnf/Cargo.lock @@ -0,0 +1,1254 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.3", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "windows-sys", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "fixedbitset-stack" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d498da3487b4ea426e370276db9e93c29624b667855b415ccd01da983dd1237" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "general-sam" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5707ba8f51753f8c456213beb1aee9cda85c290368ad013939fbebcf393610a" + +[[package]] +name = "generic-array" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c8444bc9d71b935156cc0ccab7f622180808af7867b1daae6547d773591703" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "half" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +dependencies = [ + "foldhash", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + +[[package]] +name = "insta" +version = "1.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371" +dependencies = [ + "console", + "once_cell", + "similar", +] + +[[package]] +name = "inventory" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83" +dependencies = [ + "rustversion", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jaggedarray" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18d4d488e472f5e805edd8d7e710c255ff19511e3f5fbb0932932bee0e804d5" +dependencies = [ + "generic-array", + "num", + "tinyvec", + "typenum", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "kbnf" +version = "0.5.7" +dependencies = [ + "ahash", + "criterion", + "displaydoc", + "fixedbitset-stack", + "general-sam", + "getrandom 0.2.16", + "insta", + "jaggedarray", + "js-sys", + "kbnf-regex-automata", + "kbnf-syntax", + "log", + "mimalloc", + "nom", + "nonmax", + "num", + "pyo3", + "pyo3-log", + "serde", + "serde-wasm-bindgen", + "serde_json", + "string-interner", + "strum", + "thiserror 2.0.12", + "tinyvec", + "wasm-bindgen", +] + +[[package]] +name = "kbnf-regex-automata" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a900e0a0e795744f6b18fe493500a1d773633972251f84f4be909edfb0d0f2" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "kbnf-syntax" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be809205c11efacf850d7ff585bd346d7d40dceb272f4846294b14d4c3c33995" +dependencies = [ + "general-sam", + "kbnf-regex-automata", + "nom", + "parse-hyperlinks", + "regex-lite", + "regex-syntax", + "rustc-hash", + "serde", + "string-interner", + "thiserror 2.0.12", + "unescaper", +] + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] +name = "parse-hyperlinks" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ac700657cc7a89620d1c28b310d594ff0491c11fd3dd1ae748ed5c5c8640e6" +dependencies = [ + "html-escape", + "nom", + "percent-encoding", + "thiserror 1.0.69", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +dependencies = [ + "cfg-if", + "indoc", + "inventory", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45192e5e4a4d2505587e27806c7b710c231c40c56f3bfc19535d0bb25df52264" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustversion" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "similar" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" + +[[package]] +name = "string-interner" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a3275464d7a9f2d4cac57c89c2ef96a8524dba2864c8d6f82e3980baf136f9b" +dependencies = [ + "hashbrown", + "serde", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + +[[package]] +name = "unescaper" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01d12e3a56a4432a8b436f293c25f4808bdf9e9f9f98f9260bba1f1bc5a1f26" +dependencies = [ + "thiserror 2.0.12", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/kbnf/default.nix b/pkgs/development/python-modules/kbnf/default.nix new file mode 100644 index 000000000000..fa60abf8505c --- /dev/null +++ b/pkgs/development/python-modules/kbnf/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + numpy, + triton, + torch, +}: + +buildPythonPackage rec { + pname = "kbnf"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dan-wanna-M"; + repo = "kbnf"; + rev = "v${version}-python"; + hash = "sha256-reefuqS0eExky9qtxBTqwxnZgK8AWFfkrN+VL/lFLyg="; + }; + + # Manually unarchived from tarball from pypi + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + dependencies = [ + numpy + ]; + + optional-dependencies = { + efficient_logits_mask = [ + triton + ]; + torch = [ + torch + ]; + }; + + pythonImportsCheck = [ + "kbnf" + ]; + + meta = { + description = "Fast constrained decoding engine based on context free grammar"; + homepage = "https://pypi.org/project/kbnf/"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/development/python-modules/kernels/default.nix b/pkgs/development/python-modules/kernels/default.nix index 1d3bb26a713f..a371684c6321 100644 --- a/pkgs/development/python-modules/kernels/default.nix +++ b/pkgs/development/python-modules/kernels/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "kernels"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "kernels"; tag = "v${version}"; - hash = "sha256-ITrriB3G7tuNaGSMDB2o+RqQO7TKerq9F02u1DtzhmM="; + hash = "sha256-fEi7yiLv0a28SefOcF8so9CpNuTinBfrTbEAwwPlKiw="; }; build-system = [ diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index f61fe242dac1..60f4229d2243 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "knack"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cfKmtCrpowLkMkMyD6Be2wmxkzn88fMx9bbQe/l/UpE="; + hash = "sha256-3aNbT/TFdrJQGhjw7C8v4KOl+czoJl1AZtMR5e1LW8Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index b5878244d4c7..9c014b9683c3 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -7,23 +7,23 @@ boto3, buildPythonPackage, confluent-kafka, - fetchPypi, + fetchFromGitHub, google-cloud-pubsub, google-cloud-monitoring, + grpcio, hypothesis, kazoo, msgpack, packaging, + protobuf, pycurl, pymongo, #, pyro4 pytestCheckHook, - pythonOlder, pyyaml, redis, setuptools, sqlalchemy, - typing-extensions, tzdata, urllib3, vine, @@ -31,25 +31,24 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.5.4"; + version = "5.6.1"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-iGYAFoJ16+rak7iI6DE1L+V4FoNC8NHVgz2Iug2Ec2M="; + src = fetchFromGitHub { + owner = "celery"; + repo = "kombu"; + tag = "v${version}"; + hash = "sha256-kywPcWhc+iMh4OOH8gobA6NFismRvihgNMcxxw+2p/4="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ amqp packaging tzdata vine - ] - ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + ]; optional-dependencies = { msgpack = [ msgpack ]; @@ -72,6 +71,8 @@ buildPythonPackage rec { gcpubsub = [ google-cloud-pubsub google-cloud-monitoring + grpcio + protobuf ]; # pyro4 doesn't support Python 3.11 #pyro = [ diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index a744f4086c65..cfb53b58ff88 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -73,6 +73,5 @@ buildPythonPackage rec { homepage = "https://github.com/kubernetes-client/python"; changelog = "https://github.com/kubernetes-client/python/releases/tag/${src.tag}"; license = licenses.asl20; - maintainers = with maintainers; [ lsix ]; }; } diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index ce84718b7579..6c0de9b23fb2 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-OqSaDe0xA1S/KphpwJuIcyOrcT9sq+0oHhiIBtd7bcY="; + hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw="; }; sourceRoot = "${src.name}/python/lance_namespace_urllib3_client"; diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix index 38c262fada14..cc70c285605f 100644 --- a/pkgs/development/python-modules/lance-namespace/default.nix +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.0.21"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U="; + hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw="; }; sourceRoot = "${src.name}/python/lance_namespace"; diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix index e30ec4de5018..0b5317257556 100644 --- a/pkgs/development/python-modules/langchain-fireworks/default.nix +++ b/pkgs/development/python-modules/langchain-fireworks/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-fireworks"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-fireworks==${version}"; - hash = "sha256-JULxbSSSerM7HifVBRxkv5YgpP5jFdm3XzHIJbM8T1Y="; + hash = "sha256-gLc3pPxQZTm6PU5r1o7mxlnRI8tCeg/w9jkbbfUCSec="; }; sourceRoot = "${src.name}/libs/partners/fireworks"; diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index da74e64c54a8..e22b989117bd 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-groq"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-groq==${version}"; - hash = "sha256-08dEZI+sI33i4FGSAVvE3i5KIRccdslw0PXqXlMLldE="; + hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI="; }; sourceRoot = "${src.name}/libs/partners/groq"; diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix index 439645e39337..435a491a2b32 100644 --- a/pkgs/development/python-modules/langchain-xai/default.nix +++ b/pkgs/development/python-modules/langchain-xai/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "langchain-xai"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-xai==${version}"; - hash = "sha256-engdUNTT3KsAGrJ93PiFQoI6jbBFPAqavDsrD073484="; + hash = "sha256-bm7sIa62CIvsYNDdaN+XZKpRnCv5bg9kPZ1Ym8utFcM="; }; sourceRoot = "${src.name}/libs/partners/xai"; diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 8719249383e2..9892b7a2c4bc 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "3.8.1"; + version = "3.10.5"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; tag = "v${version}"; - hash = "sha256-HXg7p3yfRXK13FLxkfCaKxZxDkXX8Y274ZVKL17Zj0A="; + hash = "sha256-OEbocc1yZjTUryqxHr4wCtd18u/L6fKdJBvUMAwx1oo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 94bf3ba3c234..0353c586466f 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.2.9"; + version = "0.2.12"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-aEvZFF1bTRAZ7EQ6YL7p1OcQJmdysKYtTZJVPcsNU50="; + hash = "sha256-RD+P34ksvZj8cCv4GpTGB00mZUQK9sgIzzVZoTmDowk="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 1607f4b261a9..22fb68f3ea6b 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.4.41"; + version = "0.4.49"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-hZRZ4IAPKxCtvDZfk9D5irkYk0KM6pG2l+HSq742KYw="; + hash = "sha256-LOqSXL261+7xWRS8WI+uY3Ij4NemnIyfp3r+XJdmD+U="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/lastversion/default.nix b/pkgs/development/python-modules/lastversion/default.nix index cb835bd32ca2..d184cefd7ff4 100644 --- a/pkgs/development/python-modules/lastversion/default.nix +++ b/pkgs/development/python-modules/lastversion/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "lastversion"; - version = "3.5.7"; + version = "3.5.8"; pyproject = true; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "dvershinin"; repo = "lastversion"; tag = "v${version}"; - hash = "sha256-z3QrtnhIgXLVyaDNm0XqaVqZb05K3pq8mbweTpphdBQ="; + hash = "sha256-J1rx014cuZ2vLDnMg3SRT+ojEsF1KJyGvdDXNBs3Q7g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix index a732a2cb49f9..bf0ca03a7ac8 100644 --- a/pkgs/development/python-modules/lcgit/default.nix +++ b/pkgs/development/python-modules/lcgit/default.nix @@ -4,22 +4,19 @@ fetchFromGitHub, pytestCheckHook, pytest-cov-stub, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "lcgit"; - version = "2.1.0"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "cisagov"; repo = "lcgit"; tag = "v${version}"; - hash = "sha256-s77Pq5VjXFyycVYwaomhdNWXKU4vGRJT6+t89UvGdn4="; + hash = "sha256-nCsTA0BKE/0afcqqqEx0mUrLOFbta14TPtNXHD67mas="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/leanblueprint/default.nix b/pkgs/development/python-modules/leanblueprint/default.nix index 453014432ee7..5a43d2388946 100644 --- a/pkgs/development/python-modules/leanblueprint/default.nix +++ b/pkgs/development/python-modules/leanblueprint/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage { pname = "leanblueprint"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { repo = "leanblueprint"; owner = "PatrickMassot"; - rev = "v0.0.18"; - hash = "sha256-kikeLc0huJHe4Fq207U8sdRrH26bzpo+IVKjsLnrWgY="; + rev = "v0.0.19"; + hash = "sha256-WARjzalYMvbw5IlhehRX+Na5aEmgM3HKy+s0x3GJNCY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 3c556c1293be..f6961d33b45a 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.8.0"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-Hes5ZDzqbulUxEhuBCcwuOmNDClY8xyzeXbj1FaVvd0="; + hash = "sha256-nWm0h/ceGDtoUVqYPkIC+anXrneJsxlZ4DN3Wge0NCk="; }; build-system = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 951b441068f6..af330c86e237 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2025.7.18"; + version = "2025.11.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-iXu+ObOFd0iQae8/mY2ztt7s4kuKutX3huHN7jP3cHE="; + hash = "sha256-cvlp1cfsdN8lv8hFvaHV6vtWEJ0CJUBmN1yCgxrhMi8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 5b1d8976d9ff..35f0d81e4797 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -5,20 +5,17 @@ httpx, poetry-core, pydantic, - pythonOlder, }: buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.44"; + version = "0.1.45"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-J2orT5RGPaA3QxyjBjMxs7a+OYu/sAMRPudrfCqHO1M="; + hash = "sha256-FAJEAIzFcQ4xrpfGBDlzo6mWmlGw84FV+jOoQ0B46Ko="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 08597d833e76..27781bd0c2c2 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -9,6 +9,7 @@ # nativeBuildInputs cmake, ninja, + autoAddDriverRunpath, # build-system pathspec, @@ -73,13 +74,13 @@ buildPythonPackage rec { # -mcpu, breaking linux build as follows: # # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ - "-DGGML_NATIVE=off" - "-DGGML_BUILD_NUMBER=1" + (lib.cmakeBool "GGML_NATIVE" false) + (lib.cmakeFeature "GGML_BUILD_NUMBER" "1") ] ++ lib.optionals cudaSupport [ - "-DGGML_CUDA=on" - "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}" - "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}" + (lib.cmakeBool "GGML_CUDA" true) + (lib.cmakeFeature "CUDAToolkit_ROOT" "${lib.getDev cudaPackages.cuda_nvcc}") + (lib.cmakeFeature "CMAKE_CUDA_COMPILER" "${lib.getExe cudaPackages.cuda_nvcc}") ]; enableParallelBuilding = true; @@ -87,6 +88,9 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ninja + ] + ++ lib.optionals cudaSupport [ + autoAddDriverRunpath ]; build-system = [ @@ -125,7 +129,13 @@ buildPythonPackage rec { "test_real_llama" ]; - pythonImportsCheck = [ "llama_cpp" ]; + pythonImportsCheck = lib.optionals (!cudaSupport) [ + # `libllama.so` is loaded at import time, and failing when cudaSupport is enabled as the cuda + # driver is missing in the sandbox: + # RuntimeError: Failed to load shared library '/nix/store/...-python3.13-llama-cpp-python-0.3.16/lib/python3.13/site-packages/llama_cpp/lib/libllama.so': + # libcuda.so.1: cannot open shared object file: No such file or directory + "llama_cpp" + ]; passthru = { updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix index 96d199750176..f12acad69449 100644 --- a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-node-parser-docling"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchPypi { pname = "llama_index_node_parser_docling"; inherit version; - hash = "sha256-1Nauru9zoHaUvDiAQ2ZPwGXjwLQj2ztBaCpEHsr3YfM="; + hash = "sha256-CxrHPdNq+7bVfwEbtKzStiqXRGXlOChoeN0ADIjZ7kE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index db9bec638bfa..cfe9504ac9c9 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-ydsYarmWZ2DU6ngWtotFIoTutbhXXmvGGxt2vcubcTo="; + hash = "sha256-0p25AoDSSCvarESejZBw4AfsMDsEjt+2ckfdXCBuerU="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix index b884507a077d..e3b86a463838 100644 --- a/pkgs/development/python-modules/llm-venice/default.nix +++ b/pkgs/development/python-modules/llm-venice/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "llm-venice"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "ar-jan"; repo = "llm-venice"; tag = version; - hash = "sha256-N/nmbsIAkw41qKi37BgkX3DBN0AJnPMyx0y9QzTsVmw="; + hash = "sha256-CwvFthuahWPmenI4jrhGmscJd1sJCXkkvU+hYYYekx0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index 42354d7b107a..96bf15fd12e0 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "locust-cloud"; - version = "1.29.4"; + version = "1.29.5"; pyproject = true; src = fetchFromGitHub { owner = "locustcloud"; repo = "locust-cloud"; tag = version; - hash = "sha256-3rlHtOSYMfHbNdWpo59OXS1Z1BWY99d7AKmZZuxAz9E="; + hash = "sha256-mZvAJDMMLOU53DrwHNKpJxpRWq5QQsTu2K+GhtY6K7M="; }; build-system = [ diff --git a/pkgs/development/python-modules/logboth/default.nix b/pkgs/development/python-modules/logboth/default.nix new file mode 100644 index 000000000000..6e4ced1405ef --- /dev/null +++ b/pkgs/development/python-modules/logboth/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + setuptools, +}: + +buildPythonPackage rec { + pname = "logboth"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitLab { + owner = "zehkira"; + repo = "logboth"; + tag = "v${version}"; + hash = "sha256-z62atvFYrRqjcGQbTlWadoG1TPrNl8WwDBclzhqQtPA="; + }; + + build-system = [ setuptools ]; + + checkPhase = '' + runHook preInstallCheck + + python3 source/tests/tests.py + + runHook postInstallCheck + ''; + + pythonImportsCheck = [ "logboth" ]; + + meta = { + description = "Easily write logs to standard output and a file at the same time"; + homepage = "https://gitlab.com/zehkira/logboth"; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index 769b9ceaa20c..504063f6e12c 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -3,32 +3,39 @@ buildPythonPackage, click, fetchPypi, - magika, numpy, onnxruntime, hatchling, python-dotenv, - pythonOlder, - stdenv, tabulate, - testers, tqdm, + pytestCheckHook, + dacite, + versionCheckHook, }: buildPythonPackage rec { pname = "magika"; version = "1.0.1"; pyproject = true; - disabled = pythonOlder "3.9"; + # Use pypi tarball instead of GitHub source + # Pypi tarball contains a pure python implementation of magika + # while GitHub source requires compiling magika-cli src = fetchPypi { inherit pname version; hash = "sha256-MT+Mv83Jp+VcJChicyMKJzK4mCXlipPeK1dlMTk7g5g="; }; - nativeBuildInputs = [ hatchling ]; + postPatch = '' + substituteInPlace tests/test_python_magika_client.py \ + --replace-fail 'python_root_dir / "src" / "magika" / "cli" / "magika_client.py"' \ + "Path('$out/bin/magika-python-client')" + ''; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ click numpy onnxruntime @@ -37,18 +44,33 @@ buildPythonPackage rec { tqdm ]; + nativeCheckInputs = [ + pytestCheckHook + dacite + versionCheckHook + ]; + + disabledTests = [ + # These tests require test data which doesn't exist in pypi tarball + "test_features_extraction_vs_reference" + "test_reference_generation" + "test_inference_vs_reference" + "test_reference_generation" + "test_magika_module_with_one_test_file" + "test_magika_module_with_explicit_model_dir" + "test_magika_module_with_basic" + "test_magika_module_with_all_models" + "test_magika_module_with_previously_missdetected_samples" + ]; + pythonImportsCheck = [ "magika" ]; - passthru.tests.version = testers.testVersion { package = magika; }; - - meta = with lib; { + meta = { description = "Detect file content types with deep learning"; homepage = "https://github.com/google/magika"; changelog = "https://github.com/google/magika/blob/python-v${version}/python/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ mihaimaruseac ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mihaimaruseac ]; mainProgram = "magika-python-client"; - # Currently, disabling on AArch64 as it onnx runtime crashes on ofborg - broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index 46a9888eccd1..ccdba459a699 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -9,19 +9,16 @@ imapclient, mail-parser, publicsuffix2, - pythonOlder, }: buildPythonPackage rec { pname = "mailsuite"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-xYM4/Ou91WtYwiobE9ihlYGu8ViNTVbSLFGi8Y9yPc4="; + hash = "sha256-+QPGSQQZaUjDmTGhZZoyTGegKV9DBqrgnxdQpEgszrI="; }; pythonRelaxDeps = [ "mail-parser" ]; diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 58cfef91d255..22b8fa31bf6e 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = "manimpango"; tag = "v${version}"; - hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w="; + hash = "sha256-8eQmhVsW440/zxOwjngnPTGT7iFbdSvBV7tnI332piE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 828da8ce056e..5aec1a636887 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -87,7 +87,6 @@ buildPythonPackage rec { homepage = "https://markdown-it-py.readthedocs.io/"; changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; mainProgram = "markdown-it"; }; } diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index b87182cdf8c9..3d8ba9d94402 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "markdownify"; - version = "1.2.0"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "matthewwithanm"; repo = "python-markdownify"; tag = version; - hash = "sha256-/u9rjbHeBhiqzpudsv2bFSaFbme1zmCv8/jEflEDNkQ="; + hash = "sha256-r6nah7QavrMjIHd5hByhy90OoTDb2iIhFZ+YV0h61fU="; }; build-system = [ diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 80f763451ffe..fec7525ca49d 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { homepage = "https://github.com/Fatal1ty/mashumaro"; changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index fdf9e52963f4..ce139015640d 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Python Mattermost Driver"; homepage = "https://github.com/Vaelor/python-mattermost-driver"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 40f7d8e83db9..494b7ba7c854 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab - perchun + PerchunPak ]; mainProgram = "mcstatus"; }; diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 130dcd5e2802..73c91c380429 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,26 +14,23 @@ more-itertools, pytest-snapshot, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "4.4.1"; + version = "4.4.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-mkdocs"; tag = "v${version}"; - hash = "sha256-J1gLi85tEFJcWupV2FzunJhROFdU3G12hRHxbLSX0kc="; + hash = "sha256-u3IHqllknX6ilReXRVyZoDfqid8Ioe+zvC3wPh04HXo="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ mdformat mdformat-gfm mdit-py-plugins diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index cbbea4d9189a..2793cb1de855 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -43,6 +43,5 @@ buildPythonPackage rec { homepage = "https://github.com/coddingtonbear/python-measurement"; changelog = "https://github.com/coddingtonbear/python-measurement/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 0c9067f29dd0..abe38fe00ecc 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.19.12"; + version = "2.19.13"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-f6TPWEaMv6lAS56T+6hi4u5d1DwwHZUmNXw0LpPaZLQ="; + hash = "sha256-P5Ic1n69uAAL2FllmooV5vBfjgKTM8l1iKpEIJsHSwU="; }; build-system = [ diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index f6d9e319827f..bfd09db372c0 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -65,6 +65,5 @@ buildPythonPackage rec { mainProgram = "milc-color"; homepage = "https://milc.clueboard.co"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index e10f27161c3a..2b298fa1f0a4 100644 --- a/pkgs/development/python-modules/mill-local/default.nix +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -4,24 +4,24 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "mill-local"; - version = "0.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "0.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyMillLocal"; tag = version; - hash = "sha256-WPL9vPK625gs3IO2XMFRCD+J6dQSxmEqg6FsX+2RLNk="; + hash = "sha256-t6nZ6KXX5GFIcdNIXyFxYtSjOuuUJmCekaBITNgcIkU="; }; - propagatedBuildInputs = [ + buildInputs = [ setuptools ]; + + dependencies = [ aiohttp async-timeout ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate locally with Mill heaters"; homepage = "https://github.com/Danielhiversen/pyMillLocal"; - changelog = "https://github.com/Danielhiversen/pyMillLocal/releases/tag/${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/Danielhiversen/pyMillLocal/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix b/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix index dc04cb99178a..2cf47bd6c186 100644 --- a/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix +++ b/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ mausch - tjni ]; }; } diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 1dfa66daed9d..4d0fbec40c94 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.18"; + version = "7.2.20"; pyproject = true; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; tag = version; - hash = "sha256-2SmqtCWOwmSxi9vsBvH2bhYiUwc2LyZ/zO2jJpnhPDw="; + hash = "sha256-k7bMXEwRNqx5a6qz4+Yxs/zMANReHFKU2Ks/GSD4JKo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 3193cc4b405d..c1597ec6c2a7 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { inherit (mitmproxy-rs) version; format = "wheel"; + # Note: if this isn't downloading, its because mitmproxy-rs updated without also updating this. src = fetchPypi { pname = "mitmproxy_macos"; inherit version; format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-NArp10yhERk7Hhw5fIU+ekbupyldyzpLQdKgebiUpOM="; + hash = "sha256-baAfEY4hEN3wOEicgE53gY71IX003JYFyyZaNJ7U8UA="; }; # repo has no python tests @@ -29,6 +30,6 @@ buildPythonPackage rec { description = "MacOS Rust bits in mitmproxy"; homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos"; platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index c62832bd0989..1af088fc8ded 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.34"; + version = "0.3.35"; pyproject = true; src = fetchFromGitHub { owner = "mitogen-hq"; repo = "mitogen"; tag = "v${version}"; - hash = "sha256-0g3wPpim7Il6eQ/R8C3DoKy5kRqHBdTlNden3cWNvks="; + hash = "sha256-1GJRomtIrm9Dudc8mTATc7CM7VFTHjF5X2IfW4AV/ms="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index 88523d744a7e..715ee093c246 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "mkdocs-awesome-nav"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasgeiter"; repo = "mkdocs-awesome-nav"; tag = "v${version}"; - hash = "sha256-JeVOJl26ooAZ2xbmyOqSKRa/5Dbu5BXov3ZS6sXgnnU="; + hash = "sha256-guv+c4QwaATYEZ6XcWVZaOcZ7U9oLsW+RdWBtB1Xrnc="; }; build-system = [ flit-core ]; 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 76cddd6eafde..1517d96cebf2 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.4.7"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; tag = "v${version}"; - hash = "sha256-xSm+Qvk1DU5CEZpR+69oIAKnIrg/J7iECNHEZQlf/7o="; + hash = "sha256-3Txfb4ErY8moCBlXp6DgrL5BXTggu8XMa3sU4AfRS8U="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 71d139909ecc..9caa5976aacb 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-3oC3eVm+RYkn+1OqUU2f/dzV/rY8T7EePDxnE/1t6n4="; + hash = "sha256-xaLC4zzX18lzYNpNJQrx3IXcZ22qQgktzzzgKDef8xE="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index 07e7a870b38d..acada1f651ae 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { description = "Python hooks for Intel(R) Math Kernel Library runtime control settings"; homepage = "https://github.com/IntelPython/mkl-service"; license = licenses.bsd3; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index 5a0a50a8bc20..aa4907f3482d 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -128,6 +128,33 @@ buildPythonPackage rec { # ValueError: User specified autocast device_type must be cuda or cpu, but got mps "tests/test_runner/test_runner.py::TestRunner::test_test" "tests/test_runner/test_runner.py::TestRunner::test_val" + + # Fails in pytestCheckHook due to multiple copies accessing the same resources (nixpkgs-review + "tests/test_hooks/test_ema_hook.py::TestEMAHook::test_after_test_epoch" + "tests/test_hooks/test_ema_hook.py::TestEMAHook::test_after_val_epoch" + "tests/test_hooks/test_ema_hook.py::TestEMAHook::test_before_test_epoch" + "tests/test_hooks/test_ema_hook.py::TestEMAHook::test_before_val_epoch" + "tests/test_infer/test_infer.py" + "tests/test_runner/test_runner.py::TestRunner::test_checkpoint" + + # torch.distributed.DistNetworkError: [...] message: address already in use + # Happens in nixpkgs-review due to the lack of network namespacing + # Note: These all worked fine in nix-build + "tests/test_dist/test_dist.py" + "tests/test_dist/test_utils.py" # fails in _init_dist_env + "tests/test_hooks/test_sync_buffers_hook.py::TestSyncBuffersHook::test_sync_buffers_hook" + "tests/test_model/test_model_utils.py::test_is_model_wrapper" + "tests/test_model/test_wrappers/test_model_wrapper.py::TestDistributedDataParallel" + "tests/test_optim/test_optimizer/test_optimizer.py::TestZeroOptimizer::test_zero_redundancy_optimizer" + "tests/test_runner/test_runner.py::TestRunner::test_custom_loop" + "tests/test_runner/test_runner.py::TestRunner::test_default_scope" + "tests/test_runner/test_runner.py::TestRunner::test_init" + "tests/test_runner/test_runner.py::TestRunner::test_train" + "tests/test_optim/test_optimizer/test_optimizer_wrapper.py::TestOptimWrapper::test_optim_context" + "tests/test_testing/test_runner_test_case.py" + + # TypeError: 'BaseDataset' object is not callable + "tests/test_dataset/test_base_dataset.py::TestBaseDataset::test_get_subset[False-True]" ]; disabledTests = [ @@ -149,10 +176,10 @@ buildPythonPackage rec { # Fails when max-jobs is set to use fewer processes than cores # for example `AssertionError: assert 14 == 4` "test_setup_multi_processes" - ]; - # torch.distributed.DistNetworkError: The server socket has failed to bind. - __darwinAllowLocalNetworking = true; + # Crashes in pytestCheckHook due to MPS incompatibility in torch + "test_with_runner" + ]; meta = { description = "Library for training deep learning models based on PyTorch"; diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 47ba794d0a0b..69d9aa2ea3ad 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Simulate a MongoDB server"; license = licenses.asl20; homepage = "https://github.com/ajdavis/mongo-mockup-db"; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 2a3c51994852..3f6f27d26c51 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { homepage = "https://github.com/ansible-community/molecule"; changelog = "https://github.com/ansible/molecule/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ dawidd6 ]; + maintainers = [ ]; mainProgram = "molecule"; }; } diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index 3d98ecd03980..18966476a3a1 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection on molecule plugins"; homepage = "https://github.com/ansible-community/molecule-plugins"; - maintainers = with maintainers; [ dawidd6 ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index d62180f93e19..8769c75114d2 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; homepage = "https://github.com/mongodb/motor"; changelog = "https://github.com/mongodb/motor/releases/tag/${src.tag}"; - maintainers = with lib.maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 61f13945c114..79b890ae60ca 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -2,11 +2,11 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, poetry-core, aenum, aioconsole, aiohttp, + aiohttp-retry, inflection, pydantic, python-dateutil, @@ -18,23 +18,21 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.6"; + version = "5.3.1.108.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-0TZHH/EXemsSysgfCzg66x5QhAEDUqRyg+qoK/3YuQA="; + hash = "sha256-12qjXQKQS3k1hDRLW0UkR5OqHM/QmXKOnfoJVguhHWQ="; }; build-system = [ poetry-core ]; dependencies = [ - aenum aioconsole aiohttp + aiohttp-retry inflection pydantic python-dateutil diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 0bf7a6d2758d..548f24f26a34 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.49.0"; + version = "1.50.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-M1qC+gdjayDKEYSF6f1rSZNrh7TQuHKC/a+PzCUX7Sw="; + hash = "sha256-pSyqU8sUIK+axSu5JoI/ARkhiDxTahpqgcMqLhBvmpw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 69ccd0ec6a77..980bcafa9b2a 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-lw28RAEzccLeZF+cN6m0Hxi0/DaK3IxfgFeYgSG+YQs="; + hash = "sha256-Wm3Gt9tB6wq4ckzUd70DFrpLU96/wtgKLW9EShFvuNI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index e8f3d7fe965b..b26a7b0829f1 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "multimethod"; - version = "2.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "coady"; repo = "multimethod"; tag = "v${version}"; - hash = "sha256-/91re2K+nVKULJOjDoimpOukQlLlsMS9blkVQWit2eI="; + hash = "sha256-0En3NdLLmS/4bw0I3z9xxKa85tECi1rjmpZyxYuZk3w="; }; nativeBuildInputs = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multiple argument dispatching"; homepage = "https://coady.github.io/multimethod/"; - changelog = "https://github.com/coady/multimethod/tree/${src.tag}#changes"; + changelog = "https://github.com/coady/multimethod/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 79ff95e4a560..1c4cae411c2f 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -76,6 +76,5 @@ buildPythonPackage rec { mainProgram = "myfitnesspal"; homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index cb58d7a55244..efd88258712f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -46,603 +46,603 @@ let in { mypy-boto3-accessanalyzer = - buildMypyBoto3Package "accessanalyzer" "1.41.0" - "sha256-XD1ljr5lXkic+ZEXWCE0AlJaeKTbx/dqzVRCfVF6FRg="; + buildMypyBoto3Package "accessanalyzer" "1.42.3" + "sha256-6eYpAzfuDqzsW0FYFpdZ4TpdPeS0D+s8Y7LX8B1QwOw="; mypy-boto3-account = - buildMypyBoto3Package "account" "1.41.0" - "sha256-mMujPNe/GOUYJEuxLN+tCjmaclrwgrZhytBItsiejU0="; + buildMypyBoto3Package "account" "1.42.3" + "sha256-H4duy2g9rKUloMEXxoEpG7x7F3xz9dxiJZHipOUP/yo="; mypy-boto3-acm = - buildMypyBoto3Package "acm" "1.41.0" - "sha256-0rqVmcs9qpZ9FtmsVqDNtmFEsNzvpP5UKcwKkPZLkvI="; + buildMypyBoto3Package "acm" "1.42.3" + "sha256-5g2+5aDKHUJUr1LhGpsv1MovPFLuKvzNGlqFAn7m+xM="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.41.0" - "sha256-F5z5katpCfMz1oblJHdDVgzyUvzlSGcvmsQf1gdSHx4="; + buildMypyBoto3Package "acm-pca" "1.42.3" + "sha256-0lg6uZvh8R3Vk1WpUUliceEbU8oHniIkfpYkX1q8VnM="; mypy-boto3-amp = - buildMypyBoto3Package "amp" "1.41.0" - "sha256-wjH55hDXgHzucmlk2RToH5njm+1JGjWHvbSKntNzHa8="; + buildMypyBoto3Package "amp" "1.42.3" + "sha256-hT/YK9234i1l9viz0pGJm7ab5spLxbfGmlzeKc/8naA="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.41.0" - "sha256-UnRz8ET3HmyH9SioSYHmoC7zuzRf4IgBgicRdYPjXRg="; + buildMypyBoto3Package "amplify" "1.42.3" + "sha256-T3jbr0pptSc8vfUoSU9qQSelKfALNmm9W9rD7KppajE="; mypy-boto3-amplifybackend = - buildMypyBoto3Package "amplifybackend" "1.41.0" - "sha256-6AasRHvzMnvoj0tfZX03H4M8+7LazUS9czLFCYaqrXI="; + buildMypyBoto3Package "amplifybackend" "1.42.3" + "sha256-LyQTUXGSdt7IJrOOOEcJg66VcI9xtX3/kG2B+r+B9og="; mypy-boto3-amplifyuibuilder = - buildMypyBoto3Package "amplifyuibuilder" "1.41.0" - "sha256-r7qGUHHpjswTrauKY4XiowbZATmDFDo801XpW32mUwI="; + buildMypyBoto3Package "amplifyuibuilder" "1.42.3" + "sha256-Q8nkt2PJnip62r2lbCZcB9qGE6sSg28ZAycLI8gIQ7s="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.41.2" - "sha256-+pPgM67IrQXkQyB6rXxXrVo5EOZlxNFRRoExrqdLfyw="; + buildMypyBoto3Package "apigateway" "1.42.3" + "sha256-JVGKx+VCoE4EvUrxsmFsdXwu6gaprva+q1xrsSl5EDA="; mypy-boto3-apigatewaymanagementapi = - buildMypyBoto3Package "apigatewaymanagementapi" "1.41.0" - "sha256-I3ZhF9Dm1v+rcL2wtl3B3I08schyrB2ALvNKujgBUok="; + buildMypyBoto3Package "apigatewaymanagementapi" "1.42.3" + "sha256-Krejmp4mDW+6W1eGgpk8qeujMKXepkZZF3FS6PuG1tI="; mypy-boto3-apigatewayv2 = - buildMypyBoto3Package "apigatewayv2" "1.41.0" - "sha256-CyvkqMZqe0NQN86NlRnkThc9APTd7RIhS9T8ezlOQ2E="; + buildMypyBoto3Package "apigatewayv2" "1.42.3" + "sha256-lnm33RjFDpXub+eittBLdXbhKiq/4lKK1ste+hIEjIg="; mypy-boto3-appconfig = - buildMypyBoto3Package "appconfig" "1.41.0" - "sha256-ESZeKbU3jgqmHpgMAbnG5oZHgzuYQDkfT2mhqamNlfA="; + buildMypyBoto3Package "appconfig" "1.42.3" + "sha256-YG03dlJZyFSjV06sw/5co5VrXEVrEv+AyOHLIL2rkRk="; mypy-boto3-appconfigdata = - buildMypyBoto3Package "appconfigdata" "1.41.0" - "sha256-pa8LMyNFaRgcByLRqExCh/T00e+vz0lJr9nMYUQ+wSQ="; + buildMypyBoto3Package "appconfigdata" "1.42.3" + "sha256-WV426fR3IFkW4fEdKMbDNdYGog5VvLeTpDpLSKSysy0="; mypy-boto3-appfabric = - buildMypyBoto3Package "appfabric" "1.41.0" - "sha256-kqqiBj5RPasumOgDC88cgytek1qnMVvhWW+NwMIyEy0="; + buildMypyBoto3Package "appfabric" "1.42.3" + "sha256-1yz5ybS89QjB90u8jBtGfcO3yr8ps0YgY8hR8f4ULuE="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.41.0" - "sha256-OLleWS1SYn4Y7JFnyiixKUQoFxpMcwT3I/ajptABtPw="; + buildMypyBoto3Package "appflow" "1.42.3" + "sha256-JUvz8VRO/t7KlrvFYWb53Qj8uXDOwHFtT16QCxO/ubw="; mypy-boto3-appintegrations = - buildMypyBoto3Package "appintegrations" "1.41.0" - "sha256-fVuJ4Wu1G03ukgnw12E1UBvGT/2ORgFpCqw6Qfdk3a8="; + buildMypyBoto3Package "appintegrations" "1.42.3" + "sha256-VCD5PLHXJvusiSh9uIN9mrAHA1jwklF4SU7h6AWxzG0="; mypy-boto3-application-autoscaling = - buildMypyBoto3Package "application-autoscaling" "1.41.0" - "sha256-z96/hxoHwQFZF2PqUUshHl7Hxnd2YspUIk7Njikv3Tg="; + buildMypyBoto3Package "application-autoscaling" "1.42.3" + "sha256-lO+lh3quoxg68y9p1wx8plhWFFtVBf6BNIKZhYMQ8OQ="; mypy-boto3-application-insights = - buildMypyBoto3Package "application-insights" "1.41.0" - "sha256-PGsUW2WGc1ZCiDi8iROfGyeQP1qJvZrB3AN6R2jDGik="; + buildMypyBoto3Package "application-insights" "1.42.3" + "sha256-8AwPxJHXtgmSPfyfuoLeno49sLJ3lJhBWB+vK56iTUI="; mypy-boto3-applicationcostprofiler = - buildMypyBoto3Package "applicationcostprofiler" "1.41.0" - "sha256-sq5pRanpdlndSPclW2q68fQc6HZbTu3olMKd7cysglw="; + buildMypyBoto3Package "applicationcostprofiler" "1.42.3" + "sha256-6fh0DnPk3yhleWCLnUJ/is5nRXrXZXEzpi8oO4q1zK0="; mypy-boto3-appmesh = - buildMypyBoto3Package "appmesh" "1.41.0" - "sha256-QUXVCzCEepuKIHNYykP/IRWZEZSkOF0a9T37/CaKGhQ="; + buildMypyBoto3Package "appmesh" "1.42.3" + "sha256-97tJFt934dOeY79zPZmYdSIorRSgVT0N1PT0DvcDbjA="; mypy-boto3-apprunner = - buildMypyBoto3Package "apprunner" "1.41.0" - "sha256-HHh5F9fl6FUiLN7TYWr79qekw7+RgrnhvHQQLc435PI="; + buildMypyBoto3Package "apprunner" "1.42.3" + "sha256-Mvf3bBhrRRR+hoAsBPq7p9COJqVxV9LL+GrnikrHX2g="; mypy-boto3-appstream = - buildMypyBoto3Package "appstream" "1.41.0" - "sha256-hhm8V0Rth32Vxm+szkkm+MAIvIKBjmGJasxuyqWesOc="; + buildMypyBoto3Package "appstream" "1.42.3" + "sha256-74QGXKJ7NwjfcS6sHHxP0GU4Nb1KK299degnaSBWdhE="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.41.0" - "sha256-BdSsZWN0HwLcpUMH7xsIxJx4loNQyuvzMOTi+dzsrDQ="; + buildMypyBoto3Package "appsync" "1.42.3" + "sha256-xeT2ZAlSsG+Yl2dUaPat9zhLHlupfZPvxVg/QzSe4oo="; mypy-boto3-arc-zonal-shift = - buildMypyBoto3Package "arc-zonal-shift" "1.41.0" - "sha256-/hOp4fR72GY663pXVcCTcqSR+KSNzZW9RO+l1amQOxg="; + buildMypyBoto3Package "arc-zonal-shift" "1.42.3" + "sha256-9GHZy/GvevYqzWoY9ubb+/8P33SMvNUurg9WsUq82ls="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.41.2" - "sha256-NiOxdhyaoCduSqG3/MxgUca9yrhROVTQ+JLu2PBPZHI="; + buildMypyBoto3Package "athena" "1.42.3" + "sha256-+XScvF3ZrTdLnbZ0hhURO/tvTVRWOcBwNL3JvHUfwq8="; mypy-boto3-auditmanager = - buildMypyBoto3Package "auditmanager" "1.41.0" - "sha256-GTFJ5vTrn2cesnQaPzJzXb3Zd53rzDOA6LyH2lprvug="; + buildMypyBoto3Package "auditmanager" "1.42.3" + "sha256-jW+LgaUpdeCSJLnpNE13DSio9nFmp0icoLEMwxX44KU="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.41.1" - "sha256-oKPvn6pv2wRPu2l3oNOphUgkaAFq+HmhCUXTi71FxLk="; + buildMypyBoto3Package "autoscaling" "1.42.3" + "sha256-WUD99NFy2KrOG5M1kP8J1B9tRDNZcvOu6J8zw534r6k="; mypy-boto3-autoscaling-plans = - buildMypyBoto3Package "autoscaling-plans" "1.41.0" - "sha256-Y1bZsWppIJKw3fkEhVz+uEm/JbyY7Ot/ysKnwH9P7uw="; + buildMypyBoto3Package "autoscaling-plans" "1.42.3" + "sha256-BJ5MKA8jpafHN014Y+pLo1IKcVq1PAfufGlCFwEGSKk="; mypy-boto3-backup = - buildMypyBoto3Package "backup" "1.41.0" - "sha256-++Vizo1wxUQWWylXVzBrR/3c2Y7Iwn/2dW16NUGTwQY="; + buildMypyBoto3Package "backup" "1.42.3" + "sha256-ESsxNpqqY56rqbweQLpcLDA25i6+A59hiOB9AUk+W8k="; mypy-boto3-backup-gateway = - buildMypyBoto3Package "backup-gateway" "1.41.0" - "sha256-JMDwYyH7eehFgJAqJJv9T2nfLFSQ7kdveQgJlHfUDk0="; + buildMypyBoto3Package "backup-gateway" "1.42.3" + "sha256-uKbD5VkYnYO2PKd1Lp9PAg9+5p8X+LisT+N6TsqhZRY="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.41.0" - "sha256-P75YCwSwc7/H6TIHWD21iNtU8D0MLyfbALxR86cZvC0="; + buildMypyBoto3Package "batch" "1.42.3" + "sha256-8vWX/eJxWKoe4c3aTUrQf11UDeMMJ4BDYwFYwDpEyzY="; mypy-boto3-billingconductor = - buildMypyBoto3Package "billingconductor" "1.41.0" - "sha256-RW7RKSjeP70MrVWw7Ol5b17FMKvm7E6xHcNh0lwQY4w="; + buildMypyBoto3Package "billingconductor" "1.42.3" + "sha256-eRAaTJBaTMpyZO0VbJgVF6GIa2Xi06o3vtKptU24oXQ="; mypy-boto3-braket = - buildMypyBoto3Package "braket" "1.41.1" - "sha256-vkaaGr3aFi+v+g41Np4vwhZGggG/l4W4Ps/rih0JhSQ="; + buildMypyBoto3Package "braket" "1.42.3" + "sha256-p8bdld0zrW6NzBndSczyHclvkhKb4VW8npiAKz+8Ge4="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.41.1" - "sha256-n0gipTIbrw5NiLK26uhDpIww2Dlw6GFaHmnzzzkBt4M="; + buildMypyBoto3Package "budgets" "1.42.3" + "sha256-ycyUNWVH6be7P5uutkkjDBBfNKwMdRQxOO27fn6v/gU="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.41.0" - "sha256-mYDSDzErl2lmozsOa8yyq9oTejxrAHaDFu7oIyF85Ww="; + buildMypyBoto3Package "ce" "1.42.3" + "sha256-7/ThXdlFlGzPsvdDnrilv9+wBHvmlJ0qwOJgpF86pLQ="; mypy-boto3-chime = - buildMypyBoto3Package "chime" "1.41.0" - "sha256-6NTv5YOH88yQVGgMd7vFxey6gk6jRU/0KD77JXJnTT4="; + buildMypyBoto3Package "chime" "1.42.3" + "sha256-7p41zcpRdNp1A09ipeKMnsLzws+z/Zsq6AMk6aePvoA="; mypy-boto3-chime-sdk-identity = - buildMypyBoto3Package "chime-sdk-identity" "1.41.0" - "sha256-3Q7fKmuzr1fGp56N3NL//VVdHOakWkX7cDFIiOITq8s="; + buildMypyBoto3Package "chime-sdk-identity" "1.42.3" + "sha256-ISo7In03FFfx4u7qzLR9u+9XuzmLW7VLYYs1WmMT5BI="; mypy-boto3-chime-sdk-media-pipelines = - buildMypyBoto3Package "chime-sdk-media-pipelines" "1.41.0" - "sha256-SLBcjUEwy1rD0UreeyXZHuLZFnWU7Zvs3ff7TmZyZBk="; + buildMypyBoto3Package "chime-sdk-media-pipelines" "1.42.3" + "sha256-7Azzr1VUhy9D+75EwPDUs0rAsGIGetAvWAyLRywc+6M="; mypy-boto3-chime-sdk-meetings = - buildMypyBoto3Package "chime-sdk-meetings" "1.41.0" - "sha256-K2WlBhNVSBSUQmNTPw4L9VHcbtl7fkDeCuMCmfsqPXI="; + buildMypyBoto3Package "chime-sdk-meetings" "1.42.3" + "sha256-1mD2BSPxGoRcre0iHaUWkn7E8GypVbaINF8BiT2nb64="; mypy-boto3-chime-sdk-messaging = - buildMypyBoto3Package "chime-sdk-messaging" "1.41.0" - "sha256-TIK3F9QlxNzBY5DJPEgC9fkIkSocdoW2kzJh/wH0ifU="; + buildMypyBoto3Package "chime-sdk-messaging" "1.42.3" + "sha256-VhdO0Sa0eJuD/JWk+ALrG+XviDbb81PW9pYOaCPWzF0="; mypy-boto3-chime-sdk-voice = - buildMypyBoto3Package "chime-sdk-voice" "1.41.0" - "sha256-lQVqyJz84EDWsz2642R5EiCgyPeN75ZFVnvsnES/q/Q="; + buildMypyBoto3Package "chime-sdk-voice" "1.42.3" + "sha256-Yj+PL5SHeMuiC3kougQa6zahznlD32+1NQWqoD8xdEg="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.41.0" - "sha256-AfBPPCE59FRCoCqfDxizB3PLcsi6oTRxKEGdkSGHYrg="; + buildMypyBoto3Package "cleanrooms" "1.42.3" + "sha256-40xdYegMwn4s6BKyVBUSc9sO2HK1Gp49kGux/U1/LME="; mypy-boto3-cloud9 = - buildMypyBoto3Package "cloud9" "1.41.0" - "sha256-JeB+IliK4/laFOzw6zd3fXWgr2CUbEXSpwyOpOUmf40="; + buildMypyBoto3Package "cloud9" "1.42.3" + "sha256-KZVvBn+NTk8gPgzPxb1vbC8osYsmNBR106k05Y2h6R4="; mypy-boto3-cloudcontrol = - buildMypyBoto3Package "cloudcontrol" "1.41.0" - "sha256-D56b4KcV0ZzmmUAKWSp3akGArKxtz3PJyYaNcRc9c6c="; + buildMypyBoto3Package "cloudcontrol" "1.42.3" + "sha256-JnSrsxpu+qcRkywLOexkrtfFjAkK9uZ/R4+lo6pIleo="; mypy-boto3-clouddirectory = - buildMypyBoto3Package "clouddirectory" "1.41.0" - "sha256-aGM7lIQdFvL7+2iQ/uPSpa9l/TlmseizBASF+06nJFM="; + buildMypyBoto3Package "clouddirectory" "1.42.3" + "sha256-3ODxia6FDYDvvzITeP7asJhuVV4M9mMI8iw0JlaSuIU="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.41.2" - "sha256-1gKMYZN5MDiJNiI2a9f7P1XhR4ncKR+jakJLMqLtmik="; + buildMypyBoto3Package "cloudformation" "1.42.3" + "sha256-O9OEm8iaNx1MNoaRU1syAkS6AFec3dY7tYtz8o1w5RA="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.41.3" - "sha256-EToB3g6IDQpvSmRoKZtO6l5IU5hHucDjMMTOADbWsY8="; + buildMypyBoto3Package "cloudfront" "1.42.3" + "sha256-lHK0w3Rkp8PMycprE6lw0KaamPvSQapOLXvBeXRcHRg="; mypy-boto3-cloudhsm = - buildMypyBoto3Package "cloudhsm" "1.41.0" - "sha256-oPD1K3BUsr7c6HRUgecbcGbruIT8TMM6N5AzASJIWJ0="; + buildMypyBoto3Package "cloudhsm" "1.42.3" + "sha256-Bxet+xXHr3VUxQEaNhJzvZAFkT0yk4O9CaJks91gtkY="; mypy-boto3-cloudhsmv2 = - buildMypyBoto3Package "cloudhsmv2" "1.41.0" - "sha256-dCyto6GoBchftI1iWGmxjLfasLZLkepwalsJez6zMZU="; + buildMypyBoto3Package "cloudhsmv2" "1.42.3" + "sha256-i1q4pVmKPj7e6amzdWWz+ZuXR14dCENIhG07mU5xsEE="; mypy-boto3-cloudsearch = - buildMypyBoto3Package "cloudsearch" "1.41.0" - "sha256-ufPuVlmTFCGtFgIEUO4mtOuy/Jl/82Ed+VvKnzFJOHc="; + buildMypyBoto3Package "cloudsearch" "1.42.3" + "sha256-vinIbxGEPhGko4DnHDtNKBGm5EwYu7SpknV/QVdQr3Q="; mypy-boto3-cloudsearchdomain = - buildMypyBoto3Package "cloudsearchdomain" "1.41.0" - "sha256-A/9+Pz/wgy2k7tcQXhp2VduZbXVnAh6C8vJ+sneyckE="; + buildMypyBoto3Package "cloudsearchdomain" "1.42.3" + "sha256-t3cUQtOO2ZDZsBdcA9XinyF5tZiZVC5fatcbwQlzXAA="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.41.1" - "sha256-jPokAbjnIKWlJivK2unV9yV1fbtqYnQZCJmjm3/JqVo="; + buildMypyBoto3Package "cloudtrail" "1.42.3" + "sha256-cJHd1HRP4r0xrlegID0GXjIKNqEtS3hUB2J6XmhIL8U="; mypy-boto3-cloudtrail-data = - buildMypyBoto3Package "cloudtrail-data" "1.41.0" - "sha256-foMvPcxeR671VVpN7sbDqr1N9erBnn5A6Xa9UTCxVAw="; + buildMypyBoto3Package "cloudtrail-data" "1.42.3" + "sha256-S2NgrjralqxjjGo39TwaUSStqspnhI/E2/BLXUGP0Hc="; mypy-boto3-cloudwatch = - buildMypyBoto3Package "cloudwatch" "1.41.0" - "sha256-9/CqS9/p3mc2iMNzz8lWDXUmnf9/+unVqxjOdB7KAxQ="; + buildMypyBoto3Package "cloudwatch" "1.42.3" + "sha256-p4dih7L4f/n/aL2v0pVoHGl63nkuOHED4VCscsTJDGo="; mypy-boto3-codeartifact = - buildMypyBoto3Package "codeartifact" "1.41.0" - "sha256-zCCzxKlgqb6ChqsBuee0b+lwKBc9781RqfRLi+TH3Lg="; + buildMypyBoto3Package "codeartifact" "1.42.3" + "sha256-YkeABuPHoW5nQG1B01thEv8T5M8KB1cxstw5eCiet1A="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.41.0" - "sha256-3lzzOiqccjeimq0brMDcoO5FzMf5ddQ+J4MlPZc1FEE="; + buildMypyBoto3Package "codebuild" "1.42.3" + "sha256-yacISwHjButV2KY3cYD2QyvnGaNFt62lhjpsLh85OPc="; mypy-boto3-codecatalyst = - buildMypyBoto3Package "codecatalyst" "1.41.0" - "sha256-3HJmodW9yc2fJCXzeHjaLMvRoRESsCS/Z96YfZ0KvTk="; + buildMypyBoto3Package "codecatalyst" "1.42.3" + "sha256-XX3A98JxTsrinKTDxj949XYUliqoTKiu+WUY7jK3q4o="; mypy-boto3-codecommit = - buildMypyBoto3Package "codecommit" "1.41.0" - "sha256-dgVkLeC5LPCK6E+Ji6WvbuA3u7Rk1NNEM0cPT8SXtIY="; + buildMypyBoto3Package "codecommit" "1.42.3" + "sha256-8vPx4zud7dPV+FXln6rR6RaYlY+wiGhrf6KPsJoBxsc="; mypy-boto3-codedeploy = - buildMypyBoto3Package "codedeploy" "1.41.0" - "sha256-v4+oalesjsdLfct3deVghM987ads7EycetmGO7IjigQ="; + buildMypyBoto3Package "codedeploy" "1.42.3" + "sha256-nUPEMOLK9Lb61aYZ8bgjBCEotVXL2ku2BPdVXwjNPXM="; mypy-boto3-codeguru-reviewer = - buildMypyBoto3Package "codeguru-reviewer" "1.41.0" - "sha256-iar4vSx4dlcXvsJH+sVe42DhzkFIgNuR64YzUGbglUU="; + buildMypyBoto3Package "codeguru-reviewer" "1.42.3" + "sha256-qUk0c9axiud0GSWBOwm0W5cNJOGRLkSi4Sz+GdmF/c4="; mypy-boto3-codeguru-security = - buildMypyBoto3Package "codeguru-security" "1.41.0" - "sha256-w4BbIBurj8hE78RUtWdmLekEPOiHBe00cQGrRLa7LA0="; + buildMypyBoto3Package "codeguru-security" "1.42.3" + "sha256-nvbGqJPJ67ipJSPtVWF10vbZSx5PtXE5HTKPH8runvc="; mypy-boto3-codeguruprofiler = - buildMypyBoto3Package "codeguruprofiler" "1.41.0" - "sha256-fpIUzumcbJa/aM+JrsiNcY69A3lHLfogZQVj8egnhGc="; + buildMypyBoto3Package "codeguruprofiler" "1.42.3" + "sha256-rDZJQ/nKSLdwz48jmVGXWf61sq7hQzKFt8b6zitZiRE="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.41.0" - "sha256-Hoel1nyEKB9hC7/Gd4zYhwDAXgQhCExrjAc48HlHakg="; + buildMypyBoto3Package "codepipeline" "1.42.3" + "sha256-lZRCPyZPbUXrCLvZicdB4Yi8RfK1NS5Cjt8uuxz12rY="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM="; mypy-boto3-codestar-connections = - buildMypyBoto3Package "codestar-connections" "1.41.0" - "sha256-/cLI2xjOur0PG9zJrPDpQjbmzUXUSXDmSCghBHS0DY0="; + buildMypyBoto3Package "codestar-connections" "1.42.3" + "sha256-N2s7ir1VezlVgTJfL1Q9wmT5VyhCyxvy9hPMM9pgavg="; mypy-boto3-codestar-notifications = - buildMypyBoto3Package "codestar-notifications" "1.41.0" - "sha256-ig0uezjHHO+WwkIimc5ETQLm9xJ805LBAU8Tb8iRStU="; + buildMypyBoto3Package "codestar-notifications" "1.42.3" + "sha256-/Do27W8Ye71TMnvS9cihH+NgyuhbYjnQZlRy5IhZPyE="; mypy-boto3-cognito-identity = - buildMypyBoto3Package "cognito-identity" "1.41.0" - "sha256-JSeLPMTt3N7/BmW3HYpjaQTnyDteaSZ6mKGWeyO/z9Q="; + buildMypyBoto3Package "cognito-identity" "1.42.3" + "sha256-N9PEmvqI7Yc7AAuDdOj1iePSq7hJTgOmS+4z7GzYd98="; mypy-boto3-cognito-idp = - buildMypyBoto3Package "cognito-idp" "1.41.0" - "sha256-9MCBpnk5peEGatBczFtD9vlyMjKGPtrJwGs2a+yggsQ="; + buildMypyBoto3Package "cognito-idp" "1.42.3" + "sha256-KCVazTb8gIjJokV+jyjpBzcXt6cg3B8i5ogt3iFYlyk="; mypy-boto3-cognito-sync = - buildMypyBoto3Package "cognito-sync" "1.41.0" - "sha256-S/GVoK7BcnL7ZCzCiq974tr4UtJjJM0/SysR2x14jkI="; + buildMypyBoto3Package "cognito-sync" "1.42.3" + "sha256-hRjavmc5Uz2JInrXnUrFlby+XPaP2hIShhPbHreE5/4="; mypy-boto3-comprehend = - buildMypyBoto3Package "comprehend" "1.41.0" - "sha256-hfHr98Yl2rytJLs/VsoDEmBtT7xy0N+JONVlOhnkXxY="; + buildMypyBoto3Package "comprehend" "1.42.3" + "sha256-b+dX5aCg7czhnGTapZ1DdIYyNcr8bb1SGEmw96oe2jI="; mypy-boto3-comprehendmedical = - buildMypyBoto3Package "comprehendmedical" "1.41.0" - "sha256-9Y9OF18s2axyp0PTKD7azjTTq0PK34OkYeXPlWSYdxg="; + buildMypyBoto3Package "comprehendmedical" "1.42.3" + "sha256-F4zRXA2p9DfQnXItfz4VYlB1ueDwV5MORUCDHxOcr2w="; mypy-boto3-compute-optimizer = - buildMypyBoto3Package "compute-optimizer" "1.41.5" - "sha256-rspxHjYg99vV9GACUhQFZybbTzuLYza/EziWElWJn9c="; + buildMypyBoto3Package "compute-optimizer" "1.42.3" + "sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o="; mypy-boto3-config = - buildMypyBoto3Package "config" "1.41.0" - "sha256-sQf9PZa1RxwsUx7iYT5Ynp7mH8yPTKsWUhAkGdcXIBs="; + buildMypyBoto3Package "config" "1.42.3" + "sha256-imDBFBMNm8LdlHf9m21aS39DGfF0dbpd7DsZ8fMzIyM="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.41.2" - "sha256-P2HbAOnMUokYvW3eVLcbNbR1cQK1rb8umVc8prXRy0s="; + buildMypyBoto3Package "connect" "1.42.3" + "sha256-2vuxJVOvflBQHkVtBYc+JwvIAA/nJZuZhFuhMtrgDR0="; mypy-boto3-connect-contact-lens = - buildMypyBoto3Package "connect-contact-lens" "1.41.0" - "sha256-5iBb10gPQNYPgt0IwSv0JGuhggNUOMLS1dZRLCaDxYw="; + buildMypyBoto3Package "connect-contact-lens" "1.42.3" + "sha256-DskvuhNLcAzgDj7jBahKQmhYI6N8iWvGU5Q+1x2IQDI="; mypy-boto3-connectcampaigns = - buildMypyBoto3Package "connectcampaigns" "1.41.0" - "sha256-Z8qxCDS6UKfJGv1N0rDLclxKzOeOZ3Gnfx+Ad1/COHA="; + buildMypyBoto3Package "connectcampaigns" "1.42.3" + "sha256-omWYUcr7Aj6r1F1kKAmM32fn9577UeUgqesnIiBIpPQ="; mypy-boto3-connectcases = - buildMypyBoto3Package "connectcases" "1.41.0" - "sha256-iORERENrNjvOYq0LHBE3Ghe5T67bTP0g8hFCFYLbOQk="; + buildMypyBoto3Package "connectcases" "1.42.3" + "sha256-OpFwfLIgldcA31CkZfgcD8H9vOPNVNSxmr0J3taPKV8="; mypy-boto3-connectparticipant = - buildMypyBoto3Package "connectparticipant" "1.41.0" - "sha256-FSJZT6BbCIuE+a31a/Wr+OKYB9nKM9z6Y5IAryf3ZO8="; + buildMypyBoto3Package "connectparticipant" "1.42.3" + "sha256-vDq9icNnmldtEKNlE3yia15L2LNbQiNctYRM2qS2GaE="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.41.2" - "sha256-1kYGdJKZvQsF5N828k7WWT1HiCndUQB8q4Yun5fICH8="; + buildMypyBoto3Package "controltower" "1.42.3" + "sha256-EJatOlrK5f9nET1S2rq8o3ZZBcYZzKerscG6aiVzW3E="; mypy-boto3-cur = - buildMypyBoto3Package "cur" "1.41.0" - "sha256-NTY7p2y6QIgEnPzdil1c3QoCEcohTr86XeO738ZoQaA="; + buildMypyBoto3Package "cur" "1.42.3" + "sha256-SAgpP1O6oGP8QIp6qoG4bu/axKZyVWgbdt8ZmZkrezY="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.41.0" - "sha256-qXwDPmSOhjDEQ3HTHBCIB2AXTq+U25N7BG8InNlmhHs="; + buildMypyBoto3Package "customer-profiles" "1.42.3" + "sha256-6LDJSwFvf72wMcyzeRH7wsfjaDjfYFDe4yXpl+r1Db4="; mypy-boto3-databrew = - buildMypyBoto3Package "databrew" "1.41.0" - "sha256-YMlWDdg9fW6vfRIAvqtMNgGV/HiatfnSGjFjLdC6HjA="; + buildMypyBoto3Package "databrew" "1.42.3" + "sha256-PYO9ZRqOwz+typG60P14BoeDTSztuoNna35i3QWQE5w="; mypy-boto3-dataexchange = - buildMypyBoto3Package "dataexchange" "1.41.0" - "sha256-FyKWgYrC5HTs9KHOgrfJR+TF/0U/aAqmF0uqiAA09js="; + buildMypyBoto3Package "dataexchange" "1.42.3" + "sha256-mSIcKVS51A7sgKo1KU1r5zxtco9Y1umGrYbeCzaugqY="; mypy-boto3-datapipeline = - buildMypyBoto3Package "datapipeline" "1.41.0" - "sha256-e/bO3WVgx9LsA7qvlI/A26pqwtREkyB9AMhRiqxPNE0="; + buildMypyBoto3Package "datapipeline" "1.42.3" + "sha256-MExczpvtitz7h8p+wS8mKCToOQiiQwcOl3jzbKHbVzI="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.41.1" - "sha256-soc/b4zlSAvvUsy5/7Qa53XGCv3xrt1BtiYH+ZrT+fA="; + buildMypyBoto3Package "datasync" "1.42.3" + "sha256-ApctgKap9Tq0pEV59aqZRap+OwnmSPiXomUmFeZYPso="; mypy-boto3-dax = - buildMypyBoto3Package "dax" "1.41.0" - "sha256-qxlAzYN/IXbXKbbNQS/zdEIY0bFba99jQVXkhMrurWo="; + buildMypyBoto3Package "dax" "1.42.3" + "sha256-ckBSxGRvIg5zvbjpXiWK04FLfbf77kWkxlVGhYJBGps="; mypy-boto3-detective = - buildMypyBoto3Package "detective" "1.41.0" - "sha256-kA5DMRWtDouDlnmbeitWxzvcqA9wHVHgtouDhuIADXc="; + buildMypyBoto3Package "detective" "1.42.3" + "sha256-Yi12y0nw4kLlMI8E2syBMqrOW5ruImUn2mMQAZdKFXg="; mypy-boto3-devicefarm = - buildMypyBoto3Package "devicefarm" "1.41.1" - "sha256-gZOpY/F1Rmo/po2KpILBh+BMueHDN/Bny+8HNkYk3L8="; + buildMypyBoto3Package "devicefarm" "1.42.3" + "sha256-cknaGndSi5ak+3gRl4Acp3yHg3kD2g4bIGw7WxB3yfA="; mypy-boto3-devops-guru = - buildMypyBoto3Package "devops-guru" "1.41.0" - "sha256-IwLzheEJQ6D4CUHq3XMkp91j6a9paL81shof3t/vRzY="; + buildMypyBoto3Package "devops-guru" "1.42.3" + "sha256-jJriPVQX4T4oUT2cnmZigxqjTXNx+esnU2xYvkp0C6E="; mypy-boto3-directconnect = - buildMypyBoto3Package "directconnect" "1.41.0" - "sha256-rqWJixdcRZEffK0eT9hsopuCQFE0uH2ox1KQlaTG5Js="; + buildMypyBoto3Package "directconnect" "1.42.3" + "sha256-Jn3ozTTbTDJkDm4mHNO/PS5xGnvk2tuNmaac7iGYCl8="; mypy-boto3-discovery = - buildMypyBoto3Package "discovery" "1.41.0" - "sha256-GHSGGq7UGrHAcRpHSFChadVY16caMNr6KjxeRJsjeOQ="; + buildMypyBoto3Package "discovery" "1.42.3" + "sha256-rZxsnERZZWod9U+7IyPVFYSncmbpNwtzoGQopSkb9sk="; mypy-boto3-dlm = - buildMypyBoto3Package "dlm" "1.41.0" - "sha256-6BsKG8DMvuKMgyYyoW/31N03czHLTFKzb5C/DCVZMBM="; + buildMypyBoto3Package "dlm" "1.42.3" + "sha256-oqmjFYk0Wfo+PF2ho1+noYSXlpivcwLCoLL66d052Q0="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.41.1" - "sha256-aT8zZArTo2AaKZUc6SFkSlfbhH/L0zNIVataHGXJkaU="; + buildMypyBoto3Package "dms" "1.42.3" + "sha256-i4MYwLQOhaynuGxcYB7w9dLGmbPqiQMpR+Hsqu0J4Eo="; mypy-boto3-docdb = - buildMypyBoto3Package "docdb" "1.41.0" - "sha256-Lvoc8yEBMYLQNNnnEbdL6GQT7pPV9sDL6jFtLZusx90="; + buildMypyBoto3Package "docdb" "1.42.3" + "sha256-ANTxQ58GFmS8ZVO4JQ94T2DbnpSmP3IneM0gEjXcfxw="; mypy-boto3-docdb-elastic = - buildMypyBoto3Package "docdb-elastic" "1.41.0" - "sha256-/gYazA2cNVEyqBGPDbdBFP61Rnzqlrv0Oi3+u05vwKQ="; + buildMypyBoto3Package "docdb-elastic" "1.42.3" + "sha256-lELlqGCIpJDadB4McePclQ56IyVBo7s9B05mBI3vWdY="; mypy-boto3-drs = - buildMypyBoto3Package "drs" "1.41.0" - "sha256-X6xndf0ZAgpb1ha4JnyOfG1k30kxScovKBke3HsvEZw="; + buildMypyBoto3Package "drs" "1.42.3" + "sha256-31X59K6RtNoN/iIqZMkpoH1z55k69wteY/Mw2va4txI="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.41.0" - "sha256-kglgRTZaW1QEHLnwYNIV0ouS2Lx4TTGF4m+nMUUpXDg="; + buildMypyBoto3Package "ds" "1.42.3" + "sha256-VLjmuBf9xHv0qwv2F3l/14KptFqXVE0OmwPF/WC06NI="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.41.0" - "sha256-4WsEvKneH26nKcjovKFNDRSynLVrTB/WJrZ0WgenLqQ="; + buildMypyBoto3Package "dynamodb" "1.42.3" + "sha256-bjkLdELt7YQnn9pt242PFNDPxSyNFuZNqxTmI5rLSio="; mypy-boto3-dynamodbstreams = - buildMypyBoto3Package "dynamodbstreams" "1.41.0" - "sha256-juYy/1f6TuCecLxtt3HLwrvF2eBXoYnK4xTYxIUiveg="; + buildMypyBoto3Package "dynamodbstreams" "1.42.3" + "sha256-Sf//Fv7Dhwlm/XYEdpF1+tHmUM+jy4tt5IA/maHh7zo="; mypy-boto3-ebs = - buildMypyBoto3Package "ebs" "1.41.0" - "sha256-8fFnQpctLyNEZrsKI94tcpy7XAN8+ULGsih2oihHcyg="; + buildMypyBoto3Package "ebs" "1.42.3" + "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.41.4" - "sha256-HK0keScSTKQHCP7jMHT2RPPZuS+Yz1Si4+3vHTXULnc="; + buildMypyBoto3Package "ec2" "1.42.3" + "sha256-4Z2j4LMWAk1ddNtM6rXPUpZ46GPxmG+TbgTVi2fECzQ="; mypy-boto3-ec2-instance-connect = - buildMypyBoto3Package "ec2-instance-connect" "1.41.0" - "sha256-PXul6J8PEk8SK2lmMr/mAahpJQ6ZIWCheGGKs4SuJYY="; + buildMypyBoto3Package "ec2-instance-connect" "1.42.3" + "sha256-qe5aitxIPiQA2Et/+MtGVsnmWvk45Rg04/U/kR+tmK0="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.41.2" - "sha256-yHCyY3+bpvH2lntEjxTyn876NY9FIbpEmsx5IbaCGSA="; + buildMypyBoto3Package "ecr" "1.42.3" + "sha256-UDKJPQ3VDNpmpIgNGr8vBt7uPGYT7HIVWhSYsw5r1A4="; mypy-boto3-ecr-public = - buildMypyBoto3Package "ecr-public" "1.41.0" - "sha256-O05+5uzp7lmM7N0jvVKgZuvnqh+zz6HiSvOxtKq56sg="; + buildMypyBoto3Package "ecr-public" "1.42.3" + "sha256-syjw4M02YXRXsJpM3e7OikE3sSTl/hIIJ3857PP2BII="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.41.1" - "sha256-4Pkp2x9ClR8I2oAiHcHhJbuU4bUGcQQ6v7L2B2RGKO0="; + buildMypyBoto3Package "ecs" "1.42.4" + "sha256-mgZRe8cdya8y8XGILxlYplLfi41OmWiRYUo1Xj3ARpk="; mypy-boto3-efs = - buildMypyBoto3Package "efs" "1.41.0" - "sha256-kjrdAMALicYfFFplSqH3gNeq4LcIOvrmRjZ9RFhuzwY="; + buildMypyBoto3Package "efs" "1.42.3" + "sha256-lNlav7BQkVjbYE9cdnvcdNki9IDo6tTlerD+lt69Rio="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.41.2" - "sha256-VWOjXwEbfdKePMjnbpiXa0j/Zhoiabn80vXXHnzS+Bs="; + buildMypyBoto3Package "eks" "1.42.3" + "sha256-f4WgQz6uZG0cy1s9dsM4TzI2WYeS/RJg58Tig1USRAg="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" "sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.41.0" - "sha256-/UrRVuhXc2FjNvAfQ+tnBQYXrCS2wj1cd70WPA1Nsqc="; + buildMypyBoto3Package "elasticache" "1.42.3" + "sha256-4+ujCgzi4N92QEhsBbE8RSsKA1JAu4oJtlAlQ4uwXcU="; mypy-boto3-elasticbeanstalk = - buildMypyBoto3Package "elasticbeanstalk" "1.41.0" - "sha256-dkQi++Vlle+cYsciHnVxtGrN/3Wk+ptZ9vYYsVrDoRE="; + buildMypyBoto3Package "elasticbeanstalk" "1.42.3" + "sha256-bdkMl7lZNe9af/V77qmSRP9vUFq8emG/i6lfb5c/bkk="; mypy-boto3-elastictranscoder = - buildMypyBoto3Package "elastictranscoder" "1.41.0" - "sha256-A53fE0Pi5JobG1nk+Q0BmlKIy04knkcAKrEJz224kBg="; + buildMypyBoto3Package "elastictranscoder" "1.42.3" + "sha256-6fH7Mf2p9tYmendYBCHXKo+6NKkRP2j2ofLTrkxlrtU="; mypy-boto3-elb = - buildMypyBoto3Package "elb" "1.41.0" - "sha256-Qxp3B2PJ/RKE+n4gUxnalGIVqkdB8Ta/zHyJ5lvtflM="; + buildMypyBoto3Package "elb" "1.42.3" + "sha256-T8SWdNXQ+4IIPC2V9eKut2I9xi3ZhhXMbUZC8eBPW+o="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.41.2" - "sha256-Q/U/pUasQ3O1FV+jH3jX14aniAuBMfZ1zvOzRNbr9X4="; + buildMypyBoto3Package "elbv2" "1.42.3" + "sha256-ha8UiyvXgKk/G98JZYIfJh3v2EKWZwgxNir6BL0+RjU="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.41.1" - "sha256-eb5sluqEMtbazfA1wbMxF1bN7vRRDeIpq5Ej7gfN5UU="; + buildMypyBoto3Package "emr" "1.42.3" + "sha256-oh5SV2hqG7KcCgBpBeokWeYkBqYprKirv3lZxD2sCnA="; mypy-boto3-emr-containers = - buildMypyBoto3Package "emr-containers" "1.41.0" - "sha256-PY8686HV2+ARjB1ZZDtd8Z/7jyEmw6Sc2Rr6sk9VvoU="; + buildMypyBoto3Package "emr-containers" "1.42.3" + "sha256-aSceDS6MkuNWdpvaZoeYGFeE8tApcoHus7FIlIlsX3M="; mypy-boto3-emr-serverless = - buildMypyBoto3Package "emr-serverless" "1.41.0" - "sha256-kf8IlWAcx/PgZT5lsJnQOF164Cc0kscje/ai7NCAEyk="; + buildMypyBoto3Package "emr-serverless" "1.42.3" + "sha256-N975AhqJFTeUcfAob8UcArGMnoDrp6T023OtmEJK4DY="; mypy-boto3-entityresolution = - buildMypyBoto3Package "entityresolution" "1.41.0" - "sha256-PsOdXDBhWhoqYguYQ7LPTFMO4vTOaPqW8NuqUToSo7s="; + buildMypyBoto3Package "entityresolution" "1.42.3" + "sha256-tZwEY8f91YWYCfHb3gSnbv0haTbyFKgpCvQKQDg12OE="; mypy-boto3-es = - buildMypyBoto3Package "es" "1.41.0" - "sha256-wXMiX8YIYmWyYCegt5kY8vJSgJII4lDUQWTRbk0Wnq8="; + buildMypyBoto3Package "es" "1.42.3" + "sha256-LUatoDZMYamd9x0qPkbv0WikJ0txZmQRwd8J1Hczmvg="; mypy-boto3-events = - buildMypyBoto3Package "events" "1.41.0" - "sha256-J/+rSj7h7kjFMikn25IO7b/6pGGhFRTZ5vmRUPFkQvw="; + buildMypyBoto3Package "events" "1.42.3" + "sha256-zoJFU3RC1bgWvK/rTsAKRoWDbl1+VehjlGM9s18h7Fg="; mypy-boto3-evidently = - buildMypyBoto3Package "evidently" "1.41.0" - "sha256-tmSa+gqvJpOI0MlVcL9InKJD7He8rmXq/DAAH5pJdg0="; + buildMypyBoto3Package "evidently" "1.42.3" + "sha256-t+mFGfaY21XDIDWgKthnXeg+couyjop0grL6QjHpi9g="; mypy-boto3-finspace = - buildMypyBoto3Package "finspace" "1.41.0" - "sha256-V7LbRsfHAgqNcVyTJ7nuRQJbj31a2PWrVbSxiqASxlw="; + buildMypyBoto3Package "finspace" "1.42.3" + "sha256-gwJY/iL22IIxcjIYtcURZSyn/7XeHEubw1rAgHFydj4="; mypy-boto3-finspace-data = - buildMypyBoto3Package "finspace-data" "1.41.0" - "sha256-fA84JUJjVkcYZEcMOhTGZpHwHm2L4sEppKzl7GxAP9s="; + buildMypyBoto3Package "finspace-data" "1.42.3" + "sha256-OcVF/cSLsJ3zcv7iDF4z/z5p6qJTxrj0kwg6x1WpY5g="; mypy-boto3-firehose = - buildMypyBoto3Package "firehose" "1.41.0" - "sha256-+qwyioVszY06WCsz8/mOKL4h6AmTK69Dv+m8DcM8qTE="; + buildMypyBoto3Package "firehose" "1.42.3" + "sha256-OBj2x8ELpXJvwfkGf6LeOnBXc0WzLbkKsZ4zlnoI/fM="; mypy-boto3-fis = - buildMypyBoto3Package "fis" "1.41.0" - "sha256-cA7cj12JZZQ/w1FbOIjrK6l7vPmGCqCPp3d+xpgo2eY="; + buildMypyBoto3Package "fis" "1.42.3" + "sha256-CT7k07oPtWrCFNxA6Ga3I2Ej6clheMAdMDd//m3bgm0="; mypy-boto3-fms = - buildMypyBoto3Package "fms" "1.41.0" - "sha256-7z5KU5LQfIvshh4aEtTy8t/SApsczquNK0wLEmu1weI="; + buildMypyBoto3Package "fms" "1.42.3" + "sha256-0h6KDGLtMUvl9VN+TIElcnxf+T85MPPwWhYKlIZ90uY="; mypy-boto3-forecast = - buildMypyBoto3Package "forecast" "1.41.0" - "sha256-FCblXzJG3xztKCa+NYGKqdMKkJ71IdXcV8EjS8B+2ok="; + buildMypyBoto3Package "forecast" "1.42.3" + "sha256-vtRPtRfGg/Ab72ZDu5mU+IOkMWm9q1KExgHPoSeqYT8="; mypy-boto3-forecastquery = - buildMypyBoto3Package "forecastquery" "1.41.0" - "sha256-MYR7xdRgdoiZi21SMAr5sqSdrxdgmH0HE56x2wJ41sA="; + buildMypyBoto3Package "forecastquery" "1.42.3" + "sha256-PMF12libsd9i/8gEjR35zGklqq7dKPoQlRmtPUytfVw="; mypy-boto3-frauddetector = - buildMypyBoto3Package "frauddetector" "1.41.0" - "sha256-JacU0+evD+6uNfzub/BZGBR7YUB13zCWreIE5N1GYTU="; + buildMypyBoto3Package "frauddetector" "1.42.3" + "sha256-okrKcMKNM5rJPzPx/kFnarcDBYoQh/IdJHZy3cK1m8c="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.41.0" - "sha256-Ai+X0EWcJDTRx5YyYE2hbdqrum/uSWiy2Xczu+NL9rY="; + buildMypyBoto3Package "fsx" "1.42.3" + "sha256-NqNGcL3HfJgx2ScPLKMNNwpVS3bO4Cu7JpYlenSJwJg="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.41.0" - "sha256-2+jL0ic7vq6AAQLXhzTy3ZdEfWVQrLTFq0fvMGAjf4I="; + buildMypyBoto3Package "gamelift" "1.42.3" + "sha256-4LBhjln6mCxMSooGEV7mo1Fe7U6Jssxq+6JYwqnFhRs="; mypy-boto3-glacier = - buildMypyBoto3Package "glacier" "1.41.0" - "sha256-3Fl97pRM53uuiVn8ueiFIqhok6oNHSwXkRabkIF7eAM="; + buildMypyBoto3Package "glacier" "1.42.3" + "sha256-06ckDtpv0ZvarXu9RIy8UxLRprY54/NBmrCyc7vQ5ek="; mypy-boto3-globalaccelerator = - buildMypyBoto3Package "globalaccelerator" "1.41.0" - "sha256-v+p1OJoW9sBuO6uXlRolDD9Kk3bksb0jXLYSpzeR8U0="; + buildMypyBoto3Package "globalaccelerator" "1.42.3" + "sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.41.1" - "sha256-ke65iQ5nhPzTElnocBO2asAfy5U5GMO0tXCTDIPueuQ="; + buildMypyBoto3Package "glue" "1.42.3" + "sha256-HjRzAQUvBJ0p1oU6rHwM50gvFFeEWN4P85M5KxR4Wh0="; mypy-boto3-grafana = - buildMypyBoto3Package "grafana" "1.41.0" - "sha256-VxPgHHmT0p2YQuCnVfi7pNIFuUEaNCBJkghTXqP6e1E="; + buildMypyBoto3Package "grafana" "1.42.3" + "sha256-wVeFhJIXV8wFQpCizH8IUh6JAFg+S67aTR60dqWk/3M="; mypy-boto3-greengrass = - buildMypyBoto3Package "greengrass" "1.41.0" - "sha256-zN/xAgxi5AnoXuEHsQqD9C5qQagOlLoxokJjcQTu/Cg="; + buildMypyBoto3Package "greengrass" "1.42.3" + "sha256-8D2hxBxdFbrrXSHzvOUBoNkedTErIQG4mlcMx3r9yx4="; mypy-boto3-greengrassv2 = - buildMypyBoto3Package "greengrassv2" "1.41.0" - "sha256-RVFTB6U3pW0Z0S0Zvo0UqtHWoroQ67tg4PkW+c4yHKc="; + buildMypyBoto3Package "greengrassv2" "1.42.3" + "sha256-w3vOm8K/2rToF1CFWtAobCzswkv2d/gm1bzy6XiOFVA="; mypy-boto3-groundstation = - buildMypyBoto3Package "groundstation" "1.41.0" - "sha256-2GR2YSsl36BtoBds+ued+IS/I+rQ7DPGMXL0ZmFVmvo="; + buildMypyBoto3Package "groundstation" "1.42.3" + "sha256-BrtHCaCwsfpaB5GA9kEhCFapQceZsjpyv3HVgpXUOFA="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.41.0" - "sha256-pPhSyUcoigzLnmFWnTNfaAnp8C3XBwaMgQTmnpzeGDU="; + buildMypyBoto3Package "guardduty" "1.42.3" + "sha256-MmgoDJgLOgKdqhvQaZ7UKC89lJA8TSAeuh0u6rB4/mw="; mypy-boto3-health = - buildMypyBoto3Package "health" "1.41.0" - "sha256-zXP6qyC96ZvwCFtdl1qU/yuedTu3UkMsaiqpcDKzwrI="; + buildMypyBoto3Package "health" "1.42.3" + "sha256-sK6S4e6Bbvz9sjjxiTUGYS8uS+G/PRVVLGP8X+/c1HY="; mypy-boto3-healthlake = - buildMypyBoto3Package "healthlake" "1.41.0" - "sha256-k1iU7LFubjgXvdV5rALR7gKTqD14aVPJD9eU9E0sJxM="; + buildMypyBoto3Package "healthlake" "1.42.3" + "sha256-dHLvIxMXNFxa5ImKkifyeMfFciLc3kzWD9776mmD5Vs="; mypy-boto3-iam = - buildMypyBoto3Package "iam" "1.41.0" - "sha256-/myZfPFdw8Lt7ubxqK+XX6ZchkMEQhmO9BJcaYA7DL8="; + buildMypyBoto3Package "iam" "1.42.4" + "sha256-QbF9VfRNMcpe8DiVeVBeZfbnn64EI7mP8lgeg/YoS8U="; mypy-boto3-identitystore = - buildMypyBoto3Package "identitystore" "1.41.0" - "sha256-WsohLrGnt4ZMcOEdjbjK5057XeLwZ0ujbJD8AqajxW8="; + buildMypyBoto3Package "identitystore" "1.42.3" + "sha256-6Gq7zphConwwzuBGtzPR5Id/QGJEvjIVLbzj3OI1YPU="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.41.1" - "sha256-7W5dkciCl7gcBD4JuxJXV8Q99NHjUYtx5kUYHb12HWk="; + buildMypyBoto3Package "imagebuilder" "1.42.3" + "sha256-GfZopebKhtFZH+6sMwsBFlvbKpjyaDHdYaDvDlqq984="; mypy-boto3-importexport = - buildMypyBoto3Package "importexport" "1.41.0" - "sha256-otIjtY7S8nkyrh5HBq+ab20toGzwZPP+wJGie1MCu3I="; + buildMypyBoto3Package "importexport" "1.42.3" + "sha256-Wu7msQDFRWieeKOSI4IqCovlny14zFPr/5UKvGEw9GU="; mypy-boto3-inspector = - buildMypyBoto3Package "inspector" "1.41.0" - "sha256-sIa4WY0Hx4eHN9gesiCkAjDTfh1yuuzt2ad2rzGCXfM="; + buildMypyBoto3Package "inspector" "1.42.3" + "sha256-9I+RMsF8b8PK2OsmtgX8v6C6gvZ3h8zB9fQQF5CWh2o="; mypy-boto3-inspector2 = - buildMypyBoto3Package "inspector2" "1.41.0" - "sha256-IoGPUHDP4VZNNgUmVaJIPKKFYjkSHx3KYkqG9mLr/2g="; + buildMypyBoto3Package "inspector2" "1.42.4" + "sha256-PFz6OXCgWjHOwStPVozdx8cwLnBbViOr39DPR388CMk="; mypy-boto3-internetmonitor = - buildMypyBoto3Package "internetmonitor" "1.41.0" - "sha256-/8GwJ1D03NOALWKr4fOa3lCvgyQNePatBLNTT5Eyc2c="; + buildMypyBoto3Package "internetmonitor" "1.42.3" + "sha256-rXXlHFkPI9DeMO2j+a0kLrieNt73t8//2UnUM2JskfI="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.41.0" - "sha256-Q7WBaxuIKSDDRdjt7mxiJokl8q7pbdBW0qh3oxC6f4I="; + buildMypyBoto3Package "iot" "1.42.3" + "sha256-PRDFJ9sJAwbBndd8NNwWyadEEX6HFSPJ1yaMw9KzXVU="; mypy-boto3-iot-data = - buildMypyBoto3Package "iot-data" "1.41.0" - "sha256-jNVE+X0TNviEeq90M9mhfL9G02njhOgT+c6Kpw6nqok="; + buildMypyBoto3Package "iot-data" "1.42.3" + "sha256-Giui5uqyTCAjCfpA5n/z+KwRNyqeMbd6fuxo+9Df8Ao="; mypy-boto3-iot-jobs-data = - buildMypyBoto3Package "iot-jobs-data" "1.41.0" - "sha256-Hj+hvG+0Qi0csGyl53ei/o4wvGDSO1lT9Vl0RUDBTZU="; + buildMypyBoto3Package "iot-jobs-data" "1.42.3" + "sha256-rm1KJfUHizaTEOylpdQP5XzF3JbwBaBh2IfJWW0b5bs="; mypy-boto3-iot1click-devices = buildMypyBoto3Package "iot1click-devices" "1.35.93" @@ -653,168 +653,168 @@ in "sha256-LFuz5/nCZGpSfgqyswxn80VzxXsqzZlBFqPtPJ8bzgo="; mypy-boto3-iotanalytics = - buildMypyBoto3Package "iotanalytics" "1.41.0" - "sha256-RZsmFaYBfcYeIf+hon6IuTVk3vwtijl/+vdy2l+EcxI="; + buildMypyBoto3Package "iotanalytics" "1.42.3" + "sha256-KnsQjmsXPq1VOsgdfPQ8NpXbXJ3ed3nQ6u4xd5SvGHI="; mypy-boto3-iotdeviceadvisor = - buildMypyBoto3Package "iotdeviceadvisor" "1.41.0" - "sha256-AMvSmqphAyldR8HfVh0dqHyo4gR/gCXKmJS2+TTMUvo="; + buildMypyBoto3Package "iotdeviceadvisor" "1.42.3" + "sha256-WhX8rHHzku28prFL5IC96CS1ySSEziRkf1idvTwVqWU="; mypy-boto3-iotevents = - buildMypyBoto3Package "iotevents" "1.41.0" - "sha256-E+Db1QkBCf+P+a74Nuj4HzAYIOsg0JKdDNJlUW5WU6A="; + buildMypyBoto3Package "iotevents" "1.42.3" + "sha256-uYkkQGEGNQnf/uY1sVR2dkt7TrBTOgG/2YLCdNmp1E8="; mypy-boto3-iotevents-data = - buildMypyBoto3Package "iotevents-data" "1.41.0" - "sha256-V+6z3jwSclpL2hOdN/EhiZwvRGHtt0U0+L+eYngVCjU="; + buildMypyBoto3Package "iotevents-data" "1.42.3" + "sha256-UngbBKgLaBTORn0pbbRTIOc4iqGekayb0IjuU5QrgEo="; mypy-boto3-iotfleethub = buildMypyBoto3Package "iotfleethub" "1.40.17" "sha256-SeJi6Z/TJAiqL6+21CMP6iZF/Skv1hnmldPrJpOHUfo="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.41.0" - "sha256-wh8Yd6+7xJa1W6j9IUcqqrVe5kvxfmi412XntjMUBz4="; + buildMypyBoto3Package "iotfleetwise" "1.42.3" + "sha256-BYUvPWrFNSZhMKDlQm0jgcU3utv2cLGKq9POWLLLmXM="; mypy-boto3-iotsecuretunneling = - buildMypyBoto3Package "iotsecuretunneling" "1.41.0" - "sha256-5cum+UOYhuEAKVhNw9b2c5R1fwCU899pxSR6TEHXwHo="; + buildMypyBoto3Package "iotsecuretunneling" "1.42.3" + "sha256-fFaYE0C7np/DqrRPbqGYNw/dYNkyPot/iF+OufT49Q0="; mypy-boto3-iotsitewise = - buildMypyBoto3Package "iotsitewise" "1.41.0" - "sha256-Q1WQMLiTqVn6cnuBKyt4VPDRKCm7HR5fZPDPWRnSz9o="; + buildMypyBoto3Package "iotsitewise" "1.42.3" + "sha256-U94/P/4BgTFj7J3AYOLiAEGBvXM1keI2c5iAp3x05iM="; mypy-boto3-iotthingsgraph = - buildMypyBoto3Package "iotthingsgraph" "1.41.0" - "sha256-9lkekbxTKAXaUfezztqCZOQK8cWImXSg4prgNB7UluU="; + buildMypyBoto3Package "iotthingsgraph" "1.42.3" + "sha256-TxALbXgBraOVwmbJcIiWOx9ZbJA7LkzcswhuFw967/s="; mypy-boto3-iottwinmaker = - buildMypyBoto3Package "iottwinmaker" "1.41.0" - "sha256-s/EC6xEkmw4/uBMsqpHC8pOojhLHno2b/FUoCoX5JOk="; + buildMypyBoto3Package "iottwinmaker" "1.42.3" + "sha256-8GAK05LdnC3ve/9Vma/Ej13uCSvTSSC1iYUGr/u3Qgk="; mypy-boto3-iotwireless = - buildMypyBoto3Package "iotwireless" "1.41.0" - "sha256-I/gqDPbuABc7k8vlBr/yiMASuxmABdjLCKC3UpHC3RY="; + buildMypyBoto3Package "iotwireless" "1.42.3" + "sha256-tov3sxMjqWU5A7Jr9rQVbi+R/sc9TMeexyjwvgOKuJg="; mypy-boto3-ivs = - buildMypyBoto3Package "ivs" "1.41.0" - "sha256-0qeTVNObdbKGsLpeiQfpButPGx0C3MmjPRgccVs/SMU="; + buildMypyBoto3Package "ivs" "1.42.3" + "sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.41.0" - "sha256-OMJcu/aYtlUoZwBbrCB1jlzb9GI1s8LfHImFgeZwpLc="; + buildMypyBoto3Package "ivs-realtime" "1.42.3" + "sha256-u9Zed1QIoqnTCNPObXK2YleflsrsDV2AicQxns0WK9A="; mypy-boto3-ivschat = - buildMypyBoto3Package "ivschat" "1.41.0" - "sha256-xyAjosHBkjuTTAcJaK0Fs5XH/1FwlXM248H1n/6yfok="; + buildMypyBoto3Package "ivschat" "1.42.3" + "sha256-eAzIwmz5eZKf2NBGSMw4NopdHqAR5TcF9/0KQqVWr0s="; mypy-boto3-kafka = - buildMypyBoto3Package "kafka" "1.41.0" - "sha256-beHMH1UcyZK38U3YKoGUshnDsN9E88BePC8spDR86Zc="; + buildMypyBoto3Package "kafka" "1.42.3" + "sha256-N21GfynAZdHOQnQgKcA9mJMWDfbN/pBfx509W4XDGjU="; mypy-boto3-kafkaconnect = - buildMypyBoto3Package "kafkaconnect" "1.41.0" - "sha256-bicwSQt7UeIrrDN3r9UIIXq+vrct/6OTzTLCbUdeues="; + buildMypyBoto3Package "kafkaconnect" "1.42.3" + "sha256-P6wj5rx+bELx4TVmTqj8pOfnT3K9s/8GgAF9bpFPnE4="; mypy-boto3-kendra = - buildMypyBoto3Package "kendra" "1.41.0" - "sha256-vXKkol8Y9eJ4SNq6DPDCS3kbSJqflDVXtnbtxSP9rqw="; + buildMypyBoto3Package "kendra" "1.42.3" + "sha256-IPlyrXIrWHs9DzrNd4hBqeRNwT5oJ2fQ6zIfSHdGsMc="; mypy-boto3-kendra-ranking = - buildMypyBoto3Package "kendra-ranking" "1.41.0" - "sha256-PRgARx35KRPjLj04Ux5Y2wr+Meoy74h4DvZI2LREKzk="; + buildMypyBoto3Package "kendra-ranking" "1.42.3" + "sha256-rIkIFitznxD9ytbq4cdAbiPTJFZRwZywQ50HVo7D+VU="; mypy-boto3-keyspaces = - buildMypyBoto3Package "keyspaces" "1.41.0" - "sha256-PMjUlZgqSulMtKuHr/LTHGPL39spvSQSBhyL3g09Z7k="; + buildMypyBoto3Package "keyspaces" "1.42.3" + "sha256-gDJBAmI5yeGgILOhLwSc7tk3rgKxeE575ZcrY+lptPA="; mypy-boto3-kinesis = - buildMypyBoto3Package "kinesis" "1.41.1" - "sha256-3lAGq+cwJ9L2765hbx9Ij9alKGEV33VbYnzmoBdMjOk="; + buildMypyBoto3Package "kinesis" "1.42.3" + "sha256-MeAbdKqcMS5z8sMjjKfnw00DY7UdaEMf6pV1tzZQUlo="; mypy-boto3-kinesis-video-archived-media = - buildMypyBoto3Package "kinesis-video-archived-media" "1.41.0" - "sha256-P3mAPOcC1K3YjYUyRJE/xwcLCg4YmfPeEwhU008st4g="; + buildMypyBoto3Package "kinesis-video-archived-media" "1.42.3" + "sha256-XBxm5NK29LZb32jX0RUmmAaYAhvuJYuFenuAmXvcsN0="; mypy-boto3-kinesis-video-media = - buildMypyBoto3Package "kinesis-video-media" "1.41.0" - "sha256-fwKKoVPu5Nho56zp2187XPPFdnvwawCOPKP0I2LTNFc="; + buildMypyBoto3Package "kinesis-video-media" "1.42.3" + "sha256-q7mE4VRVyg912foe+mNVAE2oJezEX+r+ob77kY1RyrI="; mypy-boto3-kinesis-video-signaling = - buildMypyBoto3Package "kinesis-video-signaling" "1.41.0" - "sha256-d0Ycq2ECX/EPkRkDpR8MdOZazmdockd/KRZjXfhChGg="; + buildMypyBoto3Package "kinesis-video-signaling" "1.42.3" + "sha256-WpwJ8fy1YA5ZvVl7JvME6dofkyyJ2qvfP5QRVI5WdAg="; mypy-boto3-kinesis-video-webrtc-storage = - buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.41.0" - "sha256-rcsioNa3cY3ks7eXT0bc2BDb8DKIfO73pkQmfiPlQIg="; + buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.42.3" + "sha256-5d7z/X+zHGUGYMcs18vXTl2JtiCbq/6ZoW7icoFTv3c="; mypy-boto3-kinesisanalytics = - buildMypyBoto3Package "kinesisanalytics" "1.41.0" - "sha256-3PAXe2t3si55aKbgJLaSLajfygLwLTeh7WC+oZdKCkk="; + buildMypyBoto3Package "kinesisanalytics" "1.42.3" + "sha256-DsxrKv4SwSJc08EAb2kSGFfT+QkU/HQbCiOOirtLpj8="; mypy-boto3-kinesisanalyticsv2 = - buildMypyBoto3Package "kinesisanalyticsv2" "1.41.0" - "sha256-DsqRvDpfDRnREKRIsoZgJqJDwV0Rly/u+q90Pkgn1Go="; + buildMypyBoto3Package "kinesisanalyticsv2" "1.42.3" + "sha256-EgqYSa3GqFX/JE0PJnY3jkG1LTI6VEaREPe2KHuxBf8="; mypy-boto3-kinesisvideo = - buildMypyBoto3Package "kinesisvideo" "1.41.2" - "sha256-oGhcPRy5FQWRdFXYf/K+3Ohlcyv8UbqaoCkUC5ME69w="; + buildMypyBoto3Package "kinesisvideo" "1.42.3" + "sha256-x9ntwcOhUm5Hsd/L+O5N77xJ/NWxgQhNVdtaaShM7p8="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.41.2" - "sha256-fsA7oKO4DxGEUtOaXnsOX1oqGGd3pmuqIKvB7Tlw5EY="; + buildMypyBoto3Package "kms" "1.42.3" + "sha256-UfEbkTcu9ecQoqoXbM6uWxNAh5B/Z6Wj26WHSaLiEj8="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.41.1" - "sha256-cj73uXbKmtsTh2l5qBv14RFAmnTgr04JLQK9EyJhjSA="; + buildMypyBoto3Package "lakeformation" "1.42.3" + "sha256-6fTkAXpFQ0Io8akKnTdSGENyKmsTu6VtkzVXRsskKZE="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.41.2" - "sha256-KzIcVzgnhcgxUeZot/rvXN+4zcOBsMtCE7zsdQpbs24="; + buildMypyBoto3Package "lambda" "1.42.3" + "sha256-EugQtMfTe+PE2D5sa/Y42k9WrRkUld2+tYmSnyJw+fA="; mypy-boto3-lex-models = - buildMypyBoto3Package "lex-models" "1.41.0" - "sha256-gwtx37BWhoJUBR2J7m/H65ZZIu6mBaY2xraHD2ndEvA="; + buildMypyBoto3Package "lex-models" "1.42.3" + "sha256-COIQ8BVxOf44lUIOactGZJK/nYovEOIZ2kvuzME8cos="; mypy-boto3-lex-runtime = - buildMypyBoto3Package "lex-runtime" "1.41.0" - "sha256-hZ5eMRBsb+IkTUH95+3f4nGo1X5lDrrC54xJ1he/nO4="; + buildMypyBoto3Package "lex-runtime" "1.42.3" + "sha256-tkSUeZeD8Aa1DzQIDBt8rQYBecfllEyl9kATJkM6FYM="; mypy-boto3-lexv2-models = - buildMypyBoto3Package "lexv2-models" "1.41.2" - "sha256-1hG2i3Co2s8kbl6RE2tj0pIiGTmd8nxFAx4lmETy8r8="; + buildMypyBoto3Package "lexv2-models" "1.42.3" + "sha256-1OWMzSKmnpZUEm4yAsjB2tZXEp4Kjix1D3pwx2AAHec="; mypy-boto3-lexv2-runtime = - buildMypyBoto3Package "lexv2-runtime" "1.41.0" - "sha256-8GLOqOph4BG3mFcwLVXZ4qinPsSi3YCYMQhgu5g1Jvk="; + buildMypyBoto3Package "lexv2-runtime" "1.42.3" + "sha256-KzxXQppuVCTPDd47r981rhMYk830gcbeXFqvIHQHyEk="; mypy-boto3-license-manager = - buildMypyBoto3Package "license-manager" "1.41.1" - "sha256-AQiCEmxX4kBGt2088BSt94AaFpe/N1WZin36gUo+yv8="; + buildMypyBoto3Package "license-manager" "1.42.3" + "sha256-8rAVXY9ZgoPCJ4S4bON2SAMI1zEsVLK3B1M2HY0Pb10="; mypy-boto3-license-manager-linux-subscriptions = - buildMypyBoto3Package "license-manager-linux-subscriptions" "1.41.0" - "sha256-7HFSwIvcnqZ5Vq266TUhOQCSJ4sIrJXTVqiOhXosjcI="; + buildMypyBoto3Package "license-manager-linux-subscriptions" "1.42.3" + "sha256-m/5Zdb1oc/veXnkx5j5EchEXdU7vZsLSoQQAexjtFm0="; mypy-boto3-license-manager-user-subscriptions = - buildMypyBoto3Package "license-manager-user-subscriptions" "1.41.0" - "sha256-Urt3Xz6dPJ/YWHfhIdV9aDWRkOVkpf2kBE9wBEadfvY="; + buildMypyBoto3Package "license-manager-user-subscriptions" "1.42.3" + "sha256-Ru2IODClBpjyDb8JNzBJi9LPY12mg46dpSBz182qkuI="; mypy-boto3-lightsail = - buildMypyBoto3Package "lightsail" "1.41.0" - "sha256-54woBoJfzBgcY8mR0f2ofJb96459Ay9wf9gPzpJ1OTM="; + buildMypyBoto3Package "lightsail" "1.42.3" + "sha256-aku0qwarXhKEB3GK/5Qnn07Qn5RMBZo2l2kJzMpXYHI="; mypy-boto3-location = - buildMypyBoto3Package "location" "1.41.0" - "sha256-S9Wy0uqdlvqRmaheZBWFcHVFjCyhLuHmRb8Vk1wgpHI="; + buildMypyBoto3Package "location" "1.42.3" + "sha256-VGQzgnrUynTDjfYpEk+FR+PrljbULl0UpbeqbaPKqSc="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.41.3" - "sha256-4ScSAQrnibU/s//gYq41hoHURd+Om+YzTDgNRGGDuOQ="; + buildMypyBoto3Package "logs" "1.42.3" + "sha256-6pXN1oeCkD+5UfHjhgXKOjLTtpfTFgObNZixP+2fJvo="; mypy-boto3-lookoutequipment = - buildMypyBoto3Package "lookoutequipment" "1.41.0" - "sha256-8dAMWt03PuP2x71cojBHCJrsH823K0GDDh1Iply0mr4="; + buildMypyBoto3Package "lookoutequipment" "1.42.3" + "sha256-C1SPukBZ1zmtayQQY9nnrneSFkQGErLBxDzVYvCH3Xc="; mypy-boto3-lookoutmetrics = buildMypyBoto3Package "lookoutmetrics" "1.40.15" @@ -825,156 +825,156 @@ in "sha256-MlMkIgzc2D3i5xAPdk+th0e9AYrvRxGwzl4zwEwy4xw="; mypy-boto3-m2 = - buildMypyBoto3Package "m2" "1.41.0" - "sha256-JpBd1G28XCMH4SIVIe2IlMteHUoIgGHPC3Mk0vTQ27Q="; + buildMypyBoto3Package "m2" "1.42.3" + "sha256-Uouysx/L59B/V4dG9GWlGulqCwXTQYTTsdyXzrxFSXE="; mypy-boto3-machinelearning = - buildMypyBoto3Package "machinelearning" "1.41.0" - "sha256-ggWgBa1KXaTBW+d5j/zOsJYCQeOLATVQI9WOBqw7Gsk="; + buildMypyBoto3Package "machinelearning" "1.42.3" + "sha256-mERVlNSjfxNqfyGRlNgfP1MrzhGrMYgIuZ0pZLPrfBQ="; mypy-boto3-macie2 = - buildMypyBoto3Package "macie2" "1.41.0" - "sha256-x/GuTxCmBonyQiVfag2eY4iiRIJAU8wF2wD42KqhzCc="; + buildMypyBoto3Package "macie2" "1.42.3" + "sha256-fzZHKPUXOh/tLGCx6xAHJd4jefApYtEwbt6BSakOLXA="; mypy-boto3-managedblockchain = - buildMypyBoto3Package "managedblockchain" "1.41.0" - "sha256-qDp2gMiDH8lWAb2hp6rcNPqjA7LzeFZXr7BeH7+7EqY="; + buildMypyBoto3Package "managedblockchain" "1.42.3" + "sha256-VHzWqMSf/pfC8NLN7vJftpIVO9u3z/0YhxPezDBxJvg="; mypy-boto3-managedblockchain-query = - buildMypyBoto3Package "managedblockchain-query" "1.41.0" - "sha256-yC3MxqolwGkRX64L5FsVpTlPiFe6ptb2SWO1EyredXw="; + buildMypyBoto3Package "managedblockchain-query" "1.42.3" + "sha256-kiKP12WkHvskEVNPRAUTRJqksrz6I5y31snfFpcz8HQ="; mypy-boto3-marketplace-catalog = - buildMypyBoto3Package "marketplace-catalog" "1.41.0" - "sha256-7qSbGMs4YI04zFpoTG0OGfVcAtHm4DsNyRXIILyqOa0="; + buildMypyBoto3Package "marketplace-catalog" "1.42.3" + "sha256-+7BvckGEN74BosIfQguWMCE0chJlp4bOVSXpIqqnR4w="; mypy-boto3-marketplace-entitlement = - buildMypyBoto3Package "marketplace-entitlement" "1.41.2" - "sha256-anYA3v/Bdzye2q9aM5R++/RJflOSTxB0/fK1K6x94Bs="; + buildMypyBoto3Package "marketplace-entitlement" "1.42.3" + "sha256-tgsuuoZK5+zG3awUOa+7t9sOPM8xLBvHf69AGONd9MU="; mypy-boto3-marketplacecommerceanalytics = - buildMypyBoto3Package "marketplacecommerceanalytics" "1.41.0" - "sha256-txzRpMKyXV/RlSDjFEIRo3mNxEyMrrL3f1u9Ca4B4p4="; + buildMypyBoto3Package "marketplacecommerceanalytics" "1.42.3" + "sha256-1cIpxNx/Q1C89D27DO0PTsFRhZvSok7L1e+B6WjPXvs="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.41.0" - "sha256-dV9lOcM6ikqdM7IUjWUqNzFWeHWVTv/frhz8vyezKD8="; + buildMypyBoto3Package "mediaconnect" "1.42.3" + "sha256-NcDxuCqZqbynRmVPzmCNQpGml6tXBaZzTjlqqnTw+RI="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.41.0" - "sha256-986D+wxw55j02cMAUBHAm0he9+NdDsLs4e2nYVgLy9A="; + buildMypyBoto3Package "mediaconvert" "1.42.3" + "sha256-mQMV9CW9e0eKnkIacV/gcdkOfDSrIOCk+MFqXag9pxQ="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.41.0" - "sha256-1B1AVdKrHQhBB8PumJJefc+M/bykv8lKSXiJ5aJZnA0="; + buildMypyBoto3Package "medialive" "1.42.3" + "sha256-lQ/r4bKE8Ku9aakwezdsz1WsqcLewteunGzTkSYsB7M="; mypy-boto3-mediapackage = - buildMypyBoto3Package "mediapackage" "1.41.0" - "sha256-jqFIJ5hR2cYhAXcX9s9BlHHpMP9P3AWC2AY6rcmiT3M="; + buildMypyBoto3Package "mediapackage" "1.42.3" + "sha256-AfhNnU0FEAARqIOysN3XEsNXQN9hhoXNTkRT4oiP56Q="; mypy-boto3-mediapackage-vod = - buildMypyBoto3Package "mediapackage-vod" "1.41.0" - "sha256-uynBhFk0Abwv36DI41tKnYZ4J9NNKogdMqvD3+goUOE="; + buildMypyBoto3Package "mediapackage-vod" "1.42.3" + "sha256-ZbxRVZaTcS4k2d0+qAT8GOK5tieYduZ4FqXd/k+CElk="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.41.2" - "sha256-T8lHq8A4eGMtl1bmHIslzB9yVD2dffOmGPRhJNqcXHc="; + buildMypyBoto3Package "mediapackagev2" "1.42.3" + "sha256-/rmTQqf5hXJM5JZQg5LeJ8OTeqsk0RxUJBzVGkGYjyQ="; mypy-boto3-mediastore = - buildMypyBoto3Package "mediastore" "1.41.0" - "sha256-X5FgqRavwD/ByxSvk/CgtGfWwQrAiNJFMGvRSBpqsfI="; + buildMypyBoto3Package "mediastore" "1.42.3" + "sha256-BieG4cimqiiVqdP7/J1tsCc5YQlVEbiA5bOYCvUBspY="; mypy-boto3-mediastore-data = - buildMypyBoto3Package "mediastore-data" "1.41.0" - "sha256-a7CqBxBzk/o+CV3UOsC03HxhJbd5Qlhd+P6DaAWS00U="; + buildMypyBoto3Package "mediastore-data" "1.42.3" + "sha256-VBsw9c9B6r3G5vJ0iVUCi4wVoFprYseRLeMWs69KpTQ="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.41.0" - "sha256-hikHMXSPnmJUeAqSeIS+3lvX5kC4TUL29zFhcDFCGHo="; + buildMypyBoto3Package "mediatailor" "1.42.3" + "sha256-qkV6ZthcahS3h03vCnkam1Q78uas/Sfcqwk0c4R9tAg="; mypy-boto3-medical-imaging = - buildMypyBoto3Package "medical-imaging" "1.41.0" - "sha256-KwMivU8xhbfta4cM03nkySRZ3GRa606V+A9KE53RLtU="; + buildMypyBoto3Package "medical-imaging" "1.42.3" + "sha256-y8iE6GChPXn+MfCa/k8syDRZmhQ8Aaz2uMNdkxMYq1A="; mypy-boto3-memorydb = - buildMypyBoto3Package "memorydb" "1.41.0" - "sha256-cnn4QL7eeCiZWP0kcETuM+mCiz1rAmUWwq1TyZjoLXg="; + buildMypyBoto3Package "memorydb" "1.42.3" + "sha256-7e9/QHJJbdGyNnpxVZZCdbxdc0ncJ7a2UsBiVF629VA="; mypy-boto3-meteringmarketplace = - buildMypyBoto3Package "meteringmarketplace" "1.41.2" - "sha256-2nsZrBYXWTidgSD2cbQpd35rzHSdMHeIpBfdlPrWLSo="; + buildMypyBoto3Package "meteringmarketplace" "1.42.3" + "sha256-FDdZQVLc6r/DWGZ5LNu33QhQjgcmHDbuzGzEJ/yFkyU="; mypy-boto3-mgh = - buildMypyBoto3Package "mgh" "1.41.0" - "sha256-HUGiiAa59dNEnei4X1VSuL/WDCQ7bjmSVe8XHq1o3Xw="; + buildMypyBoto3Package "mgh" "1.42.3" + "sha256-kFHGogiCfbftZr67o8zT7eb8na74J4AGneac03q+Pvc="; mypy-boto3-mgn = - buildMypyBoto3Package "mgn" "1.41.0" - "sha256-ElyofKfCvljR91f2J7iOuv3P3nU/VOZgDwnSiWYsBTQ="; + buildMypyBoto3Package "mgn" "1.42.3" + "sha256-+0X6/Gf4tvrkM0XiEEkGa2CNta6/CfT5cfkaciqQ4T4="; mypy-boto3-migration-hub-refactor-spaces = - buildMypyBoto3Package "migration-hub-refactor-spaces" "1.41.0" - "sha256-NgBYsKJDBx3Z2Csr33wOlNjBhM9ePQ+XabK/dEn1p7k="; + buildMypyBoto3Package "migration-hub-refactor-spaces" "1.42.3" + "sha256-22PPd3dk1V3i26ETACZ9nxOjtNNaV/dBT0FxKEBZgkk="; mypy-boto3-migrationhub-config = - buildMypyBoto3Package "migrationhub-config" "1.41.0" - "sha256-xl2fDoIxBsppSGFVYVY+iSoQu+iZNbCUtjl0aGkGzQ4="; + buildMypyBoto3Package "migrationhub-config" "1.42.3" + "sha256-CdCtIzK3FoZsoPIzykK1BE8CXuWNAAG+qhd2HujoS0A="; mypy-boto3-migrationhuborchestrator = - buildMypyBoto3Package "migrationhuborchestrator" "1.41.0" - "sha256-Lawj0aC3a7qiVpVbyqF5Gp+21YYzNC4HQHED+HC+S04="; + buildMypyBoto3Package "migrationhuborchestrator" "1.42.3" + "sha256-d42VxAv6JSb35fAax31Sk5qsINDFqMWcvh0KQt1GmZQ="; mypy-boto3-migrationhubstrategy = - buildMypyBoto3Package "migrationhubstrategy" "1.41.0" - "sha256-twh9VUH/W9MLhaTmU15YXmc+NiJXxBewkVoabq/A0Zc="; + buildMypyBoto3Package "migrationhubstrategy" "1.42.3" + "sha256-MmYBlk+qaxdFtmp0XMK30JwBLxxrlh3tIgdB6Bau19o="; mypy-boto3-mq = - buildMypyBoto3Package "mq" "1.41.0" - "sha256-RzBuICH5fQxnCov4F25gdgb+kqkle5hW+QYItNpo0t4="; + buildMypyBoto3Package "mq" "1.42.3" + "sha256-/twFblngRZJ99dNaMvxw4elY6Ohjx42edAUdZt8CGnM="; mypy-boto3-mturk = - buildMypyBoto3Package "mturk" "1.41.0" - "sha256-/cYSCByOJe33oK7bl1KE8yCs0v/e14+YUHhk8Mjm8Ek="; + buildMypyBoto3Package "mturk" "1.42.3" + "sha256-gnoqOotJJC7ASGttRBWNfO6lBG77KdBGJhGNc8PDjP4="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.41.0" - "sha256-iirAm/d4PWCP9CVgju+H0a6b4+heGTh8AkfBi3kQ9iQ="; + buildMypyBoto3Package "mwaa" "1.42.3" + "sha256-BkxJ1ilQTVsOqdq63kNtKyKqxrKrEXUkg3v6EN73HR8="; mypy-boto3-neptune = - buildMypyBoto3Package "neptune" "1.41.0" - "sha256-7//t10AJ2n2Mb7v4p2uFaZ7QxN3G8WnuL6wVh1vAC0E="; + buildMypyBoto3Package "neptune" "1.42.3" + "sha256-npzoHPz/LS8q5fQOUT/niFRTZSEbOR8QquY7lt9huYE="; mypy-boto3-neptunedata = - buildMypyBoto3Package "neptunedata" "1.41.0" - "sha256-C/z9M2aQFWjZVY34bz6D7PbUpkKv3qd7DqByt48FRnk="; + buildMypyBoto3Package "neptunedata" "1.42.3" + "sha256-zUywjiBVarel6KBr6QIf2nxByggN2sFQK+4J/4rKUVs="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.41.4" - "sha256-iv7MyS9Y2XOR+IpiGvx2mRv2VCaOotymzqCp7mNTJeo="; + buildMypyBoto3Package "network-firewall" "1.42.3" + "sha256-1y1aQ8A+XkPyNlXNODlau+Lgfdc6wCgmjiugLWY7nIk="; mypy-boto3-networkmanager = - buildMypyBoto3Package "networkmanager" "1.41.1" - "sha256-QHxkGRF5U/xO8uqVQMJ7k4Vj3kFosjIff1HEWfAZdNI="; + buildMypyBoto3Package "networkmanager" "1.42.3" + "sha256-pHiapVK4OoRLk0peUfMu3JRtgBd7vytqv8o3o2q5LK0="; mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.35.0" "sha256-gs9eGyRaZN7Fsl0D5fSqtTiYZ+Exp0s8QW/X8ZR7guA="; mypy-boto3-oam = - buildMypyBoto3Package "oam" "1.41.0" - "sha256-xuliXXmknsXPmuEaYga3w3fGQOAnXD3v8o50lRov5h8="; + buildMypyBoto3Package "oam" "1.42.3" + "sha256-CGt/WuKol9nVwLHEwNgEsQDzIBhFarJNbq30OpiK0+I="; mypy-boto3-omics = - buildMypyBoto3Package "omics" "1.41.0" - "sha256-bHX9DqSjLCNLZhUzr3vs2TsarkNPz9BwhmltU+MbRJ8="; + buildMypyBoto3Package "omics" "1.42.3" + "sha256-o2X4h4K/Cf/TnZG3P5uDjdVmYJRcwPlv6DnSwdzOgc0="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.41.0" - "sha256-6P2X5lLIlBbme1rN2URwBNWebqrrGMRQ0ZlJn1MwjEw="; + buildMypyBoto3Package "opensearch" "1.42.3" + "sha256-ogbRcf2fGNYSGGvCMRi91iyhFDtxLvoPY7YmnDpI7z0="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.41.0" - "sha256-alP0AfHYAg6ICx0YExIGz2TPfCz5LRksvMMLUo7khMc="; + buildMypyBoto3Package "opensearchserverless" "1.42.3" + "sha256-Yz43bH+alilEKIqvD41ueohgC4eu2sUy5Z2qfIX82co="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.40.0" @@ -985,84 +985,84 @@ in "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.41.4" - "sha256-b18Pyrr4d6Dk4eKDVGoSRzel7VYPsdi0WYDQ7nfMKMY="; + buildMypyBoto3Package "organizations" "1.42.3" + "sha256-mgFOQjbO71va+7BI6wSHgoO+BDM2ac1OsOcjoouajvM="; mypy-boto3-osis = - buildMypyBoto3Package "osis" "1.41.0" - "sha256-Z65C+xnObE6G8x6yAP4OF3p1ZuJN+mU/x5O8UdxSPHE="; + buildMypyBoto3Package "osis" "1.42.3" + "sha256-+t1Mh2gV7wu5YAFzp0jABFUC6/8P/FHMnBCHilIFXac="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.41.0" - "sha256-RfCDnavYW/nVEn4wyQtqF8+wrx71kSR0Ztjb225rRdE="; + buildMypyBoto3Package "outposts" "1.42.3" + "sha256-4+T+yIICXzW6IX90M8y5eOL8jT9r0cJhxeI94SxX6vE="; mypy-boto3-panorama = - buildMypyBoto3Package "panorama" "1.41.0" - "sha256-CNN7vovIF4d7nExBmsrED3aOR3O7jtgUmszWHUx1xOI="; + buildMypyBoto3Package "panorama" "1.42.3" + "sha256-ynBHsnTvNz9G8sM9d88RI31ZMl0UzBgIz3ONEsJ+aHA="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.41.0" - "sha256-ffuK+weNEQ5oZdxuAeKsKkoRDho2AwvG4VUT329PDxA="; + buildMypyBoto3Package "payment-cryptography" "1.42.3" + "sha256-5IcLMUEVTNDXyQ2m0rSuE+atxInpG1SZ5LI/YEKuwxs="; mypy-boto3-payment-cryptography-data = - buildMypyBoto3Package "payment-cryptography-data" "1.41.0" - "sha256-4A6qMIFkeMX/mgQdncEzM0vpCtcySKSqwLSY9WnBU1g="; + buildMypyBoto3Package "payment-cryptography-data" "1.42.3" + "sha256-ZuUoqs/aaXeieXwMwMUbQHRwAYkowcFS/KJHMMSLcSY="; mypy-boto3-pca-connector-ad = - buildMypyBoto3Package "pca-connector-ad" "1.41.0" - "sha256-0UQP+P+QovxCZU8zyE8oSGNyOMqBouWJxjCYYH2Ayhw="; + buildMypyBoto3Package "pca-connector-ad" "1.42.3" + "sha256-xblYVZWgmt894TaYQ5I2LE7D3aQfOV542+N/ccmcl+Y="; mypy-boto3-personalize = - buildMypyBoto3Package "personalize" "1.41.0" - "sha256-RDWoTDVDJ1B7G0Hma59fjRyF0Pz7dHok5rHQuYJhJW4="; + buildMypyBoto3Package "personalize" "1.42.3" + "sha256-/cKsRTSz7rt/HNhARxw+JT/V0xNUTdjK7hA2G8Bn19U="; mypy-boto3-personalize-events = - buildMypyBoto3Package "personalize-events" "1.41.0" - "sha256-XjGe6BUx0VokcByU+aJLAmlI610z42qo9VOjudB+F5A="; + buildMypyBoto3Package "personalize-events" "1.42.3" + "sha256-Q0bgcDmMPc38oK8ht6Riqa0tMQ6QM9YgnEN2ZbhZbuQ="; mypy-boto3-personalize-runtime = - buildMypyBoto3Package "personalize-runtime" "1.41.0" - "sha256-Z08DfxXrOo+cGpV/Zgzt1N1Ja7Wdb0AKpfdhSFdoynE="; + buildMypyBoto3Package "personalize-runtime" "1.42.3" + "sha256-YyT/dD0x8U/ubEFBpKvBWiSWQj0ImYblJM0kKB/6ih8="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.41.0" - "sha256-FZBmz14ywoG4OWpwzrR1pey4ziSydlHQwZrMMICuD14="; + buildMypyBoto3Package "pi" "1.42.3" + "sha256-tj7qGsD5o0orvoUcbU7pxmfLwVyu2bux/yEQwYHisns="; mypy-boto3-pinpoint = - buildMypyBoto3Package "pinpoint" "1.41.0" - "sha256-M6BrFUi1ooFkd7TuZsbjckfktJQ4jEFyOJj4tDIIX5s="; + buildMypyBoto3Package "pinpoint" "1.42.3" + "sha256-BojorzQHOokGEYaY38eUKmo4lggBGdcplQw9ZO26p9s="; mypy-boto3-pinpoint-email = - buildMypyBoto3Package "pinpoint-email" "1.41.0" - "sha256-3uG2a+3/fffBVSntP6o2HxohJgSnaxhyEJ5tNGcDeXc="; + buildMypyBoto3Package "pinpoint-email" "1.42.3" + "sha256-AcDdmMa0wduyJgWbOjfLcyq5v44Oj8WktWB7PL4Pjso="; mypy-boto3-pinpoint-sms-voice = - buildMypyBoto3Package "pinpoint-sms-voice" "1.41.0" - "sha256-vydtDV14cPJcwz8bckidK5sijeBDlbDn7BiIV9gmsLY="; + buildMypyBoto3Package "pinpoint-sms-voice" "1.42.3" + "sha256-lDlP16Hoz5J6A/fhL79EgR1livk+WztLLTvy+nLrwhg="; mypy-boto3-pinpoint-sms-voice-v2 = - buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.41.0" - "sha256-6albVqi+X3LDB9ZMKty/gHeJ87v0OU2fSMkBtOIgzMQ="; + buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.42.3" + "sha256-KJepr2YeUEpaOJB+FOJ62emObclSVrwhjdTy1VKLb5A="; mypy-boto3-pipes = - buildMypyBoto3Package "pipes" "1.41.0" - "sha256-IvX+5zDxZxHLUsqNFtWzJkSoNmvwTcitwKk7g6kL3T4="; + buildMypyBoto3Package "pipes" "1.42.3" + "sha256-315QgDF/CNolDYIYUcEGqdc5rQotI1uw0q8aQN9sW08="; mypy-boto3-polly = - buildMypyBoto3Package "polly" "1.41.0" - "sha256-ltOX8P81ISThHVfZGUdPwhHHk8mQEAmfWPMDt9S2zVg="; + buildMypyBoto3Package "polly" "1.42.3" + "sha256-cPeqJusVAoknOqIsQbtnq5ByHUx8lES4Vnln76wdyF0="; mypy-boto3-pricing = - buildMypyBoto3Package "pricing" "1.41.0" - "sha256-0cCZ3hGWMhrNkERNIXc3N6qdhbpxJEJEsdVUBXklNis="; + buildMypyBoto3Package "pricing" "1.42.3" + "sha256-EY1rb0i7iYzr+JmXvDVfPcxCyNWs0DW0YQdlDsVcb04="; mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.38.0" "sha256-T04icQC+XwQZhaAEBWRiqfCUaayXP1szpbLdAG/7t3k="; mypy-boto3-proton = - buildMypyBoto3Package "proton" "1.41.0" - "sha256-WaoPrb4Cs8MAQnnc1y6XLDurku1TsZ7Rj5cG66xOlBQ="; + buildMypyBoto3Package "proton" "1.42.3" + "sha256-YLKdwGViP2a82dXdgk+GW1Xhg3RLhs77g6sB++ACVEQ="; mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.40.54" @@ -1073,200 +1073,200 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.41.2" - "sha256-i/k6U1es+8FcpdtSfj9cm0QQvZdeS98jDzw+YlEE+xY="; + buildMypyBoto3Package "quicksight" "1.42.3" + "sha256-6nFu3Gu1t2rzYfBDliqEuZ5pzbcMdwsCavswBkkLm8M="; mypy-boto3-ram = - buildMypyBoto3Package "ram" "1.41.0" - "sha256-8migaRgVoR5BkKbd1T1f6IydBhy5D9jGl7AmiEngbBs="; + buildMypyBoto3Package "ram" "1.42.3" + "sha256-Lk7eFLA/9yJkEdu0YML192R3pKdIe5hm0cQfKsugl3U="; mypy-boto3-rbin = - buildMypyBoto3Package "rbin" "1.41.1" - "sha256-pXpULn4yTRRs/MfOCUoACGvgXt8TLQq7ZujEK1l6rZk="; + buildMypyBoto3Package "rbin" "1.42.3" + "sha256-55wnvv8vd/G5KdZoJipaSLzC13wRoop7ZXwTLDU4GtE="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.41.2" - "sha256-zjERBJnhmrWTrCGhL8Kul7dH6FFo6prEkKyUWQ5e3kk="; + buildMypyBoto3Package "rds" "1.42.3" + "sha256-ZW6Vwwe4LP+S1uznIqo5YOqC8zBT4EOqC7eSlgmENjY="; mypy-boto3-rds-data = - buildMypyBoto3Package "rds-data" "1.41.0" - "sha256-4mTLPREizYhvV/hj2D64F2E/JYF21P2BYvtcLUMPmyc="; + buildMypyBoto3Package "rds-data" "1.42.3" + "sha256-XHcwFnP9i2zw5yPwvhcMMCSTmBpQy7ZdxQ4eMR0ao4M="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.41.2" - "sha256-WimTyDBgdt6Sk1LD4RZrOzqybKJWMtUHtphgyb5SV3o="; + buildMypyBoto3Package "redshift" "1.42.3" + "sha256-fBCd9JdfPAV1Qoqs21FutPQgexAtR/+Nk5VcrcRaY1M="; mypy-boto3-redshift-data = - buildMypyBoto3Package "redshift-data" "1.41.1" - "sha256-TyG0MmalnHdViX428FiumY+oy6UohOhtxkF8BMWDGMo="; + buildMypyBoto3Package "redshift-data" "1.42.3" + "sha256-Mby+hQJcBXqmDY5wC1Uut4EQex1PmjT8bgB81rT5NKU="; mypy-boto3-redshift-serverless = - buildMypyBoto3Package "redshift-serverless" "1.41.2" - "sha256-hxpsKuTEZPkDx6f1ynsSCHeM46Lrdx6l+js5BUQLUys="; + buildMypyBoto3Package "redshift-serverless" "1.42.3" + "sha256-fZnYq9s72H/IrAVqWQIeKMNfyLcD7K1CIbplX3P7dzc="; mypy-boto3-rekognition = - buildMypyBoto3Package "rekognition" "1.41.0" - "sha256-3RFRmeP8Yx74LZVsBfJr1MsqZ4HJgMP5XUSykRJQMTQ="; + buildMypyBoto3Package "rekognition" "1.42.3" + "sha256-1WBI1Q2LMnerRfzoo7iohiE+KYEhz6HZqsqq2U7jvWY="; mypy-boto3-resiliencehub = - buildMypyBoto3Package "resiliencehub" "1.41.0" - "sha256-tELeaCl7ocFM6IQQ5tw59MPt+9zuHmCCS2IJd6XPRgQ="; + buildMypyBoto3Package "resiliencehub" "1.42.3" + "sha256-fijgv07T/uckhzTbyzvQ8IzbtaYyz5QTeHGl3w4+Sko="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.41.0" - "sha256-ZSa72Cw35a2UMHLI/j1xsftLpnL3D5kK5cS5cfhsa2M="; + buildMypyBoto3Package "resource-explorer-2" "1.42.3" + "sha256-Jvb5qMnUZhiuDYtByiG2CjaQPsm30iyEEWGG1hKUg48="; mypy-boto3-resource-groups = - buildMypyBoto3Package "resource-groups" "1.41.0" - "sha256-iEHUj8swYyb+Ljpa+U4SHwLNWH+XqCbIVDZaDUTqFVg="; + buildMypyBoto3Package "resource-groups" "1.42.3" + "sha256-e2HQgjT94ETQuVS6ILTxBrVVbCmFb1pRo0FLiSCSJ4Y="; mypy-boto3-resourcegroupstaggingapi = - buildMypyBoto3Package "resourcegroupstaggingapi" "1.41.0" - "sha256-ItdrfjWN/4ClNO69+myAxt5SHEjhpxIWNCs5T428FoI="; + buildMypyBoto3Package "resourcegroupstaggingapi" "1.42.3" + "sha256-9UQvGxwF0vqxM2EXTneV6yIZrPI28EukXE0qi6lWivU="; mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.40.59" "sha256-jYAsZ1lMU9cl4rIvRO1UZLn4nIsuauWrNRwyB0j4HK0="; mypy-boto3-rolesanywhere = - buildMypyBoto3Package "rolesanywhere" "1.41.0" - "sha256-wcYk7NsqlkHelo0ai/ZdsRz+HVANcf+kWYFbnGpOdzE="; + buildMypyBoto3Package "rolesanywhere" "1.42.3" + "sha256-BzohFxZYhyKFmy8wIG6zdGsuPMh9Nr0GrY//d5q/Or4="; mypy-boto3-route53 = - buildMypyBoto3Package "route53" "1.41.4" - "sha256-r8UZFvlCMHoKJOCUN28kb9OSYNBi0bX7aNp7UZdbkFU="; + buildMypyBoto3Package "route53" "1.42.3" + "sha256-rrY7c3Kph4ULbXKRwqIzQwWWD0oBouM6HmZwF72gQDg="; mypy-boto3-route53-recovery-cluster = - buildMypyBoto3Package "route53-recovery-cluster" "1.41.0" - "sha256-AZlOuxUYdncBvt2vQgQNpAXbKRsOjCnk7A9UJupy6K0="; + buildMypyBoto3Package "route53-recovery-cluster" "1.42.3" + "sha256-UmasOtzfGq3MAelpwB9Ddi7QdUzMHYoGvd4hmTNmVfo="; mypy-boto3-route53-recovery-control-config = - buildMypyBoto3Package "route53-recovery-control-config" "1.41.0" - "sha256-usk7mIi12No7QbfX8z88Q0gncVqF5f++h+acBBq+D8U="; + buildMypyBoto3Package "route53-recovery-control-config" "1.42.3" + "sha256-qEo5gf2kknkHmYgYnMDnEqnsffn47hVrkdnjwYOUI3A="; mypy-boto3-route53-recovery-readiness = - buildMypyBoto3Package "route53-recovery-readiness" "1.41.0" - "sha256-VrepCg7ukSS63pA9HAyDdyji55FeQbvTGxSE0PJGGeU="; + buildMypyBoto3Package "route53-recovery-readiness" "1.42.3" + "sha256-9vR13ok2puJXdMyFSXVwgL+OJ2vBXUicZiV2KepvBbE="; mypy-boto3-route53domains = - buildMypyBoto3Package "route53domains" "1.41.0" - "sha256-LKUBghK8bzfzSut6jw94jHkRFyQrWsdUYKefYXbIqGg="; + buildMypyBoto3Package "route53domains" "1.42.3" + "sha256-AasFHhNs7b904wj2hzm0Hhj0CHit16bl+f+0cl9Y/t4="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.41.0" - "sha256-joHFVkMMRoB404y25Cov1uctMk53Le174ZomeNNYz+8="; + buildMypyBoto3Package "route53resolver" "1.42.3" + "sha256-Q+Mzw0HmswKrJIH1KanYN/Hk1Uba3Sel5SdcX/1yH1w="; mypy-boto3-rum = - buildMypyBoto3Package "rum" "1.41.0" - "sha256-Z4dEVofTPpv5cPLNUqK0SNY/PIjzN3TuK0aGtX5GcBE="; + buildMypyBoto3Package "rum" "1.42.3" + "sha256-4/Q39UsUYaluauoaLm6BOej+Krl2VbO1xKKo1orRIkI="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.41.1" - "sha256-FDG7avMbr/zReGC+Gfe/JVhuMxI3L0M8z68GMrHjIJc="; + buildMypyBoto3Package "s3" "1.42.3" + "sha256-JQe9+heCnx9CK4vzNNuDZomwUp++ZjWvTg86qnL5KAY="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.41.0" - "sha256-pagmdxEOhRYGej+OaHcLnXsat8GwmaiWJEir8/omToQ="; + buildMypyBoto3Package "s3control" "1.42.3" + "sha256-mAWbiTGs5SBCIetTF9aD8HxdJO1JixqahOOihqMHsi4="; mypy-boto3-s3outposts = - buildMypyBoto3Package "s3outposts" "1.41.0" - "sha256-Bi97uNPPzYVxPhs1OSYnQPq4HtQ11q9sZHxwRa4q7rM="; + buildMypyBoto3Package "s3outposts" "1.42.3" + "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.41.2" - "sha256-bZLY2ucajAvbKEpYJVVdG7GB4ft6anSVqcsLYhUg2no="; + buildMypyBoto3Package "sagemaker" "1.42.3" + "sha256-zLVZat92f9tuuikz9rrfAbYFO66ZKkWgJabljitb1Zg="; mypy-boto3-sagemaker-a2i-runtime = - buildMypyBoto3Package "sagemaker-a2i-runtime" "1.41.0" - "sha256-2Jm6Qml4HmpUBTSCNYZY2ZAuOVHj950T0Is+YecOm0k="; + buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3" + "sha256-dmUsLcno/E2Sb/mcdVve8qb10gOq2wMBy9P0w+MmS1w="; mypy-boto3-sagemaker-edge = - buildMypyBoto3Package "sagemaker-edge" "1.41.0" - "sha256-WItaMbyC0cSAAj3oZg/vHJxDN77ObYeY7WwZOgpS054="; + buildMypyBoto3Package "sagemaker-edge" "1.42.3" + "sha256-k6ZCEvbci8RRwe1vlkO0t7PYqt2NpmePqqARujXhrOI="; mypy-boto3-sagemaker-featurestore-runtime = - buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.41.0" - "sha256-Ae6Mmp2lJUbygrffbWTMjDdV7+EjgyajIHEqQMnX988="; + buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.42.3" + "sha256-68wT26P5cEJAl2nFgmV9NGy9q+hXa7+pSQtBX65Don0="; mypy-boto3-sagemaker-geospatial = - buildMypyBoto3Package "sagemaker-geospatial" "1.41.0" - "sha256-0NZI1WLr71ESVD+3cBfG9xm6AGJqvrXLf3PemcGw5TY="; + buildMypyBoto3Package "sagemaker-geospatial" "1.42.3" + "sha256-GENjDtRmX7c7uAOgbKn1vEkpXDJu7Z2Qilks8TVn9GY="; mypy-boto3-sagemaker-metrics = - buildMypyBoto3Package "sagemaker-metrics" "1.41.0" - "sha256-Z8rKbbWXrb/ScQlQyxMQf1gbB3nHOk3EbtCr2Xon9kM="; + buildMypyBoto3Package "sagemaker-metrics" "1.42.3" + "sha256-+SQRuoyCF3xgXvSbazaRk9dPQeOfGJZYu3vKSn4l44Y="; mypy-boto3-sagemaker-runtime = - buildMypyBoto3Package "sagemaker-runtime" "1.41.0" - "sha256-1TLdkhntzL/HGW4J59LmY31Fw2r4erY5mJdwSPQNnos="; + buildMypyBoto3Package "sagemaker-runtime" "1.42.3" + "sha256-595ADc+EWC7i37ubD46h6HR7VUhSnH8+UkPz6q4jUR0="; mypy-boto3-savingsplans = - buildMypyBoto3Package "savingsplans" "1.41.0" - "sha256-sgQHWERejYF7Zezuh8FvvuPK5TwS1bvKCgZ/iU5r1SM="; + buildMypyBoto3Package "savingsplans" "1.42.3" + "sha256-91gIxXdxKevS9es3dQamxTCBjI3B3lJMHQUZrkrfXxQ="; mypy-boto3-scheduler = - buildMypyBoto3Package "scheduler" "1.41.0" - "sha256-5B+H14d+SavyWx2nr3X9OCKd86id48N0JNhUGvGz4JA="; + buildMypyBoto3Package "scheduler" "1.42.3" + "sha256-nyVmH5XeePQ71QEVc6GZ3UYJ4l/6oI/CUVImT/thRr4="; mypy-boto3-schemas = - buildMypyBoto3Package "schemas" "1.41.0" - "sha256-G1dtEgE4NX1woY5mE3rxHcjN4iInF35NnHjdCXBIIws="; + buildMypyBoto3Package "schemas" "1.42.3" + "sha256-iu65bUCX50x4VRLSWNXwvpE2gOjOhyJxmvhWtHYvrSI="; mypy-boto3-sdb = - buildMypyBoto3Package "sdb" "1.41.0" - "sha256-4JI37HhTJo75sHyU0Lm9fKB6Ig87NcgN3Lel5sIEQjs="; + buildMypyBoto3Package "sdb" "1.42.3" + "sha256-CwXzHFKnprY3TLQUMkGU9PC3rR/mjrKwUN9eJ30hPWk="; mypy-boto3-secretsmanager = - buildMypyBoto3Package "secretsmanager" "1.41.0" - "sha256-2Mo8Pkx9/Yi4XPD5VlYnNOjzYIqvn5jpZp3CmMBiTV8="; + buildMypyBoto3Package "secretsmanager" "1.42.3" + "sha256-ZWCeE7aIqOjXYIWRfSXlYY06rQge7/34Zv/+cp2R/Mg="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.41.1" - "sha256-AJrT6vmP5C61SLPqiUeeKIcJ2rLVBi49tKdrj8/pAwg="; + buildMypyBoto3Package "securityhub" "1.42.3" + "sha256-4V6ZGMFF6aoKehs7dCwziC3o1J9S/yGjmdfuLMRNirc="; mypy-boto3-securitylake = - buildMypyBoto3Package "securitylake" "1.41.0" - "sha256-3Qndx0VJnwDnNqv4GoCb+fgG4nuSCo5GRCC4AquWPMk="; + buildMypyBoto3Package "securitylake" "1.42.3" + "sha256-NoJ45saKUlWFpzUksZPrnUfj8yl1ivfXRoID38pqxGU="; mypy-boto3-serverlessrepo = - buildMypyBoto3Package "serverlessrepo" "1.41.0" - "sha256-04clE0dVC9nNXmLQClSMhCuvE09N6SxWxXk7sYGuLhY="; + buildMypyBoto3Package "serverlessrepo" "1.42.3" + "sha256-JIwTLfrkWY98gY+eH15Sy7r9Kif+68pBqgmZoj2DTWQ="; mypy-boto3-service-quotas = - buildMypyBoto3Package "service-quotas" "1.41.0" - "sha256-OLGD0bqfd660l1n+FGKhguCjAtYYWGnbuKLx4NGuqf8="; + buildMypyBoto3Package "service-quotas" "1.42.3" + "sha256-INL6mi8S7oWOsHUoHb1h+uryG6chligV5vwB02XIoas="; mypy-boto3-servicecatalog = - buildMypyBoto3Package "servicecatalog" "1.41.0" - "sha256-FNKWpOLI8kqQ93y6tiLVaHVxoylwfGK4xfLPgCInFB0="; + buildMypyBoto3Package "servicecatalog" "1.42.3" + "sha256-pCZjmXqOAWJVmiuL0q8nsCN6RZJDWYH9sM/a8NYe84A="; mypy-boto3-servicecatalog-appregistry = - buildMypyBoto3Package "servicecatalog-appregistry" "1.41.0" - "sha256-qszMPhXSFEo6YDMoqaZfY3zp0X3NNERC24DUSiP1m9o="; + buildMypyBoto3Package "servicecatalog-appregistry" "1.42.3" + "sha256-Duojb0uujD4zvfXBRiCSq33Gj/Fdf8t0VDfGKxhnGjw="; mypy-boto3-servicediscovery = - buildMypyBoto3Package "servicediscovery" "1.41.0" - "sha256-YFiUwXqJCnZr/Un96jS300H7PmYvdBmfUXcT16msWCk="; + buildMypyBoto3Package "servicediscovery" "1.42.3" + "sha256-TNOD43uSjgeiYfwBJTQuflWDoQobhOw39+527t71tyA="; mypy-boto3-ses = - buildMypyBoto3Package "ses" "1.41.0" - "sha256-N3TZszOzQ53Efj+9qPHZvddmrF+ABgmN8JeFA0/Dlys="; + buildMypyBoto3Package "ses" "1.42.3" + "sha256-gGSjHXCQf4jHTYaJQWRRQfdpr82gGklxWeWBrLx5/Is="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.41.2" - "sha256-Bv3w6fex931Mtv324CUDMvpIUxLzTD8+2MPg4SQUnjs="; + buildMypyBoto3Package "sesv2" "1.42.4" + "sha256-x2y01UFsc/kYLhSGpfkIqRMyQBiZEhSrmHiXMkYl3o4="; mypy-boto3-shield = - buildMypyBoto3Package "shield" "1.41.0" - "sha256-+a/bTtQQktuejpA4XWq/fG/wHA4BDyFGqGbCcL6ScOg="; + buildMypyBoto3Package "shield" "1.42.3" + "sha256-AXqV0TsOLNYBdDVFzigW99tfKCUvvrS7S/F8nT3xSOw="; mypy-boto3-signer = - buildMypyBoto3Package "signer" "1.41.0" - "sha256-79S2Qb2lj8qpcvZXEc1gMgRpyvURZl5BKT3Q4bNDm6w="; + buildMypyBoto3Package "signer" "1.42.3" + "sha256-L1rqSLDwrqyezgLio1BWJQDZ1pclQLyvuNvt3kynQmQ="; mypy-boto3-simspaceweaver = - buildMypyBoto3Package "simspaceweaver" "1.41.0" - "sha256-m2o+DoWu1z7xG5l+iPavGAgactdMEBxgLIT7/QcTtT4="; + buildMypyBoto3Package "simspaceweaver" "1.42.3" + "sha256-g9Yh4KSIERm9Uo2F9hnDPF+6tU57mxt0Q9goLyBnMfE="; mypy-boto3-sms = buildMypyBoto3Package "sms" "1.40.0" @@ -1277,162 +1277,162 @@ in "sha256-qWnTJxM1h3pmY2PnI8PjT7u4+xODrSQM41IK8QsJCfM="; mypy-boto3-snow-device-management = - buildMypyBoto3Package "snow-device-management" "1.41.0" - "sha256-wxk9qdl3HOOx1vDxueViIOIhMyBbnHdFBzJRzf99iUY="; + buildMypyBoto3Package "snow-device-management" "1.42.3" + "sha256-wNuzufARcqJ8liqDq2uSLxf6OvHt6ILm4uwi2mZ22rM="; mypy-boto3-snowball = - buildMypyBoto3Package "snowball" "1.41.0" - "sha256-18dczBJSv+4TDtNLNZ0SpIWrkzA1fO1HgydtPqlb1+4="; + buildMypyBoto3Package "snowball" "1.42.3" + "sha256-hRI6ESK7/wbcKYo5aB2W5QXQ0hDrfKIHTTyN/RpEYrA="; mypy-boto3-sns = - buildMypyBoto3Package "sns" "1.41.0" - "sha256-yKJXKXiALXls8Ikz1ZBl+fIJlAIx2rpDLaAbFnf9eks="; + buildMypyBoto3Package "sns" "1.42.3" + "sha256-Ht/oi/MOsZHcSZN45154ABzPDCnjcqxJqM/MhgBdin4="; mypy-boto3-sqs = - buildMypyBoto3Package "sqs" "1.41.0" - "sha256-gGqPbrk0jq+HZe4t2hiIOx6IKDLMmdEq53D4O2Qohdo="; + buildMypyBoto3Package "sqs" "1.42.3" + "sha256-aZmVuab2mpfG0+kSanbwZ1HjtAVkAXT+fCD+cdndyCo="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.41.0" - "sha256-lZdFqk538qxaGb8MdV6P2f6OpM5+i3ceCWWiE0KinT0="; + buildMypyBoto3Package "ssm" "1.42.3" + "sha256-2IMej08pRmFupGG3XZhchJjwBQynpcPC6LTD3wKpkjc="; mypy-boto3-ssm-contacts = - buildMypyBoto3Package "ssm-contacts" "1.41.0" - "sha256-JzyFza9wab+2gUaWy5Lmz1/lTaRJUaB7Vq74lIwj/Iw="; + buildMypyBoto3Package "ssm-contacts" "1.42.3" + "sha256-94OFvLuYx8Y4eKtGXA2Vbl6Rxh2MV9IOHfbFB2tL3kM="; mypy-boto3-ssm-incidents = - buildMypyBoto3Package "ssm-incidents" "1.41.0" - "sha256-VNYgP34qaN9FLwiWmMoHn1mpkYwAo7mayuhP6cksxao="; + buildMypyBoto3Package "ssm-incidents" "1.42.3" + "sha256-s3qgmNIltIoSjjA1r6t9cRmX78Nhizx+sSBn73XB7sI="; mypy-boto3-ssm-sap = - buildMypyBoto3Package "ssm-sap" "1.41.0" - "sha256-RhS8FUoDEpQ/WUwuU/HHST/twV3y9H4igkPTDzjmspM="; + buildMypyBoto3Package "ssm-sap" "1.42.3" + "sha256-v3zTWb3+geXcCVJ5fmTet55e9PXwo2FofeVG9vkgF1A="; mypy-boto3-sso = - buildMypyBoto3Package "sso" "1.41.0" - "sha256-L1ZKNCCQt9r/zrLzQpro0Bj1ZaFOyjBNtDgAbyUfYpw="; + buildMypyBoto3Package "sso" "1.42.3" + "sha256-eLm650XMxikqnBzOWD6aZo8dYVmVkl3Mk0+SqZcON8c="; mypy-boto3-sso-admin = - buildMypyBoto3Package "sso-admin" "1.41.0" - "sha256-zUTJieb1wlqHfqxdCrx7mMBZpHAkUTGroXIxxdjNKHY="; + buildMypyBoto3Package "sso-admin" "1.42.3" + "sha256-asz4/PUoDt62nlH2G1RdTIlH0ll/cOBPB5NxuYBCApc="; mypy-boto3-sso-oidc = - buildMypyBoto3Package "sso-oidc" "1.41.0" - "sha256-5SzomJcGADuDsTqJtrIuMiYcMN5fiiP87OCZoAIjUGI="; + buildMypyBoto3Package "sso-oidc" "1.42.3" + "sha256-ha0ieZCLsp4m+JOpa1DaovuteMQXFvFDLNhMULVeh2I="; mypy-boto3-stepfunctions = - buildMypyBoto3Package "stepfunctions" "1.41.0" - "sha256-j8f4fyxXZt1c7PR5B4m5ogL4KkY/EyUHeEprLfJgaIo="; + buildMypyBoto3Package "stepfunctions" "1.42.3" + "sha256-vzj520LhROhseAff8SdVTe/hVIoQuiWCT2nMdFVPpbU="; mypy-boto3-storagegateway = - buildMypyBoto3Package "storagegateway" "1.41.0" - "sha256-nanEu+mFWq/+OXpItOFE7sTB0m6dpE1DBL9o9gOAJvY="; + buildMypyBoto3Package "storagegateway" "1.42.3" + "sha256-92jALXRmjt/8Ji99jF3304T/xKW+gV1Ix3/N+fmodJc="; mypy-boto3-sts = - buildMypyBoto3Package "sts" "1.41.0" - "sha256-tgQzSb3cfLgpVsSFHXKLr8IabysAQ7bMrh4OBJs0+po="; + buildMypyBoto3Package "sts" "1.42.3" + "sha256-OFfFuj86XAQX7cR/WtTkWJHjurwy1WxrJ8XUFn+fW6c="; mypy-boto3-support = - buildMypyBoto3Package "support" "1.41.0" - "sha256-WH+VhBY9r1lbv7llOsxOPcNRiNzAJWaIxWTNxck1W74="; + buildMypyBoto3Package "support" "1.42.3" + "sha256-G99OogEGnAisLOIMdCdLJHfiFoZEWL+7UmySNOKyoTQ="; mypy-boto3-support-app = - buildMypyBoto3Package "support-app" "1.41.0" - "sha256-MXdyTYfdXdf4fqj1ubfRW3MPw/TgfyhkvffjlWCU5v4="; + buildMypyBoto3Package "support-app" "1.42.3" + "sha256-1MD4eTC9fVXlQoARoHll43GMf1rKLG2pvGzPGH0Q6vw="; mypy-boto3-swf = - buildMypyBoto3Package "swf" "1.41.0" - "sha256-+DQTs6FvwMf7/lWdJXKoHMXCLOlPJF/95X+uF8xe5lc="; + buildMypyBoto3Package "swf" "1.42.3" + "sha256-OwWkvl0G76mX+rDyu5IMff+DsfD00k37y/TEFBp6Vf4="; mypy-boto3-synthetics = - buildMypyBoto3Package "synthetics" "1.41.0" - "sha256-CQKV87MfTeu8vz0figczwEml/qC6QD4yqvVPA2AaAHI="; + buildMypyBoto3Package "synthetics" "1.42.3" + "sha256-IvQ168llb/sf6AeAmNueoe3U7ghNuJ8Kbw5gh8kFMq0="; mypy-boto3-textract = - buildMypyBoto3Package "textract" "1.41.0" - "sha256-BLqtMWhRzDdd9LQ9BPihBi4sL24o5htoV6nkWil+pY0="; + buildMypyBoto3Package "textract" "1.42.3" + "sha256-j4vFnFjR5/kf6KeJtCXJFwqfEUOQ3Rz+++OJrLd3MR0="; mypy-boto3-timestream-query = - buildMypyBoto3Package "timestream-query" "1.41.0" - "sha256-/MQzey2mxw63ye2JbNM9CaQ3hJcaEdZctXYn65D0tWI="; + buildMypyBoto3Package "timestream-query" "1.42.3" + "sha256-iChDRilp+M6JnrE0q7sUIZ7I1XqX2wuU9yAo5B5vsOQ="; mypy-boto3-timestream-write = - buildMypyBoto3Package "timestream-write" "1.41.0" - "sha256-N+7gAU4cThxOKaJjCC9hLpB77mloiIHz6nmZGybqsGU="; + buildMypyBoto3Package "timestream-write" "1.42.3" + "sha256-KDNxfSnrpiTc42Hf6agslUac3X0H8HMHEXSBYOeN5B8="; mypy-boto3-tnb = - buildMypyBoto3Package "tnb" "1.41.0" - "sha256-7b9U+Eh/rfy3DWowvPJ3RtQ8+O2Y364oy76gJW4hErw="; + buildMypyBoto3Package "tnb" "1.42.3" + "sha256-NCC+R+BEAT1bZ+J3zvC/FI7lZkHfR8OiCIQUjVefMxY="; mypy-boto3-transcribe = - buildMypyBoto3Package "transcribe" "1.41.0" - "sha256-pMDL5chL+drsMZu5zOlcO11Nym7hKeRcpkf1C0WwPUU="; + buildMypyBoto3Package "transcribe" "1.42.3" + "sha256-ACxxfBk7jIyqoZ84jTD955w6L40S1N63QpmNEmS7kFA="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.41.2" - "sha256-NHSCZ4aHjo+sc/nOTgou5lTwaXXVMtGMkgeFfzKLoJQ="; + buildMypyBoto3Package "transfer" "1.42.3" + "sha256-/ehkFniPKAPY5m1ijVnJhVccUgIbY5vnYGgv7E9TPhs="; mypy-boto3-translate = - buildMypyBoto3Package "translate" "1.41.0" - "sha256-5CxPXa8Z+/lP3BAD33EnBedTICJYrcjuc17jhlzNqEk="; + buildMypyBoto3Package "translate" "1.42.3" + "sha256-olIHhtYBAz8+avIUNnLoD2pdMq+TLrB8Mn+haKeUl/0="; mypy-boto3-verifiedpermissions = - buildMypyBoto3Package "verifiedpermissions" "1.41.0" - "sha256-+8ZiZ/f82s6qIIQ80+GNF8WFzCLcbSPz4Clz+9/QGf0="; + buildMypyBoto3Package "verifiedpermissions" "1.42.3" + "sha256-2fA+3Ddfeetmh2vBpnIAWO7ILfTLBTxZtjJ18Yn+mHA="; mypy-boto3-voice-id = - buildMypyBoto3Package "voice-id" "1.41.0" - "sha256-rHitg2Jl8HlJVBItCFynO5oyKcE8N3ya6hIUk7m+xwM="; + buildMypyBoto3Package "voice-id" "1.42.3" + "sha256-ovnE8szKPWozcpBtzxDE8Cqz5zUuY7rIm7IbKMnzVfw="; mypy-boto3-vpc-lattice = - buildMypyBoto3Package "vpc-lattice" "1.41.0" - "sha256-jTBdsBSgLubTL4CTSpEivxeQZKiaP/tRmocMBTejmu8="; + buildMypyBoto3Package "vpc-lattice" "1.42.3" + "sha256-FyymePjaNzAl07HDHPW6M71N1eCkED5L75hhGPoGogA="; mypy-boto3-waf = - buildMypyBoto3Package "waf" "1.41.0" - "sha256-5BA7zb0ypdyo1cieXqCr1GBGZbqS+3ZsQqn2cnEVnMg="; + buildMypyBoto3Package "waf" "1.42.3" + "sha256-NIRqd/ZG9qZhb8GJUgk8KZUsejQwCPriCMND7EJLY5M="; mypy-boto3-waf-regional = - buildMypyBoto3Package "waf-regional" "1.41.0" - "sha256-7YSm8CspiWW+3xwXmFHzTS1TqqgmpsDBwQ4Hyrye79c="; + buildMypyBoto3Package "waf-regional" "1.42.3" + "sha256-FEl4TtWX042gUuznqlc25HoIbMcCKhE85uuJPh8Kt+E="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.41.0" - "sha256-/rtMtnZJH2x66DxSRvGdazzoSRhtzwxdBAWsdXpAvmM="; + buildMypyBoto3Package "wafv2" "1.42.3" + "sha256-VWo+1TnWrbwmaXOwjeOIJoknL/XB5RjYGeTyL30E02Y="; mypy-boto3-wellarchitected = - buildMypyBoto3Package "wellarchitected" "1.41.0" - "sha256-RZjhcHk+4i2dZyNDQqV6Vep1GGfV1pppVcM42JnjA2k="; + buildMypyBoto3Package "wellarchitected" "1.42.3" + "sha256-+grWgv9THkvVIf3IPxN4bai4cpMHsv5NdJQnEKB5Ivo="; mypy-boto3-wisdom = - buildMypyBoto3Package "wisdom" "1.41.0" - "sha256-uNA/i9FUZvAC1yYYup9UsXA/ZNyOGapcYk2z8SWcxPA="; + buildMypyBoto3Package "wisdom" "1.42.3" + "sha256-r2iOH2Uc9dPqglIaSwNVv3yemOWVI3KY+M4bLaOFLio="; mypy-boto3-workdocs = - buildMypyBoto3Package "workdocs" "1.41.0" - "sha256-Acq8S2FqnUubiKA4q9UNlXeqjX/0FsUZ/cA1K6g/Nxs="; + buildMypyBoto3Package "workdocs" "1.42.3" + "sha256-bIMm0QOfErvZMFXiFCHMMi+xfvcsFI25geMXzCHEBkU="; mypy-boto3-worklink = buildMypyBoto3Package "worklink" "1.35.0" "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ="; mypy-boto3-workmail = - buildMypyBoto3Package "workmail" "1.41.0" - "sha256-PYBPSv6tOC6GuP+L1SGs9xHdf6bfcwMpzPQ+RS2t9qc="; + buildMypyBoto3Package "workmail" "1.42.3" + "sha256-wTEMdjr8c14xH1KDPLnSnD3eg/TkOt5eF2ooGxzcIoc="; mypy-boto3-workmailmessageflow = - buildMypyBoto3Package "workmailmessageflow" "1.41.0" - "sha256-YyVFSnelblqcpf7eJgQP/NJzTZg93VPeNm/3wuz0aY4="; + buildMypyBoto3Package "workmailmessageflow" "1.42.3" + "sha256-bxh+mhwsHHwt/cx/njegTa/QGHu+xa7YPg4SRos1deM="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.41.0" - "sha256-I+6aKY9k2p4Sg0AIs25zqoSeUT2YwHq3XGzId88QfgM="; + buildMypyBoto3Package "workspaces" "1.42.3" + "sha256-YfqjqAgZDNBUqqhwXG/GXF+rkAaYa1NTkKW02zt7yjE="; mypy-boto3-workspaces-web = - buildMypyBoto3Package "workspaces-web" "1.41.0" - "sha256-MCL/FaNV3RctO9k6CBZAAtCYhN1puWdm5a00WpFTsHs="; + buildMypyBoto3Package "workspaces-web" "1.42.3" + "sha256-BLSJb/oJ4OIZIUpcKws+bR8cqgmh/MT8mgigBiBW/r4="; mypy-boto3-xray = - buildMypyBoto3Package "xray" "1.41.0" - "sha256-v3lfrykupkITvB9pEjFreOINv3PzDhzFloNPGz6EgCM="; + buildMypyBoto3Package "xray" "1.42.3" + "sha256-gJLEGWfu0tD+4JaiKwgrsQfP4rtGeo3X+9w5JZPxlpw="; } diff --git a/pkgs/development/python-modules/mypyllant/default.nix b/pkgs/development/python-modules/mypyllant/default.nix new file mode 100644 index 000000000000..77f1f0c9980f --- /dev/null +++ b/pkgs/development/python-modules/mypyllant/default.nix @@ -0,0 +1,73 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + aiohttp, + pydantic, + + # tests + aioresponses, + country-list, + freezegun, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, + pytest-xdist, + pytestCheckHook, + pyyaml, + requests, +}: + +buildPythonPackage rec { + pname = "mypyllant"; + version = "0.9.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "signalkraft"; + repo = "myPyllant"; + tag = "v${version}"; + hash = "sha256-eneAFJ4xRL8EKj8Act/YcW7Gx0B85u0g3LTWPlI/B/0="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + aiohttp + pydantic + ]; + + nativeCheckInputs = [ + aioresponses + country-list + freezegun + pytest-asyncio + pytest-cov-stub + pytest-mock + pytest-xdist + pytestCheckHook + pyyaml + requests + ]; + + pythonImportsCheck = [ + "myPyllant" + ]; + + meta = { + description = "Python library to interact with the API behind the myVAILLANT app"; + homepage = "https://github.com/signalkraft/myPyllant"; + changelog = "https://github.com/signalkraft/myPyllant/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 2274c41496dd..838d05659fa0 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { mainProgram = "jupyter-trust"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 86201dc13f5c..e562551ec9b0 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "6.3.1"; + version = "6.4.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-osT6arHZ+ac9NAfyVU/ArT78QCTfq3rPPmwdhvTMg14="; + hash = "sha256-q910WbBp0TBqXw8WfYniliVGnr4Hi6dDhVDqZszSL0c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index c4eef602132b..906b7976516e 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ndindex"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; tag = version; - hash = "sha256-gPhRln7cUoRmypuTDTwoz4LyCBX3EwuKes/SEoz9NYM="; + hash = "sha256-rjhCysdhLCAofob7yUL7s65hMju13uotrzJ+aY0stzI="; }; build-system = [ diff --git a/pkgs/development/python-modules/ninja/default.nix b/pkgs/development/python-modules/ninja/default.nix index 6f9785e47664..d37cf0bffec9 100644 --- a/pkgs/development/python-modules/ninja/default.nix +++ b/pkgs/development/python-modules/ninja/default.nix @@ -45,7 +45,6 @@ buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ _999eagle - tjni ]; }; } diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix index ddba0da26cbb..5e3a30b167bd 100644 --- a/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix +++ b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix @@ -33,10 +33,10 @@ buildPythonPackage { meta = { description = "Library for updating plugin collections in Nixpkgs"; license = lib.licenses.mit; - maintainers = [ - lib.maintainers.teto - lib.maintainers.perchun - lib.maintainers.khaneliman + maintainers = with lib.maintainers; [ + teto + PerchunPak + khaneliman ]; }; } diff --git a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix index 661dd2d8721a..7a50c9ad91ad 100644 --- a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix +++ b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { homepage = "https://github.com/PerchunPak/nixpkgs-updaters-library"; changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 4571f85bf23a..b8efb799587c 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "nltk"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h9EnvT3kvYmk+BJl5fpZyxsZmydEAXU3D3QX0rx66Gg="; + hash = "sha256-D0CemwacpBd8GQPD6EPu+Qx+kpkvpJMa5gfabeSeFBk="; }; dependencies = [ diff --git a/pkgs/development/python-modules/nonbloat-db/default.nix b/pkgs/development/python-modules/nonbloat-db/default.nix index b87e03a9604c..a7c7f42ad964 100644 --- a/pkgs/development/python-modules/nonbloat-db/default.nix +++ b/pkgs/development/python-modules/nonbloat-db/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/PerchunPak/nonbloat-db"; changelog = "https://github.com/PerchunPak/nonbloat-db/blob/v${version}/CHANGES.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ perchun ]; + maintainers = with lib.maintainers; [ PerchunPak ]; }; } diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 2235147911ae..7f71dc146e44 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.4.4"; + version = "7.5.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook"; tag = "v${version}"; - hash = "sha256-bj4iQvm0TGBiCu9drJ8QFXsedzm/cEjevNQS6UsasNs="; + hash = "sha256-EKfe3uqIwb+kKmSuU7aIinNj1nkRaBvg3liV6RiR3xc="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-nRaWzr5Q904KojfK0mPgLX9be82axb8Aab0SJULE7RU="; + hash = "sha256-ILDTRK5NJ33T30YRTT3/g1mIE2sI8spGPwMsWyQ5UTc="; }; build-system = [ diff --git a/pkgs/development/python-modules/ogmios/default.nix b/pkgs/development/python-modules/ogmios/default.nix index 2a90cbd2807e..fb16b93c8ff1 100644 --- a/pkgs/development/python-modules/ogmios/default.nix +++ b/pkgs/development/python-modules/ogmios/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ogmios"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchPypi { pname = "ogmios"; inherit version; - hash = "sha256-L+BBuWhcQhnE9f+b860401WKTUcFxf7Ehji1MHCNqjo="; + hash = "sha256-+edW34O+OF+JyCoZSjxRwKS6JeXfaZ38+ykUpXwBJ1Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/pkgs/development/python-modules/oldest-supported-numpy/default.nix index 4cd90976e8d7..0ac12dfffdac 100644 --- a/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { description = "Meta-package providing the oldest supported Numpy for a given Python version and platform"; homepage = "https://github.com/scipy/oldest-supported-numpy"; license = licenses.bsd2; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index cee610f3b5ba..ceff7cd1fdfe 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.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-4GvONxyv3/+mago/AHp5zbfoiKskKxiDZR1h+OhVbPU="; + hash = "sha256-SpFZ4cu+clvHtjD/Qm6L8Qi9sICWZNE2/l/YXWhAZCo="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/onecache/default.nix b/pkgs/development/python-modules/onecache/default.nix index d5baed55f2b3..d3398a7266b7 100644 --- a/pkgs/development/python-modules/onecache/default.nix +++ b/pkgs/development/python-modules/onecache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "onecache"; - version = "0.7.1"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sonic182"; repo = "onecache"; tag = version; - hash = "sha256-uUtH2MIsnAa3cC5W1NEecrSScpKsKLFrqz7f3WdAO70="; + hash = "sha256-W+5AF5W7Unz5EnAum4WOrKRKet1efzwmEryB2WWlRKY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix index d43fdbc99bdf..6c0134af870f 100644 --- a/pkgs/development/python-modules/onetimepass/default.nix +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/tadeck/onetimepass"; changelog = "https://github.com/tadeck/onetimepass/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ zakame ]; }; } diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix index 28eba0d1bb28..3a05d26fff97 100644 --- a/pkgs/development/python-modules/onnxslim/default.nix +++ b/pkgs/development/python-modules/onnxslim/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "onnxslim"; - version = "0.1.70"; + version = "0.1.78"; pyproject = true; src = fetchFromGitHub { owner = "inisis"; repo = "OnnxSlim"; tag = "v${version}"; - hash = "sha256-xShmJR0GWuGmuM0LZ0nBLDoC0m7c0iSWolUGUscVotA="; + hash = "sha256-xLT00z9zeO4o5JN9W+5AfpANjc2+qAtFNnncLJptCoA="; }; build-system = [ diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index d9dd55c2c528..c202ca374613 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "3.10.3"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; tag = "v${version}"; - hash = "sha256-M5g3Rn9WuyudhWQfDooopjexEgGVB0rzfJsPg+dqwn4="; + hash = "sha256-pk3nghd16jhdf7zokwMzBGwGtBU7ta4nSHsOoGxjD4w="; }; meta = { diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix index 12eba245ff24..fe9971fab8e6 100644 --- a/pkgs/development/python-modules/openslide/default.nix +++ b/pkgs/development/python-modules/openslide/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openslide"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "openslide"; repo = "openslide-python"; tag = "v${version}"; - hash = "sha256-iI92lsW+hshMxl2rtc3/iq0LmQBuvpwqpqJXMXcCiLc="; + hash = "sha256-v8JrZdDwZPtnWYOmvJXbq22k6/MQqMzWweD86Eof0e4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix index e20545e9e51b..55083bdd47e3 100644 --- a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix +++ b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { homepage = "https://github.com/opsdroid/image_size"; changelog = "https://github.com/opsdroid/image_size/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; mainProgram = "get-image-size"; }; } diff --git a/pkgs/development/python-modules/ormsgpack/default.nix b/pkgs/development/python-modules/ormsgpack/default.nix index 0439b7560c7b..8b45f5df0e20 100644 --- a/pkgs/development/python-modules/ormsgpack/default.nix +++ b/pkgs/development/python-modules/ormsgpack/default.nix @@ -5,7 +5,6 @@ cargo, rustPlatform, rustc, - pyinstaller, # dependencies msgpack, @@ -48,10 +47,6 @@ buildPythonPackage rec { msgpack ]; - nativeBuildInputs = [ - pyinstaller - ]; - nativeCheckInputs = [ pytestCheckHook pydantic diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index 041c05eb0bed..73809b2385f3 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -51,14 +51,14 @@ let in buildPythonPackage rec { pname = "paddlex"; - version = "3.3.5"; + version = "3.3.10"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleX"; tag = "v${version}"; - hash = "sha256-rxVfkvi/uOetMbR3pHN+apjqtvgTq5rwLc0gkhI6OvU="; + hash = "sha256-zP9MogxeKbnWtbMM6Kz6ItmSdqTZN5U6d1GkskFJhsI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 45ed7d0f1636..3a9252f15d06 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -48,14 +48,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "6.18.7"; + version = "8.18.6"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "parsedmarc"; tag = version; - hash = "sha256-AjRYd3uN76Zl7IEXqFK+qssAvuS+TbT+mZL+pPlxDwc="; + hash = "sha256-wwncnkZnd8GsjvwsuJEgFYCtapzGYYcVBRYoJ1cwVEw="; }; build-system = [ diff --git a/pkgs/development/python-modules/partial-json-parser/default.nix b/pkgs/development/python-modules/partial-json-parser/default.nix index 6125d6a66c18..6c177db0aee1 100644 --- a/pkgs/development/python-modules/partial-json-parser/default.nix +++ b/pkgs/development/python-modules/partial-json-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "partial-json-parser"; - version = "0.2.1.1.post6"; + version = "0.2.1.1.post7"; pyproject = true; src = fetchPypi { pname = "partial_json_parser"; inherit version; - hash = "sha256-Q4lraJKWeCJMu+SISmpf6SUd7UswuLfX61aeX+6pOvw="; + hash = "sha256-hlkOG6a8tnOaLfwX0jI/Aoy1iE9MbOI9s3aZkTLJqSI="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 33587528a50c..9f0b0c1506a4 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2025.11.20"; + version = "2025.12.05"; pyproject = true; src = fetchFromGitHub { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-43IcNdeJvfvSTRAYDwQPACRQuDowFjACIITV6haT/aE="; + hash = "sha256-wKAlqMo94dhv1swdT5+cOKnfEEg7XWUuXo/H6xk+pQY="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index ea2ad1834ccf..653ad14c40df 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pdfminer-six"; - version = "20250506"; + version = "20251107"; pyproject = true; src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; tag = version; - hash = "sha256-BE/HMl/e1KnkSc2jXU5Du5FMF+rCBv5AJ7a88oFrBgM="; + hash = "sha256-PuRxiKL1rLpfdabH3cMywkwBoeImu/yNgEhckLzr0Z4="; }; build-system = [ diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index ae485714ade8..884c324b5863 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.18.2"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; tag = version; - hash = "sha256-BIOY3vAHzSonxXYFmfFbVxbbUWnUVtcBRsTVMRo7peE="; + hash = "sha256-gMoU6YQMlEfL6onRAA/8v/08Je2jeLoZ3zw+2n1fmw4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 5853e01ce922..eca64455fe81 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "peft"; - version = "0.17.1"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "peft"; tag = "v${version}"; - hash = "sha256-xtpxwbKf7ZaUYblGdwtPZE09qrlBQTMm5oryUJwa6AA="; + hash = "sha256-LLV6fMFPh45IvNJv9totMYDoKAkZW/1Bx3qOlDTWMLA="; }; build-system = [ setuptools ]; @@ -73,6 +73,8 @@ buildPythonPackage rec { # These tests fail when MPS devices are detected disabledTests = lib.optional stdenv.hostPlatform.isDarwin [ "gpu" + "test_save_load" + "test_resume_training_model_with_topk_weights" ]; disabledTestPaths = [ @@ -81,6 +83,7 @@ buildPythonPackage rec { # Require internet access to download a dataset "tests/test_adaption_prompt.py" + "tests/test_arrow.py" "tests/test_auto.py" "tests/test_boft.py" "tests/test_cpt.py" @@ -92,10 +95,10 @@ buildPythonPackage rec { "tests/test_hub_features.py" "tests/test_incremental_pca.py" "tests/test_initialization.py" + "tests/test_lora_variants.py" "tests/test_mixed.py" "tests/test_multitask_prompt_tuning.py" "tests/test_other.py" - "tests/test_other.py" "tests/test_poly.py" "tests/test_stablediffusion.py" "tests/test_trainable_tokens.py" diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index cc604bc87997..66351f445a6e 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector-python"; tag = "v${version}"; - hash = "sha256-QbNzEQctKgxdH1cpMmf2Yg05Q3KOT9tGtK4YSr9GiC4="; + hash = "sha256-jzUZK3zQxqajVqGbaQzLPzvK/k3Wck9jX95kkBH2IlY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 7b376d7b4c4a..03b771d93671 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ - hrdinka - ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pizzapi/default.nix b/pkgs/development/python-modules/pizzapi/default.nix deleted file mode 100644 index c048eb58a481..000000000000 --- a/pkgs/development/python-modules/pizzapi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - requests, - xmltodict, - pyhamcrest, - mock, - pytestCheckHook, -}: - -buildPythonPackage { - pname = "pizzapi"; - version = "0.0.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ggrammar"; - repo = "pizzapi"; - rev = "2a67ceb0f6df285988f1a2d7b678bbd2526c26a4"; - hash = "sha256-oBwNNsnRhm/kv8DxNrAKkeGv2RZA+RMdYRgByy3qmsU="; - }; - - postPatch = '' - # Remove pytest-runner from setup_requires - substituteInPlace setup.py \ - --replace-fail 'setup_requires=["pytest-runner"],' 'setup_requires=[],' - ''; - - build-system = [ setuptools ]; - - dependencies = [ - requests - xmltodict - pyhamcrest - ]; - - nativeCheckInputs = [ - mock - pytestCheckHook - ]; - - pythonImportsCheck = [ "pizzapi" ]; - - meta = { - description = "Python wrapper for the Dominos Pizza API"; - homepage = "https://github.com/ggrammar/pizzapi"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.jamiemagee ]; - }; -} diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 10f113d5c3f5..716159f034f0 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { homepage = "https://github.com/plaid/plaid-python"; changelog = "https://github.com/plaid/plaid-python/blob/master/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index c232bf96b9e2..cc80d4947502 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - auditwheel, buildPythonPackage, gitMinimal, greenlet, @@ -67,8 +66,7 @@ buildPythonPackage rec { gitMinimal setuptools-scm setuptools - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; + ]; pythonRelaxDeps = [ "greenlet" diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix index 1be5ee668e52..9ddc610b5c01 100644 --- a/pkgs/development/python-modules/prometheus-api-client/default.nix +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "prometheus-api-client"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "4n4nd"; repo = "prometheus-api-client-python"; tag = "v${version}"; - hash = "sha256-Xi3n1Ha6bpfp4KfCh/Zky7bBrXOojuR6BVzPNQ3a18Y="; + hash = "sha256-dpvGvI37jMoWvMrVSCwiyendGCDLCw+s2TI04y8akx8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/pkgs/development/python-modules/protobuf3-to-dict/default.nix index e613c1d23eb2..91fec62cc63b 100644 --- a/pkgs/development/python-modules/protobuf3-to-dict/default.nix +++ b/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -29,6 +29,5 @@ buildPythonPackage rec { description = "Teeny Python library for creating Python dicts from protocol buffers and the reverse"; homepage = "https://github.com/kaporzhu/protobuf-to-dict"; license = licenses.publicDomain; - maintainers = with maintainers; [ nequissimus ]; }; } diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 62edb09424ee..d55b72a66ac8 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.10.13"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = "psd-tools"; tag = "v${version}"; - hash = "sha256-hGalK3iGIp0LaH97E3UTuog8zyJ83zgoqn5NC0krdP8="; + hash = "sha256-L38WgBYH5TI/BcSS0i6dMC7729AKOFMj39NAgcVaZlw="; }; build-system = [ diff --git a/pkgs/development/python-modules/psnawp/default.nix b/pkgs/development/python-modules/psnawp/default.nix index a152dc689f47..d40c39ee4cc2 100644 --- a/pkgs/development/python-modules/psnawp/default.nix +++ b/pkgs/development/python-modules/psnawp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "psnawp"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitea { @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "YoshikageKira"; repo = "psnawp"; tag = "v${version}"; - hash = "sha256-JS8VGwIsCr21rwjXCRUXsoVHfFyLTZtgp+ZJcXWCCsQ="; + hash = "sha256-qENKZC5U4jedl2RvmIGk52r0Vd/oMLEcp6DERYLctAs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 970efebe3b61..74885759680a 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,14 +35,14 @@ let pname = "psycopg"; - version = "3.3.0"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "psycopg"; repo = "psycopg"; tag = version; - hash = "sha256-X4gpknLotZ1RmWaTdY6I7w+unSJMc56UI1Ddi7edGSg="; + hash = "sha256-ynzXQkTnCCkJK3EZrGHSpzgMeeX92U6+08m8QtNfAc4="; }; patches = [ diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 2d6a19ca74ef..a15354b1dd11 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.30"; + version = "3.0.32"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UaB/m46/hDWlqusigxzKSlLocCl3GiY33ydjx509h3Y="; + hash = "sha256-EWUXeCNt6VxYK0JzcpTlCma6SiH6AcAJDqcIFa9Hj+A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 87352a9e63ea..7c6f14d508d8 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20251128"; + version = "1.0.2.20251209"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JXOynB/jza+ELY1q2XEoLawZgyEt360GF98GRUMn3Do="; + hash = "sha256-37hj0A37m8BxNAWWIpRoromnXWJUbqvOOOu9iw01DKk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index bdf193994ff6..bb4d41087b6f 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -11,23 +11,20 @@ pytest-asyncio, pytest-vcr, pytestCheckHook, - pythonOlder, requests, setuptools, }: buildPythonPackage rec { pname = "pubnub"; - version = "10.4.1"; + version = "10.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pubnub"; repo = "python"; tag = version; - hash = "sha256-NI7rEudQ5sSj6cpPpFxEcqaeiQL6dJKK7C53BTJeMAg="; + hash = "sha256-4EqP3HZuSXYB5P6xvPuwTou/2zHS0ClaAy42knbCMhc="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index b993346b8860..bf30bc910e55 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2025.1.2"; + version = "2025.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Wd/8WjVaNM1IzrzjO/ChZ9aOpoEP/EwWHcOKcD1HnYY="; + hash = "sha256-dAacEMmdINNsKQb+hV4A1QtmAgE8SIHbN0FuMnh66gY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 51cdabd8e0d6..97b6561f8e88 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/cdgriffith/puremagic"; changelog = "https://github.com/cdgriffith/puremagic/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix index f4d72af682c7..5595a19f22ec 100644 --- a/pkgs/development/python-modules/py-machineid/default.nix +++ b/pkgs/development/python-modules/py-machineid/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "py-machineid"; - version = "0.8.1"; + version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-5QQWIhI1yHR1nhnLZOhJne8Sr8K9/9N3v9aPR395ncg="; + pname = "py_machineid"; + inherit version; + hash = "sha256-ipAqAProxtZDP0Y2l8IdxM6YxuVaLgU1wCczGaywBHo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 40c0544273ce..bf77116740a6 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.62"; + version = "3.63"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8+1uj6ZL0BBxVUkiZf29bmN4adAbFmFHYbqkJvm9Y4I="; + hash = "sha256-k9zkbkgw+rD/0JxQyxT5xdEgdDmY/y7zCw6wGo+2Xhg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyairobotrest/default.nix b/pkgs/development/python-modules/pyairobotrest/default.nix new file mode 100644 index 000000000000..d1bfd5b47cd7 --- /dev/null +++ b/pkgs/development/python-modules/pyairobotrest/default.nix @@ -0,0 +1,43 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyairobotrest"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mettolen"; + repo = "pyairobotrest"; + tag = "v${version}"; + hash = "sha256-MqZV8+uwKLIbh0A/lYMB/9iPDl/8a4IAoYMdoxiIJqY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + ]; + + pythonImportsCheck = [ "pyairobotrest" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/mettolen/pyairobotrest/blob/${src.tag}/CHANGELOG.md"; + description = "Python library for controlling Airobot TE1 thermostats via local REST API"; + homepage = "https://github.com/mettolen/pyairobotrest"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index ebe911982a8c..23eee3a7e13e 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.13.3"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; tag = "v${version}"; - hash = "sha256-GtM4jUtGZ49NlfZZ8Ji6fErtuFBlnOKXvN8OIshUOBM="; + hash = "sha256-3KZCfJkXofxMcqAOa6IInCbQIGZSJ/1+L9cM/GCCGog="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pyanglianwater/default.nix b/pkgs/development/python-modules/pyanglianwater/default.nix new file mode 100644 index 000000000000..4ea302be6037 --- /dev/null +++ b/pkgs/development/python-modules/pyanglianwater/default.nix @@ -0,0 +1,50 @@ +{ + aiohttp, + buildPythonPackage, + cryptography, + fetchFromGitHub, + lib, + pyjwt, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyanglianwater"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pantherale0"; + repo = "pyanglianwater"; + tag = version; + hash = "sha256-GfFRqQb1RXh6a7giy7eJWp4nAJzDtpQkWFfEfe9jxfY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + cryptography + pyjwt + ]; + + pythonImportsCheck = [ "pyanglianwater" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # tests are out of date + doCheck = false; + + meta = { + changelog = "https://github.com/pantherale0/pyanglianwater/releases/tag/${src.tag}"; + description = "Python API to interact with Anglian Water"; + homepage = "https://github.com/pantherale0/pyanglianwater"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 50cef0f46620..8aa8e2c37bf2 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -155,9 +155,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "lock_api" @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.43" +version = "0.12.44" dependencies = [ "pyo3", "serde_json", @@ -250,9 +250,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf" +checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" dependencies = [ "indoc", "libc", @@ -267,18 +267,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb" +checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" dependencies = [ "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be" +checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" dependencies = [ "libc", "pyo3-build-config", @@ -286,9 +286,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71" +checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -298,9 +298,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b" +checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" dependencies = [ "heck", "proc-macro2", @@ -311,9 +311,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -405,9 +405,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.109" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -460,9 +460,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] @@ -511,9 +511,9 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "yrs" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f904a99678a852d7cbc6958c94087f739c10cfb19642635951219c525a5fdb89" +checksum = "f6893d39bc55d014e4a1d0e71d06c0c41590d5cdeac35c126be44998bc320cff" dependencies = [ "arc-swap", "async-lock", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index dc805a7304f8..34c0484ee440 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.43"; + version = "0.12.44"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = version; - hash = "sha256-yMl+bLnREvuyVhMvR0TM+IKTPpJlgBCgE4M4NJp9k/M="; + hash = "sha256-7kfLi0am/rE4QwLdLCGDjfMhAjrKBPNH+3yPRoYxTtA="; }; postPatch = '' @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "CRDTs based on Yrs"; homepage = "https://github.com/jupyter-server/pycrdt"; - changelog = "https://github.com/jupyter-server/pycrdt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-server/pycrdt/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.jupyter ]; }; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index a31c54f1758f..aaa931c0a9f9 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Simple cron-like parser for Python, which determines if current datetime matches conditions"; license = licenses.mit; homepage = "https://github.com/kipe/pycron"; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 5eb9b9fed943..a04a1da50dbc 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.18"; + version = "0.1.19"; pyproject = true; disabled = pythonOlder "3.13"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "pydevccu"; tag = version; - hash = "sha256-+IUPj27+eU2e215LkF+Qqv5vtRqASPP7dEBTvfT/KEo="; + hash = "sha256-VWnujpPzlGcHGosqjtBLATR2+SFKRjXPqQMY3R5tRlc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 8ddb9716849f..97970c7bc923 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -4,22 +4,19 @@ fetchFromGitHub, hatch-vcs, hatchling, - pythonOlder, requests, }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "gagebenne"; repo = "pydexcom"; tag = version; - hash = "sha256-cf3AhqaA5aij2NCeFqruoeE0ovJSgZgEnVHcE3iXJ1s="; + hash = "sha256-IqSZZHe5epcgO2uoIsGkNaac3+UplHzqEcFWTzwAqPg="; }; build-system = [ @@ -37,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API to interact with Dexcom Share service"; homepage = "https://github.com/gagebenne/pydexcom"; - changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}"; + changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 90345deeecf2..0dcc9fdd17f6 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mGhMMXbiSCIXFfcMQuBdOFavqe025bStHnAy3q5gbBg="; + hash = "sha256-62uayIMtvFWX0SYHT0jz18wsIiRp/R7D6DNhOsCbT3s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfirefly/default.nix b/pkgs/development/python-modules/pyfirefly/default.nix index 241af69a8e9b..d88ffc487328 100644 --- a/pkgs/development/python-modules/pyfirefly/default.nix +++ b/pkgs/development/python-modules/pyfirefly/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyfirefly"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyfirefly"; tag = "v${version}"; - hash = "sha256-b4np7JlDCbrrMo6TGE5yL6Xg41ocGoJQY8BMH/hZ9Ls="; + hash = "sha256-VPtXk4sObN5mvZTtmXW+myQ4+Slb285zHMotRkLyhJM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix deleted file mode 100644 index 8f657c52db51..000000000000 --- a/pkgs/development/python-modules/pyflick/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - aiohttp, - buildPythonPackage, - fetchFromGitHub, - json-api-doc, - python-dateutil, - setuptools-scm, - setuptools, -}: - -buildPythonPackage rec { - pname = "pyflick"; - version = "1.1.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ZephireNZ"; - repo = "PyFlick"; - tag = "v${version}"; - hash = "sha256-JROtklRimr6I1/6+yYaDL6rNGSj7O15nI/C9ZSj6eFo="; - }; - - pythonRelaxDeps = [ "aiohttp" ]; - - build-system = [ - setuptools - setuptools-scm - ]; - - dependencies = [ - aiohttp - json-api-doc - python-dateutil - ]; - - # no tests implemented - doCheck = false; - - pythonImportsCheck = [ - "pyflick" - "pyflick.authentication" - ]; - - meta = { - description = "Python API For Flick Electric in New Zealand"; - homepage = "https://github.com/ZephireNZ/PyFlick"; - changelog = "https://github.com/ZephireNZ/PyFlick/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index 273a79e04a9a..10c083d0e91b 100644 --- a/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygame-sdl2"; - version = "8.4.0.25071206"; + version = "8.5.0.25111603"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index d8953c00f499..bada4ba61ad5 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.7"; + version = "1.6.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-UtFTvWt/VX5bKZgAsnM+fzcG5ovh8TR6EKIn58Ohu7g="; + hash = "sha256-qkiPYbjL5iNeyxb1hC9hBoz8wB+uTMhp9NaWwlqijnk="; }; build-system = [ diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 98fee72f709f..90202f90d407 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.18.2"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7Kh+BmLJZXFbfxNJHV6FjfLAkINB3um94rwDJo5GD1U="; + hash = "sha256-yl2285WnQWagGdd3iV+WvLIR7mDOC+QTKxOWA+AGbYM="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 8cd0c81b9280..f94dfe9ebdfb 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { - version = "2.1.9"; + version = "2.1.11"; pname = "pyglet"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyglet"; repo = "pyglet"; tag = "v${version}"; - hash = "sha256-hdLqtSvtsj6dcpTxFAs2UO27gkUAlsdjsi624ucpGU8="; + hash = "sha256-aGMEjC7Huykdwx4JW9Uoo8a7diJ85iaXM9XCbbyQXk8="; }; # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index 08527f43efc6..6a500c1c14a7 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.13.0"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pygobject-stubs"; tag = "v${version}"; - hash = "sha256-d7caFIjRRFEZYyCDUcilJ7iquUdltZ0ZQupxQ6ITUEc="; + hash = "sha256-pConIc8FBq2a7yrfRHa07p2e/Axgrv4p+W0nq1WzERw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index a161f54482e0..446c4b7d86c7 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2025.9"; + version = "2025.10"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-VulyvarU6a92ftR9EyNi0WIRImDL5IjJ2n/uAfIopaY="; + hash = "sha256-oac35cDczxz28Zol4u/RCbn+yd3WJfl/VT2sFu6ISIE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index a4ba9dad56cb..2e0beff8327d 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -3,6 +3,7 @@ aiohttp, aioresponses, bleak, + bleak-retry-connector, buildPythonPackage, cryptography, fetchFromGitHub, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.1.3"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-+GNuo6i8Jc01vxiFuhTXrER1xstPVe8LucfGtyfnkQQ="; + hash = "sha256-ayu2Cx6lSgiYdg9XszdA3v3pWeKkgAiA7LHOB0KlS5I="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { dependencies = [ aiohttp bleak + bleak-retry-connector cryptography mashumaro ]; diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 9e1b3c0194a9..86756a86747a 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -45,14 +45,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.16.1"; + version = "10.17.2"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; tag = version; - hash = "sha256-My1sTzWXInXb4TJ3uB7IXRyUrlbJMxrWyzzge8O0ZmQ="; + hash = "sha256-eE7DgMdUqSzjeDU7hZ7FCZC8Oyj2YpPtjAQbaLPKOhk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix index 03144e04bb96..ad5db8569dc1 100644 --- a/pkgs/development/python-modules/pymiele/default.nix +++ b/pkgs/development/python-modules/pymiele/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymiele"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.13"; src = fetchPypi { inherit pname version; - hash = "sha256-X2nATBOOq+N4ptF2NCNbZLi2KweoMzw0ixwP5mXm9SI="; + hash = "sha256-IqKJhuAT8UYStqy+2NQ9u4ezHBPum6vNnN42+hq7kZc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 5af5495f66ba..de9d78259d89 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -4,6 +4,7 @@ click, coloredlogs, construct, + construct-typing, cryptography, daemonize, developer-disk-image, @@ -47,14 +48,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "6.1.5"; + version = "6.1.6"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-OxzDamPid+djzAKjwk6iD1kT8rLWl+k23/XtKWjTKIw="; + hash = "sha256-RolQCmccQ+i9R5xGw5ah4GIMSVVcEEvRuvXERXejy5Y="; }; build-system = [ @@ -67,6 +68,7 @@ buildPythonPackage rec { click coloredlogs construct + construct-typing cryptography daemonize developer-disk-image diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index e6214b6a9023..f49acec8ad98 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -49,7 +49,6 @@ buildPythonPackage { license = licenses.gpl3Only; maintainers = with maintainers; [ thelegy - tjni ]; }; } diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix index 968a60515fc4..e07a01289f74 100644 --- a/pkgs/development/python-modules/pyobjc-core/default.nix +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -23,7 +23,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; buildInputs = [ - darwin.DarwinTools darwin.libffi ]; @@ -39,11 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "objc" ]; - meta = with lib; { + meta = { description = "Python <-> Objective-C bridge"; - homepage = "https://github.com/ronaldoussoren/pyobjc"; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ samuela ]; + homepage = "https://github.com/ronaldoussoren/pyobjc/tree/main/pyobjc-core"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix index a395f1069420..f6af5aca2f54 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -9,15 +9,11 @@ buildPythonPackage rec { pname = "pyobjc-framework-Cocoa"; - version = "11.1"; pyproject = true; - src = fetchFromGitHub { - owner = "ronaldoussoren"; - repo = "pyobjc"; - tag = "v${version}"; - hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; - }; + inherit (pyobjc-core) version src; + + patches = pyobjc-core.patches or [ ]; sourceRoot = "${src.name}/pyobjc-framework-Cocoa"; @@ -56,11 +52,11 @@ buildPythonPackage rec { "PyObjCTools" ]; - meta = with lib; { + meta = { description = "PyObjC wrappers for the Cocoa frameworks on macOS"; - homepage = "https://github.com/ronaldoussoren/pyobjc"; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ samuela ]; + homepage = "https://github.com/ronaldoussoren/pyobjc/tree/main/pyobjc-framework-Cocoa"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/pyobjc-framework-CoreBluetooth/default.nix b/pkgs/development/python-modules/pyobjc-framework-CoreBluetooth/default.nix new file mode 100644 index 000000000000..ac702d1d3160 --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-framework-CoreBluetooth/default.nix @@ -0,0 +1,66 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + pyobjc-core, + pyobjc-framework-Cocoa, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyobjc-framework-CoreBluetooth"; + pyproject = true; + + inherit (pyobjc-core) version src; + + patches = pyobjc-core.patches or [ ]; + + sourceRoot = "${src.name}/pyobjc-framework-CoreBluetooth"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.libffi + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + substituteInPlace pyobjc_setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" \ + --replace-fail "/usr/bin/" "" + ''; + + dependencies = [ + pyobjc-core + pyobjc-framework-Cocoa + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev darwin.libffi}/include" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ + "CoreBluetooth" + ]; + + meta = { + description = "PyObjC wrappers for the CoreBluetooth framework on macOS"; + homepage = "https://github.com/ronaldoussoren/pyobjc/tree/main/pyobjc-framework-CoreBluetooth"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pyobjc-framework-libdispatch/default.nix b/pkgs/development/python-modules/pyobjc-framework-libdispatch/default.nix new file mode 100644 index 000000000000..40035e9d8dfe --- /dev/null +++ b/pkgs/development/python-modules/pyobjc-framework-libdispatch/default.nix @@ -0,0 +1,67 @@ +{ + buildPythonPackage, + darwin, + fetchFromGitHub, + lib, + pyobjc-core, + pyobjc-framework-Cocoa, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyobjc-framework-libdispatch"; + pyproject = true; + + inherit (pyobjc-core) version src; + + patches = pyobjc-core.patches or [ ]; + + sourceRoot = "${src.name}/pyobjc-framework-libdispatch"; + + build-system = [ setuptools ]; + + buildInputs = [ + darwin.libffi + ]; + + nativeBuildInputs = [ + darwin.DarwinTools # sw_vers + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we + # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. + postPatch = '' + substituteInPlace pyobjc_setup.py \ + --replace-fail "-buildversion" "-buildVersion" \ + --replace-fail "-productversion" "-productVersion" \ + --replace-fail "/usr/bin/" "" + ''; + + dependencies = [ + pyobjc-core + pyobjc-framework-Cocoa + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${darwin.libffi.dev}/include" + "-Wno-error=unused-command-line-argument" + ]; + + pythonImportsCheck = [ + "dispatch" + "libdispatch" + ]; + + meta = { + description = "PyObjC wrappers for the libdispatch framework on macOS"; + homepage = "https://github.com/ronaldoussoren/pyobjc/tree/main/pyobjc-framework-libdispatch"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 469c667942cb..a02778e42f56 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.9.4"; + version = "6.9.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; tag = version; - hash = "sha256-iH6vxxA/CdPCXqiw3BUmhUwhS2hfwaJy5jIic4id0Jw="; + hash = "sha256-DHA/OukSK1p65imJEZg7hbErJGL7aQiDbW4vUUuSEko="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix index 2f5255d364c5..ba225efb1611 100644 --- a/pkgs/development/python-modules/pyopen-wakeword/default.nix +++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyopen-wakeword"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pyopen-wakeword"; tag = "v${version}"; - hash = "sha256-LJ0pHP4nsTx3GPuWUwOwNuXR9tUKABqSHnLSvMlfm1Y="; + hash = "sha256-czFDuIZ10aetr6frkKSozPjS7zMeNJ5/WVLA7Ib1CaI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 8536939ad536..27f54ed1a2a7 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.13"; + version = "1.16.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "JessicaTegner"; repo = "pypandoc"; tag = "v${version}"; - hash = "sha256-9fpits8O/50maM/e1lVVqBoTwUmcI+/IAYhVX1Pt6ZE="; + hash = "sha256-h0Ur5kWyKz1NCEMdnE0eNCYMAEqjx3g/tnfXs1h9zCs="; }; patches = [ diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 1d25461eddc6..6c8d93e0c2b8 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { description = "Python interface for libparted"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lsix ]; }; } diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 61974b945f77..d39fbf604abf 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.8.12"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; tag = version; - hash = "sha256-XXlHgr8/Cl3eu1vIDl/XykB2gv8PPkPIFEBG30yUue0="; + hash = "sha256-mtlA4UT8bYZa6hFbO/AHRFfHQ+6SpMN97cfc3q4dDJ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index b71a9397020e..699079c67bd1 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "6.3.0"; + version = "6.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-0cch0Je5se1FeHSXH78WhDpNiJQ3Qt0wqxRnv9lr8Qo="; + hash = "sha256-QCMOB0qnxVPo8fGcf+TsEcBYYINXVbDCowrLUqNjojw="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index a3d20498dd38..77df3c0bdf02 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyportainer"; - version = "1.0.14"; + version = "1.0.15"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${version}"; - hash = "sha256-5ARTHT5NmRBMOMVRPWAICdScAGUbkebtLyJqUW195Mw="; + hash = "sha256-Lp2bX5+lsfSPEuc0q+tD8tBrMdKq7GZC+tG0cuieNOQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index a991be205b01..1f552b3e7e34 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -75,6 +75,9 @@ buildPythonPackage rec { "test_sync__source_id__list" "test_sync_download" "test_transformer_group__download_grids" + # https://github.com/pyproj4/pyproj/issues/1553 + "test_datum_horizontal" + "test_sub_crs" ]; pythonImportsCheck = [ @@ -100,7 +103,6 @@ buildPythonPackage rec { changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; license = licenses.mit; maintainers = with maintainers; [ - lsix dotlambda ]; teams = [ teams.geospatial ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index f69ff5edafd0..36dbe9065b92 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -203,6 +203,5 @@ buildPythonPackage rec { homepage = "https://riverbankcomputing.com/"; license = licenses.gpl3Only; inherit (mesa.meta) platforms; - maintainers = with maintainers; [ sander ]; }; } diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix index a9e1a0644adf..abb3f7e84387 100644 --- a/pkgs/development/python-modules/pyqt/sip.nix +++ b/pkgs/development/python-modules/pyqt/sip.nix @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = "https://github.com/Python-SIP/sip"; license = licenses.gpl3Only; inherit (mesa.meta) platforms; - maintainers = with maintainers; [ sander ]; }; } diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 33ac5586b71a..a17339abd7cd 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -9,14 +9,14 @@ buildPythonPackage { pname = "pyrad"; - version = "2.4-unstable-2024-07-24"; + version = "2.4-unstable-2025-12-02"; pyproject = true; src = fetchFromGitHub { owner = "pyradius"; repo = "pyrad"; - rev = "f42a57cb0e80de42949810057d36df7c4a6b5146"; - hash = "sha256-5SPVeBL1oMZ/XXgKch2Hbk6BRU24HlVl4oXZ2agF1h8="; + rev = "56649fc522faeb4bc105ac6d0f95b080e97c89aa"; + hash = "sha256-F+6ejSvIJDcLLb1o3m6r1es/PObB8H6eeSkAETJaftc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 552548c0840c..a0f7dec14e75 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -41,7 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/PySlurm/pyslurm"; description = "Python bindings to Slurm"; license = licenses.gpl2; - maintainers = with maintainers; [ bhipple ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 5a9a711f2815..82109715550a 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pysolr"; - version = "3.10.0"; + version = "3.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EntKLdFpI0rLFYZkOmzR4+lLkXkh5pv1adeyoqoO9Ak="; + sha256 = "sha256-u9DnRng1MWiA+ZS1U4bJvDwUZzPBfYWj/tMXdVl2xAo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pysrdaligateway/default.nix b/pkgs/development/python-modules/pysrdaligateway/default.nix index 202d1e3bc4e7..618ab5a25b64 100644 --- a/pkgs/development/python-modules/pysrdaligateway/default.nix +++ b/pkgs/development/python-modules/pysrdaligateway/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysrdaligateway"; - version = "0.17.2"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "maginawin"; repo = "PySrDaliGateway"; tag = "v${version}"; - hash = "sha256-wqZ1lb0W5tTBiMxe5Yt9+tCMOH15QP8LDB2OlJRHtng="; + hash = "sha256-m4gkhDYrw+58FN80zTKjSPK/3Wsl7rZ+Xlo/iWNZTWw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index fbbd3e713495..6f0474933008 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,39 +1,37 @@ { lib, + aiohttp, bleak, bleak-retry-connector, - boto3, buildPythonPackage, cryptography, fetchFromGitHub, pyopenssl, pytest-asyncio, pytestCheckHook, - requests, setuptools, }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.72.1"; + version = "0.74.0"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-QwCeq9EnE7oKqTtb6lmMcEw37dOK7WYbDEC984NujzY="; + hash = "sha256-3n6ErE17W5Gsf/Isw4o45JcDihYUHendx8MLgh8gALk="; }; build-system = [ setuptools ]; dependencies = [ + aiohttp bleak bleak-retry-connector - boto3 cryptography pyopenssl - requests ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index e64cbe2a1775..488a92af40f2 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytaglib"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "supermihi"; repo = "pytaglib"; tag = "v${version}"; - hash = "sha256-K9K30NFBcmxlYDQQ4YUhGzaPNVmLt0/L0JDrCtyKwLA="; + hash = "sha256-A+RH9mWwtvhBDqTfvOK1RbsPP+0srF9h4mIknAHbG50="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index a3007ee9916b..1d12c30aec00 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.11.2"; + version = "25.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-dczOdHbR3+gihR4vCz4EvxaP4RreDoPh2dZScIDN4ks="; + hash = "sha256-2mrz+DADelydnwNf3ytGa3igSTlybQdZ7kdlWfoG8Io="; }; postPatch = '' @@ -98,7 +98,6 @@ buildPythonPackage rec { changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ - tjni robsliwi ]; }; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 1bfeb0b6fbac..2e0e09028700 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; src = fetchPypi { pname = "pytest_check"; inherit version; - hash = "sha256-m+TFmgmCcSkQkUjIXXtZZLV/ClztG2GUWcow5vRjykI="; + hash = "sha256-XiEoQFsUl4rXTyHzIl/MUruxzHxBpV1eqtnx480n5C4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-scim2-server/default.nix b/pkgs/development/python-modules/pytest-scim2-server/default.nix index 3c6059c5541c..08a45f80ab2f 100644 --- a/pkgs/development/python-modules/pytest-scim2-server/default.nix +++ b/pkgs/development/python-modules/pytest-scim2-server/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-scim2-server"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_scim2_server"; inherit version; - hash = "sha256-5jsjVtxiSF3cu9useDEmwQ45PqJAZmfw7OUIZkCi6gQ="; + hash = "sha256-Diu8TPPELQG30NZvafI/t7IR+HzkI0sPsjcUFxwVPLw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix index d0960e9ac565..d8bcb245826e 100644 --- a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix +++ b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-shared-session-scope"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "StefanBRas"; repo = "pytest-shared-session-scope"; tag = "v${version}"; - hash = "sha256-HB8RuF/+BmW3KBZ7C8EpUMuBntvcjSsrkLUiBvPwcf8="; + hash = "sha256-IPTktwOJhzoC7/gPgMVwbLCkRuhbPf90m23yznqHha4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 22fb80c227a4..4e2fafe3816e 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -4,29 +4,26 @@ coverage, fetchFromGitHub, pytest, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.1.4"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "2.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "tarpas"; repo = "pytest-testmon"; tag = "v${version}"; - hash = "sha256-T/dvNUg1O6bIGgix8YS52zgt1wT8Fol6CscqcS8MjcA="; + hash = "sha256-BVQ7rEusbW0G1C6cUeHH7fZWndSErcBQfGNdw0/4eTg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage ]; + dependencies = [ coverage ]; # The project does not include tests since version 1.3.0 doCheck = false; @@ -36,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; - changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/v${version}"; + changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dmvianna ]; }; diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index e0506219976d..3c164999bed4 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -109,7 +109,6 @@ let maintainers = with maintainers; [ lovek323 madjar - lsix ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 10b0c5f523b7..e163bc58c9a2 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.6"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "MeirKriheli"; repo = "python-bidi"; tag = "v${version}"; - hash = "sha256-8erpcrjAp/1ugPe6cOvjH2CVfy2/hO6xg+cfWWUbj0w="; + hash = "sha256-8LNoQwUOa2pKEviBq24IHihUfhyMoA/IV+sBuFUhHdc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Oqtva9cTHAcuOXr/uPbqZczDbPVr0zeIEr5p6PoJ610="; + hash = "sha256-27DtYoxd0bPS4A/7HBmuLYCZrG5yu0Tp8jXIBPSrAdc="; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 5f7c7d37e4c0..35790013e98c 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -85,6 +85,5 @@ buildPythonPackage rec { description = "Binance Exchange API python implementation for automated trading"; homepage = "https://github.com/sammchardy/python-binance"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/python-google-weather-api/default.nix b/pkgs/development/python-modules/python-google-weather-api/default.nix new file mode 100644 index 000000000000..0eccbed7cb73 --- /dev/null +++ b/pkgs/development/python-modules/python-google-weather-api/default.nix @@ -0,0 +1,43 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + mashumaro, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "python-google-weather-api"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tronikos"; + repo = "python-google-weather-api"; + tag = "v${version}"; + hash = "sha256-5ljKaIwG78oufb0iRaqTY46wxelAiuQUvhmRbZWo5Fk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + mashumaro + ]; + + pythonImportsCheck = [ "google_weather_api" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/tronikos/python-google-weather-api/releases/tag/${src.tag}"; + description = "Python client library for the Google Weather API"; + homepage = "https://github.com/tronikos/python-google-weather-api"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 637e3d58cd88..06b1493032c8 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.13.2"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-server"; tag = "v${version}"; - hash = "sha256-uW4q/uwEkKASZBPQ994s5+t5Urg7/nZIaIv4hqyIffM="; + hash = "sha256-Yq5dYaX+/hLvmPpHI8rhCcSlabQBPAyUrIQRgnoi17c="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix index 44a44306ee8e..e5f6e4c90735 100644 --- a/pkgs/development/python-modules/python-pidfile/default.nix +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python context manager for managing pid files"; homepage = "https://github.com/mosquito/python-pidfile"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ lom ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index e60e070c8614..646c56b23805 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "1.22"; + version = "1.23"; pname = "python-rapidjson"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; tag = "v${version}"; - hash = "sha256-q+qIuFD3TboevD88iaBQxwOoOdb6I+yyCsNXIqMcR3g="; + hash = "sha256-BlEmEvwGAm3Ix2YwJSwrxgqqANqmgiWRiRWP91JITio="; }; patches = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 9e30af22525c..62e8bed7bdc4 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "3.8.5"; + version = "3.10.10"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-5Xnf/NY9sA2u7bdcSPkVR6YFCS+35iTUACUAokAvcTA="; + hash = "sha256-FBm/Gt45VRquZ4Y/0upyNjcJ/XJiYnFFCtoIa0Qhz4U="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/python-xbox/default.nix b/pkgs/development/python-modules/python-xbox/default.nix new file mode 100644 index 000000000000..e056254e11ec --- /dev/null +++ b/pkgs/development/python-modules/python-xbox/default.nix @@ -0,0 +1,68 @@ +{ + buildPythonPackage, + ecdsa, + fetchFromGitHub, + freezegun, + hatch-regex-commit, + hatchling, + httpx, + lib, + ms-cv, + platformdirs, + pydantic, + pytest-asyncio, + pytestCheckHook, + respx, +}: + +buildPythonPackage rec { + pname = "python-xbox"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tr4nt0r"; + repo = "python-xbox"; + tag = "v${version}"; + hash = "sha256-YP8iK7uGycwKlWwAUmfk3qXI+c6cddg9nQ4NMQF7wDQ="; + }; + + build-system = [ + hatch-regex-commit + hatchling + ]; + + pythonRelaxDeps = [ + "pydantic" + ]; + + dependencies = [ + ecdsa + httpx + ms-cv + pydantic + ]; + + optional-dependencies = { + cli = [ + platformdirs + ]; + }; + + pythonImportsCheck = [ "pythonxbox" ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + respx + ]; + + meta = { + changelog = "https://github.com/tr4nt0r/python-xbox/releases/tag/${src.tag}"; + description = ":ibrary to authenticate with Xbox Network and use their API"; + homepage = "https://github.com/tr4nt0r/python-xbox"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index a2965bb082d9..c087eb95de61 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -4,24 +4,25 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, + setuptools, tokenize-rt, }: buildPythonPackage rec { pname = "pyupgrade"; - version = "3.21.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.21.2"; + pyproject = true; src = fetchFromGitHub { owner = "asottile"; repo = "pyupgrade"; rev = "v${version}"; - hash = "sha256-8nvA0uN+j9lkACcNohfthW9lKfI9GIxLEwtJ+3lCYV0="; + hash = "sha256-u4iudzPhVuAOS9cL3z6FCVpWKJZHg7UGpe9aHnN7Byc="; }; - propagatedBuildInputs = [ tokenize-rt ]; + build-system = [ setuptools ]; + + dependencies = [ tokenize-rt ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index f15dd2a49b3b..81d3cc5cb94c 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "3.2.2"; + version = "3.3.3"; pyproject = true; src = fetchFromGitHub { owner = "webdjoe"; repo = "pyvesync"; tag = version; - hash = "sha256-7QtyI5U1NRy0/iujfObdRHkwseetaD2M4f/buj8A9AY="; + hash = "sha256-T8cDp1C95gubCfgvkEiqHUn4Rw7pFNCPELo3qNwt9vI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index e222b552addb..aacd36f1e79f 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywebview"; - version = "6.0"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; tag = version; - hash = "sha256-EuDm3Ixw1z5xwpl4U15Xwg5mE3dXslTvv0N0XyjxrAg="; + hash = "sha256-vqdJRxZbHNu2Sq318RnJjzDjYRRCSiO72WM+flKwW7g="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index 0c22831e576b..107cbc8a8e89 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pywikibot"; - version = "10.7.1"; + version = "10.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-waO9rPadF5N65s0mOrIhr/OJW9Ax5f9uRUoUyRMWDIw="; + hash = "sha256-bFU3SWk06nA9OkPFfN5Zn+qTZFuqG/QiFKrlgkNknbg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index bedab2d63cff..830020beb023 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.21.21"; + version = "0.21.22"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-sdk-rust"; tag = "python/v${version}"; - hash = "sha256-xSIkMz+wZvYtgjyW/6Nr4vn6oJZ3X38GNdXJfYchI8A="; + hash = "sha256-uaoXSkc8yg+WZONgvRkOARaf9kvLKv6S+K5yMDuXbbA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-U13R/U6/ugC7m0X2gTpjfOjgzRzTIk95mcMu2GtcNLM="; + hash = "sha256-/SkYzQisSACTedC4FsEp4rXXdWV5f64gA33I/Ubu80E="; }; buildAndTestSubdir = "crates/python"; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 39b743f9659f..d0074f716990 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -85,7 +85,6 @@ pythonPackages.buildPythonPackage { meta = with lib; { description = "Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lsix ]; homepage = "https://www.riverbankcomputing.com/software/qscintilla/"; }; } diff --git a/pkgs/development/python-modules/questo/default.nix b/pkgs/development/python-modules/questo/default.nix index 3523e94d9223..8f0f536efbf4 100644 --- a/pkgs/development/python-modules/questo/default.nix +++ b/pkgs/development/python-modules/questo/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "questo"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "petereon"; repo = "questo"; rev = "v${version}"; - hash = "sha256-XCxSH2TSU4YdfyqfLpVSEeDeU1S24C+NezP1IL5qj/4="; + hash = "sha256-1T8HRgIW9P5iX1a75Bn9XqiVMCPtL7tdQTpixPbTbv0="; }; build-system = [ diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 7c0884f08dd5..217ef0030e2e 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, # builds @@ -28,23 +27,15 @@ buildPythonPackage rec { pname = "rdflib"; - version = "7.2.1"; + version = "7.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "RDFLib"; repo = "rdflib"; tag = version; - hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc="; + hash = "sha256-jZ5mbTz/ra/ZHAFyMmtqaM4RZw851gfTCBCRuPcGeYA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/RDFLib/rdflib/commit/0ab817f86b5733c9a3b4ede7ef065b8d79e53fc5.diff"; - hash = "sha256-+yWzQ3MyH0wihgiQRMMXV/FpG8WlXaIBhpsDF4e3rbY="; - }) - ]; build-system = [ poetry-core ]; @@ -92,10 +83,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "rdflib" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/RDFLib/rdflib/blob/${src.tag}/CHANGELOG.md"; description = "Python library for working with RDF"; homepage = "https://rdflib.readthedocs.io"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix index b4d0226588db..cc7b09373d0d 100644 --- a/pkgs/development/python-modules/recline/default.nix +++ b/pkgs/development/python-modules/recline/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "recline"; - version = "2025.6"; + version = "2025.12"; pyproject = true; src = fetchFromGitHub { owner = "NetApp"; repo = "recline"; tag = "v${version}"; - sha256 = "sha256-WBMt5jDPCBmTgVdYDN662uU2HVjB1U3GYJwn0P56WsI="; + sha256 = "sha256-xEH6fEq84nD3X6bPj1Yw36mjwHKlFKsVaMh4Iogzl18="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index dbefc1929ba4..3aa5f56cbf25 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -5,7 +5,6 @@ flask, logmatic-python, pytestCheckHook, - pythonOlder, pyyaml, requests, setuptools, @@ -14,16 +13,14 @@ buildPythonPackage rec { pname = "reconplogger"; - version = "4.18.0"; + version = "4.18.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "omni-us"; repo = "reconplogger"; tag = "v${version}"; - hash = "sha256-awUGDE9yuPhWMZ4osCJKw8v5V1leoFF3DeCbluHeN70="; + hash = "sha256-kYNidF1sTC6WulX3HXMUm+TFJWvHgZj86Asmi6uIKRs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 50da7338b7e7..e12f9a86cef5 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.1.9"; + version = "2.1.10"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "amazon-redshift-python-driver"; tag = "v${version}"; - hash = "sha256-x0VhICEtZZz4Q7btCl7nP0D+YHPIKqbEUWnrEekJpt0="; + hash = "sha256-k4Itd+x+1NbDsot2feunMKQVZA7ngAE4Bvy6+07gdaY="; }; # remove addops as they add test directory and coverage parameters to pytest diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index 1201883e23fc..39b2806fdeb4 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.58"; + version = "0.1.59"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-yQOqRJRKck+90KbMZr0XT5vjKWfar2CStyBKGrOpJy8="; + hash = "sha256-CEnpKYcQBKWpEe4yVaHfirnLuE2QdyyzN0mqNZ/cOLM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index 9e8a5554e3f0..da13693d6f8f 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "rembg"; - version = "2.0.67"; + version = "2.0.69"; pyproject = true; src = fetchFromGitHub { owner = "danielgatis"; repo = "rembg"; tag = "v${version}"; - hash = "sha256-QHx1qa1tErneLC1H6df6mTbKTWPh3BzJUqeE65D2c4E="; + hash = "sha256-9Ncs1DHPG3ouU5yFyeH0M2ZCQ9yHqJhVjkDO8fNSqIg="; }; build-system = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0c8fdd5830ff..ef30ac23095e 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.16.6"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-IrUu9bWBNWBM4EdzVnz76kjYMOyei+CoStVIzyqWOQw="; + hash = "sha256-tAanxijwWCKzxkMXsIGtbb7lLhGDog5k5MS8m9I6Hnc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix index 3a3531458eed..a7a284930a5f 100644 --- a/pkgs/development/python-modules/repeated-test/default.nix +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { homepage = "https://github.com/epsy/repeated_test"; changelog = "https://github.com/epsy/repeated_test/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 8f071f3f7908..86284af34989 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.12"; + version = "0.6.13"; pyproject = true; src = fetchFromGitHub { owner = "scikit-tda"; repo = "ripser.py"; tag = "v${version}"; - hash = "sha256-AviAcpaK0UWqa6spba9bLmBQnprINCrZC/wuRLqiXVA="; + hash = "sha256-m6EJrz0RBuKlzDX41Gm/W2k71YQK9CgfZN4o84cQYCs="; }; build-system = [ diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 910994134f0c..1395bb481aae 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rjsmin"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/8vgTg36w5zqj7vLQcOLLgcjXOIYi8oV6ZjaHTSKeGA="; + hash = "sha256-o/gECwJz3sdz4OgH6GpNCpU1UWwKCjWqG7bebhW7Hwk="; }; # The package does not ship tests, and the setup machinery confuses diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 804b71d318ef..54df2c7b400e 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "1.4.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xiWX16bnEhy7Ykn0nEXpXLJJ5rsZrr2rYmu6WE5XhaQ="; + hash = "sha256-WKlbYTIw7A5d4UCxeFgtQ1/dTecqQVzSheImnrb2Hmw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robot-descriptions/default.nix b/pkgs/development/python-modules/robot-descriptions/default.nix index c9ca5b5e2886..85d50a775e46 100644 --- a/pkgs/development/python-modules/robot-descriptions/default.nix +++ b/pkgs/development/python-modules/robot-descriptions/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "robot-descriptions"; - version = "1.21.0"; + version = "1.22.0"; pyproject = true; src = fetchFromGitHub { owner = "robot-descriptions"; repo = "robot_descriptions.py"; tag = "v${version}"; - hash = "sha256-/NH9OaqWVzQ3XSLEJTLlpfeCmF1Iw2ItfyOIO3LuPT4="; + hash = "sha256-4O2mAkO/2xc9cAq55DMdyCzdEwMzAo5uStJwS3rQdws="; }; build-system = [ diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 7fe4081fa446..2fbbab895ce1 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; tag = version; - hash = "sha256-+usTi2GCf3ewtX8BvetKjsV9hwULHtRrxqJU/shCqt4="; + hash = "sha256-N0IEPYN3H/KYZuTQZFTGZaDFZseGG1M6Kn5WX29afB8="; }; build-system = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index f4af7b1be9d4..2183e41fef23 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -9,6 +9,7 @@ # dependencies click, + croniter, redis, # tests @@ -21,20 +22,21 @@ buildPythonPackage rec { pname = "rq"; - version = "2.4.1"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "rq"; repo = "rq"; tag = "v${version}"; - hash = "sha256-CtxirZg6WNQpTMoXQRvB8i/KB3r58WlKh+wjBvyVMMs="; + hash = "sha256-4+zP3pOiZ+r/dt9F2NyxgJsyGPIHgj9XokuPxlWyS1g="; }; build-system = [ hatchling ]; dependencies = [ click + croniter redis ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index a0da340231b7..3cf9a73b8458 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2025.9.0"; + version = "2025.12.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; tag = version; - hash = "sha256-Wb9y2l6/J0EQQwB4AqasqvSVSURylkoh2D2wvw4NjlE="; + hash = "sha256-/r+2eXOXUcMQ7TxyrEofZ79S8n8sA3++pJxdH3eQrYw="; }; build-system = [ diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index 821a6c29438b..ed98bf75fe3f 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "8.2.6"; + version = "9.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE="; + hash = "sha256-i4xplGc85ZuJLvA6oRocHY3sw1UMt7S2bIkwMUDunEk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 1c305cde20b1..4efa2a22da24 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.69"; + version = "1.0.71"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-Pkd6x2B0LGKNbDHFSDk8be0VAb9eCyaR6VZcU5A3mCA="; + hash = "sha256-pPNDdfSpU//L2WoFQAoBiEZPSMKb5XuSmUQlYE9ZdzE="; }; build-system = [ diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix index 8da11f1551e4..4cb6d51a5fdf 100644 --- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix +++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sagemaker-mlflow"; - version = ".0.2.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6776c46246d9..74f942db1a2f 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -118,6 +118,5 @@ buildPythonPackage rec { homepage = "https://github.com/aws/sagemaker-python-sdk/"; changelog = "https://github.com/aws/sagemaker-python-sdk/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 8d565e97bd01..29b54fff729a 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "samplerate"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "tuxu"; repo = "python-samplerate"; tag = "v${version}"; - hash = "sha256-aSlnPwFNZRffDsLqhYD1Pd5JOwvv9GcWyseZmeyrvt0="; + hash = "sha256-7FAdIqsYCapmEAYiAuoS5m/jFExXZX3hn3kwxn9NWEc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index c9c0478a405d..7518db80c662 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.11"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; tag = "v${version}"; - hash = "sha256-AtFkcW7h2hMnQAeAk0fGsARXwpuaSb7ERBhdnAH4pCY="; + hash = "sha256-2AeFYFyK3jgJB/t4wMiHyKuKBD7CVLKl6cRSeICO+zQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix index bfbc31ad4f6d..2f88fad424b5 100644 --- a/pkgs/development/python-modules/semgrep/common.nix +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.143.0"; + version = "1.145.0"; - srcHash = "sha256-macw+LuC24sT1xM1F8ovuZlBmm2lYbRifaDbSIpfmkQ="; + srcHash = "sha256-yeTToWfCchGHGsSx/Ly3FQmj7K8iW66qItYs0MVtJvo="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "semgrep"; repo = "semgrep-interfaces"; - rev = "b13a50d6524bf4fc1ae395792188d5cd9396146d"; - hash = "sha256-amsLr8kpxs6xPIh2E0/ae8KDQEjK5WiG9Hvi8ajj+Bo="; + rev = "e5da9678488bc24e0d5c27a4de71ad67d375cc58"; + hash = "sha256-9ilDZQmKYD2JN+CQ8VVyNyrjKYXttF+3KspRPHhuPF8="; }; }; @@ -25,19 +25,19 @@ rec { core = { x86_64-linux = { platform = "musllinux_1_0_x86_64.manylinux2014_x86_64"; - hash = "sha256-M7Sn5vkk9a7xs+MbtfE+0iWHbKt8fDrDANTLkgf2kh4="; + hash = "sha256-W6qWqGiuqOJcBAvTIbTCj4aMLMiAhabJ22lldu3cAR4="; }; aarch64-linux = { platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; - hash = "sha256-zmWdOcLloisg2SNn9RHPmTe81ktMPeNF28S8dGmSXXE="; + hash = "sha256-WM2aq4PpYSNqB8PONJAqrYAzQNhIoK1MQvqoJri4S/Q="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-l2rtdXZmvnHLJeFBAckVDaN+APkrbKMARUbu1oYiorU="; + hash = "sha256-cpE+GBOZnWsNKRTFzpAQCl+JaqPl0bgLvW4GFdwnMQc="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-vMJH9P2ZfHQ0FapwhSSbk/l0v+s1bDooVpBM8ILlAv4="; + hash = "sha256-FAjHtlrGLOGxE7c0/Qd+SpX6NTIh09zDbVAbxQHCDKc="; }; }; diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index f6beeeca8c89..14af007c4045 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -2,30 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - setuptools, - tomli, - pytestCheckHook, gettext, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.14"; + version = "0.1.16"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "breezy-team"; repo = "setuptools-gettext"; tag = "v${version}"; - hash = "sha256-05xKWRxmoI8tnRENuiK3Z3WNMyjgXIX5p3vhzSUeytQ="; + hash = "sha256-N59Hx6CyOzAin8KcMTAD++HFLDdJnJbql/U3fO2F3DU="; }; build-system = [ setuptools ]; - dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ setuptools ]; pythonImportsCheck = [ "setuptools_gettext" ]; @@ -35,7 +31,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}"; + changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/${src.tag}"; description = "Setuptools plugin for building mo files"; homepage = "https://github.com/breezy-team/setuptools-gettext"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index f237e9e9934a..993ce0323722 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -76,6 +76,5 @@ buildPythonPackage rec { homepage = "https://github.com/dolfinus/setuptools-git-versioning"; changelog = "https://github.com/dolfinus/setuptools-git-versioning/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 0615feb911df..9793f67a4691 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -21,7 +21,6 @@ buildPythonPackage rec { meta = { homepage = "http://rainwoodman.github.io/sharedmem/"; description = "Easier parallel programming on shared memory computers"; - maintainers = with lib.maintainers; [ edwtjo ]; license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 6e73a265f521..94b53d0a06d4 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sharkiq"; - version = "1.4.3"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "JeffResc"; repo = "sharkiq"; tag = "v${version}"; - hash = "sha256-SZAOV9a3hy3RDIQVA0pzquNS1OxzAsTd1veo2fqjaNU="; + hash = "sha256-8BLPIvx4r5i0q5dPUdwB2KgPfGC6n14RFzWxJXpBD1Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 6c47f138c706..89ff2df9f467 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sievelib"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YOoANqVRTiYQ5b9WFYbzJOdf/ZGnIJ9fueBrj+KLBrs="; + hash = "sha256-bFemWvAc6WbJCxPlLxT7+acDd2egcbg4FHTMWrIxBPQ="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 8420f3a3a6f4..b54a0d035259 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -64,7 +64,6 @@ buildPythonPackage rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 - sander ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/siphashc/default.nix b/pkgs/development/python-modules/siphashc/default.nix index 186352a6a0f1..d77c27037058 100644 --- a/pkgs/development/python-modules/siphashc/default.nix +++ b/pkgs/development/python-modules/siphashc/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "siphashc"; - version = "2.6"; + version = "2.7"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { inherit pname version; - sha256 = "sha256-eBXoSfUx1hiAThgeq7fhTDnShrfVMFpnODk4dNbigoE="; + sha256 = "sha256-ppRNc3aM9So6g0LunBka2UBFWQAvck9E4Ot6sOC96jM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix index 6f91ebe4c79a..2500122c8ffb 100644 --- a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix +++ b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { description = "These builtin rules are available in Amazon SageMaker"; homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig"; license = licenses.asl20; - maintainers = with maintainers; [ nequissimus ]; }; } diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix index 9c6078c3a048..412b959234a3 100644 --- a/pkgs/development/python-modules/smtpdfix/default.nix +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "smtpdfix"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-5NGs6Q83EqGRJ+2IdOaXqGFIwfSNKy2wwHIJaOjj7JU="; + hash = "sha256-LqSbIv4ITJy5KlLlboNRx1PJhe7PcTx38IUW7F4uf9A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix index 2e3fbb24a62c..161f1bd4411e 100644 --- a/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; tag = "v${version}"; - hash = "sha256-oxeZkf5RpTgAd/PO8itElvQyBOQg1k4W//4M8Q0xbJg="; + hash = "sha256-mO/EPJ/CF3FM1tPnQOT9vit6WjV+jsWrTQ1MH2UUIIc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index d9ed8ea601d3..ad4b103fb8b3 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "spatialmath-python"; - version = "1.1.14"; + version = "1.1.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "spatialmath_python"; inherit version; - hash = "sha256-DI5+aSmAlOSbUSPPOrnMoSDBG+xp4zxURSGtZbsv5X4="; + hash = "sha256-yrcPLNN15hB4WMkB8TSNWU9QnV8sEh8EL9HNQrrXPd8="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinx-click/default.nix b/pkgs/development/python-modules/sphinx-click/default.nix index 2227807ce56d..ea1ab65ae52e 100644 --- a/pkgs/development/python-modules/sphinx-click/default.nix +++ b/pkgs/development/python-modules/sphinx-click/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-click"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; build-system = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_click"; - hash = "sha256-xwLgdRwaC2rWSeT3+uvQ3AmjzHyjtQ+Vlpg4N3L1Du8="; + hash = "sha256-/Hi0FUpOUVlGLjbeVbhkN0fabNqGs7Uqi7YiieYDd2w="; }; meta = { diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 0329aab01206..5113d3271b9d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.14.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-3XWs1SCb6AJpYC3njbBFXsSOebNjRh0Gp1Fqi5E51lI="; + hash = "sha256-/DAmVxbqFbEuYp0wpJXL/orw8GMDeDkLrXq2XAHTKOA="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix b/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix index 3cd42a0b9ebb..8c8679f3a17a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "sphinxcontrib-mermaid"; - version = "1.0.0"; + version = "1.2.3"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinxcontrib_mermaid"; - hash = "sha256-Loq2fT4eKBZmP5NH0Cao3uSoWKzdStMt0cgIiT24gUY="; + hash = "sha256-NYaZ0OySTvZ5tBhz2e3ZfQdzRG2vl2DHXhjcCt/ZE3E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spsdk-pyocd/default.nix b/pkgs/development/python-modules/spsdk-pyocd/default.nix index 1a034344701f..5bdea0a977e0 100644 --- a/pkgs/development/python-modules/spsdk-pyocd/default.nix +++ b/pkgs/development/python-modules/spsdk-pyocd/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "spsdk-pyocd"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; # Latest tag missing on GitHub src = fetchPypi { pname = "spsdk_pyocd"; inherit version; - hash = "sha256-Uu5QbvDd2U9evZiY2Gg4kSPRMGpFBXpxwYVgsa5M/SI="; + hash = "sha256-jvzXu6z9oo2oGoiDgCWWcU3yX/PuWm56MJzIcMWCgTM="; }; build-system = [ diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index 05718c482729..c6a81f6be253 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "stable-baselines3"; - version = "2.7.0"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "DLR-RM"; repo = "stable-baselines3"; tag = "v${version}"; - hash = "sha256-Ms2qoq1fokhUQ1/Wus786oYPT6C2lnHOZ+D7E7qUbjI="; + hash = "sha256-ucfdXyOYgevrKQ+RQbuoLjhGEvlzwH80yognMNbJlgQ="; }; postPatch = diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index d114ff802646..47111f1f0e8d 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "4.3.0"; + version = "4.4.2"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-MitvjIb+mBK22hxjtqbVB6kYP7pdvF5LxWiS2R/6Jk4="; + hash = "sha256-o3MrIPzu61Zod6RpmWA356hlquVPQKu7+aYZrqxjMjo="; }; build-system = [ @@ -34,6 +34,11 @@ buildPythonPackage rec { enabledTestPaths = [ "scripts/test_stringzilla.py" ]; + disabledTests = [ + # test downloads CaseFolding.txt from unicode.org + "test_utf8_case_fold_all_codepoints" + ]; + meta = { changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${src.tag}"; description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances"; diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix index 2af6a0787108..e949603b5379 100644 --- a/pkgs/development/python-modules/sudachidict/default.nix +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "WorksApplications"; repo = "SudachiDict"; tag = "v${version}"; - hash = "sha256-nunc0obZ+4GvzP1+GgyOommBpK6sCAOXxwq04PWKf8c="; + hash = "sha256-twmQWz8MWYBE2QtowiqPrmjudOgFfk7MjjujYG8ykcY="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix index a3f309080f49..166d15a7d928 100644 --- a/pkgs/development/python-modules/swcgeom/default.nix +++ b/pkgs/development/python-modules/swcgeom/default.nix @@ -26,7 +26,7 @@ }: let - version = "0.20.0"; + version = "0.21.2"; in buildPythonPackage rec { pname = "swcgeom"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "yzx9"; repo = "swcgeom"; tag = "v${version}"; - hash = "sha256-XMpDzjKwj9DQTT/LC0tcBcqO5yetP5JNQbTOGkHv9TM="; + hash = "sha256-A6N6i7GESMIhG81xXDsNXiM0yBXWGhcdELll79F3Evk="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index ef899db4737a..191d3a343cc0 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 rec { pname = "tencentcloud-sdk-python"; - version = "3.1.6"; + version = "3.1.7"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-ZBufZVFriwe1upgzu5Eg1cq0hkVvdWeCZ7HYNaVBFes="; + hash = "sha256-3+FZjR9qVz6BSHmyaXiMVmgzIclpipEr9u7kSQsEQ1A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/test-results-parser/default.nix b/pkgs/development/python-modules/test-results-parser/default.nix index f7c064af89af..9b280b501c3c 100644 --- a/pkgs/development/python-modules/test-results-parser/default.nix +++ b/pkgs/development/python-modules/test-results-parser/default.nix @@ -8,18 +8,18 @@ buildPythonPackage rec { pname = "test-results-parser"; - version = "0.5.4"; + version = "0.6.1"; pyproject = true; src = fetchPypi { inherit version; pname = "test_results_parser"; - hash = "sha256-L7/YCaLB90Y2AUaAm23zBpDJkkY9fUPnsf7THBp8FbQ="; + hash = "sha256-Xqktx66EvYnpw/w3UxfYXJgfnROcPMobCv4W2W405/Y="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-v82SRGqdcwyaRYpQhDETA/UZYSGD+FBZpysU7zfulrM="; + hash = "sha256-xnX9YwRHo5vFcF4HDj9K/hLV88ZB0UZdpx8RdA+EmrU="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index adb583789998..13d2672ae14a 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "textual"; - version = "6.7.1"; + version = "6.8.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-JFu30awU50geQI6JMF/3h9ij/fYwczWS22zp9LXtWDk="; + hash = "sha256-2SIh7HeWQAd6bHVGzbIRDxkiQy5g0FFq0PjY21NcQEI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index f46ecc016488..98f9a9c4433e 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.8.8"; + version = "0.8.9"; pyproject = true; src = fetchFromGitHub { owner = "EbbLabs"; repo = "python-tidal"; tag = "v${version}"; - hash = "sha256-+O+U8QZhaOdUgPONv1tb5ctiK8NmD2NJK0hokmNtUZM="; + hash = "sha256-ZYpG3cZielq5Kh3jANOrkUV1K6jwd9LzQfwTjqd4LLw="; }; build-system = [ diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix index 8099f646606c..67fc8cd042ad 100644 --- a/pkgs/development/python-modules/timecop/default.nix +++ b/pkgs/development/python-modules/timecop/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { description = "Port of the most excellent TimeCop Ruby Gem for Python"; homepage = "https://github.com/bluekelp/pytimecop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ zakame ]; }; } diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index af3444f39a1d..83e75a5e419d 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "timetagger"; - version = "25.06.1"; + version = "25.12.1"; pyproject = true; src = fetchFromGitHub { owner = "almarklein"; repo = "timetagger"; tag = "v${version}"; - hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0="; + hash = "sha256-XuYxle5U5Ui8ITsCgiJjwaRdfHwEa9cF0lAMoXwJamw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tiny-proxy/default.nix b/pkgs/development/python-modules/tiny-proxy/default.nix index cc2ece83fc9e..37632d6528d5 100644 --- a/pkgs/development/python-modules/tiny-proxy/default.nix +++ b/pkgs/development/python-modules/tiny-proxy/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/romis2012/tiny-proxy"; changelog = "https://github.com/romis2012/tiny-proxy/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix index fe26127cef26..06833d43c5c0 100644 --- a/pkgs/development/python-modules/torchcodec/default.nix +++ b/pkgs/development/python-modules/torchcodec/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "torchcodec"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "torchcodec"; tag = "v${version}"; - hash = "sha256-trYS4sRPSNmQLHZZS174zxbu74LT+39N23zOJdWwN6Q="; + hash = "sha256-QG7LX9G1HV2l75jsgsbM4ts6bg0wvsNhjml19b7yYEQ="; }; postPatch = '' @@ -44,17 +44,10 @@ buildPythonPackage rec { '"ffprobe"' \ '"${lib.getExe' ffmpeg "ffprobe"}"' - substituteInPlace \ - test/test_ops.py \ - test/test_encoders.py \ + substituteInPlace test/test_encoders.py \ --replace-fail \ '"ffmpeg"' \ '"${lib.getExe ffmpeg}"' - - substituteInPlace test/test_transform_ops.py \ - --replace-fail \ - 'ffmpeg_cli = "ffmpeg"' \ - 'ffmpeg_cli = "${lib.getExe ffmpeg}"' ''; nativeBuildInputs = [ @@ -92,7 +85,7 @@ buildPythonPackage rec { env = { # Upstream (Meta) is cautious with linking against GPL ffmpeg - # We explicitly want to link against our packages ffmpeg + # We explicitly want to link against our packaged ffmpeg I_CONFIRM_THIS_IS_NOT_A_LICENSE_VIOLATION = true; ENABLE_CUDA = cudaSupport; @@ -151,8 +144,10 @@ buildPythonPackage rec { "test_against_to_file" "test_against_to_file" "test_contiguit" + "test_crf_valid_value" "test_encode_to_tensor_long_outpu" "test_round_trip" + "test_video_encoder_against_ffmpeg_cli" "test_video_encoder_round_trip" # RuntimeError: Requested next frame while there are no more frames left to decode diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix index 8dcc5f6bbe2f..12e28344f615 100644 --- a/pkgs/development/python-modules/torcheval/default.nix +++ b/pkgs/development/python-modules/torcheval/default.nix @@ -13,6 +13,9 @@ let pname = "torcheval"; version = "0.0.7"; in + +# nixpkgs-update: no auto update +# upstream is missing the tag, so r-ryantm is attempting downgrades, e.g. #460611 buildPythonPackage { inherit pname version; pyproject = true; diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 45b88c075ee8..5a6958db6fbb 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.5"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = "ttp"; tag = version; - hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w="; + hash = "sha256-W1y84zHRhB8UGUfO5jV2k9epd9kaXUPqzT71URjm4TQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index a2d7027b1a45..9b2555846ec2 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -9,7 +9,7 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.2.5"; + version = "0.2.6"; in buildPythonPackage { inherit pname version; @@ -20,8 +20,9 @@ buildPythonPackage { repo = "tuya-device-sharing-sdk"; # no tags on GitHub: https://github.com/tuya/tuya-device-sharing-sdk/issues/2 # no sdist on PyPI: https://github.com/tuya/tuya-device-sharing-sdk/issues/41 - rev = "b2156585daefa39fcd2feff964e9be53124697f1"; - hash = "sha256-ypAS8tzO4Wyc8pVjSiGaNNl+2fkFNcC3Ftql3l2B8k8="; + # check the dev branch for new changes + rev = "86c0510e7229b9cf41b2bae57f3557a4d83c1928"; + hash = "sha256-nL7lr6HC+YpvmAdTnR6hzzn+9MEgzHkyzZuwjzsFHV0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ee33991b4e4f..9a9e6f816d71 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.8.7"; + version = "9.8.8"; pyproject = true; src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-jGuPJ/nTo+oYqnwwwZDFLnpHcEyErgCPB5pO31g9WNA="; + hash = "sha256-q3NjNe7SiqL2HgRkuoChesD333q3vw+aVkSASc6gDQk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 479aacc55103..876b55949dd0 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.25.2"; + version = "2.26.0.post2"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-ayRYrBwJmd4LpKHc+/O8DVx8ouoMcvZzKr5n0I6/AkA="; + hash = "sha256-aOvl6d4yAUQuVjWa8YJJPi5kLoVakTOlkYNSy/WsTi0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 53b75ddc1e0a..6ce850d371bc 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.29.0"; + version = "0.29.2"; pyproject = true; src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-f4EECEYJXLr2Tmt5BAQ0dQ1PL0h1RNd0i3eMNJ05NRA="; + hash = "sha256-QeAeFNZGh3vTEOfjxJ/xk/g2FIC5Vo6XsWOXdQCbvvo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index f8f2066c7bd5..e3cca863d351 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "6.30.2.20250703"; + version = "6.32.1.20251105"; format = "setuptools"; src = fetchPypi { pname = "types_protobuf"; inherit version; - hash = "sha256-YJqXR1S7tx+hePxkH1EFA5Xo4YSfSdBCCmKB7Y0d30Y="; + hash = "sha256-ZBACYR/4fdn+3DijminKy5kHrlzmFIm1PpnKIHS+92Q="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 705e52ae5022..a093aacf788c 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "typst"; - version = "0.14.2"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "messense"; repo = "typst-py"; tag = "v${version}"; - hash = "sha256-PshpYyT+WVZezHEMYETsxwSlPzZ8mXWFw2YgXPEyAIw="; + hash = "sha256-rG7W6kgkAQf4z+qPjGE0bJsBtXX9GclMXGXjNu+ig0w="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-453c6hs1Wr4KFu523jMqdNmi0cBxlpkh92bt4ZXXhLo="; + hash = "sha256-Cy3OOG5zdoVdjGqWIZmq6WsqJi9nENw+uZN11P/6YeQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 41b97a811502..5b194c53e4e2 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { mainProgram = "bench_udatetime.py"; homepage = "https://github.com/freach/udatetime"; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index b3fc0543c67f..2cf48e3b9b13 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -56,7 +56,6 @@ buildPythonPackage rec { changelog = "https://github.com/ueber-devel/ueberzug/releases/tag/${version}"; license = lib.licenses.gpl3Only; mainProgram = "ueberzug"; - maintainers = with lib.maintainers; [ Br1ght0ne ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 5e443864e609..87341a5120f4 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.6.2"; + version = "3.6.8"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "ufo2ft"; tag = "v${version}"; - hash = "sha256-TIeq4As5nThYck5jQLTdZySfOg51DtkiiYiiWEVSzxo="; + hash = "sha256-Qng6r+STE/Xz5T0kEwbj2eFDyWtIdH/I4wa6eO0epFc="; }; build-system = [ diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 54a9c6d68609..3ef17e89a15c 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system poetry-core, @@ -40,16 +39,14 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.23.0"; + version = "7.33.2"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-UScv0RAIgkFYl3yJZDuSzXXV3iI/3maV42hN4EtfUio="; + hash = "sha256-zGw77uP9Na+NnSzpxJ0Nf10L+nfbGuodVQNfomtaHhA="; }; build-system = [ poetry-core ]; @@ -93,17 +90,6 @@ buildPythonPackage rec { pytestFlags = [ "--benchmark-disable" ]; - disabledTests = [ - # https://127.0.0.1 vs https://127.0.0.1:0 - "test_base_url" - "test_bootstrap" - ]; - - disabledTestPaths = [ - # hangs the test suite - "tests/test_api_ws.py" - ]; - pythonImportsCheck = [ "uiprotect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 3ee7edd3fd3c..43060fa388c1 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -18,14 +18,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.10.2"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; tag = "v${version}"; - hash = "sha256-GK1tD0STBCR0Z/JHdhrgLun6t2snJqi/oFGUOeiXk6c="; + hash = "sha256-q8L6UkKL+M9zgax6jjxwkFrwayaxMTYJRfWt8Rnj00I="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix index 647b339f4e90..f27decd2c109 100644 --- a/pkgs/development/python-modules/versionfinder/default.nix +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -55,6 +55,5 @@ buildPythonPackage rec { homepage = "https://github.com/jantman/versionfinder"; changelog = "https://github.com/jantman/versionfinder/blob/${version}/CHANGES.rst"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ zakame ]; }; } diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index b2250192a8fa..7cbbd05f1007 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.2.1"; + version = "5.2.8"; pyproject = true; src = fetchFromGitHub { owner = "robinostlund"; repo = "volkswagencarnet"; tag = "v${version}"; - hash = "sha256-OXEVXIhS82WEcusvP0vvOWDWjy63U0SrSphTOpkg2IQ="; + hash = "sha256-kS7SEyLz1h2uj4T1FGMe2Zc7sS8fN9rT5W5Xsezki4A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index 10b93b346dd1..2545b1605c54 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { mainProgram = "watchgod"; homepage = "https://github.com/samuelcolvin/watchgod"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 4c4cccda3024..e23459a93bf3 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.18.2"; + version = "4.18.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-WaNTYV8HmfyC+OuDZOMmb5uKaACxmdk5qXZ9AxsMQaw="; + hash = "sha256-2cgj7Ry6lcmrvjhXkAmUO1vjsjF2dZxb1MsbQH3uElM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 897ee3662898..9a62a785e7df 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -57,6 +57,5 @@ buildPythonPackage rec { homepage = "https://github.com/wtforms/wtforms"; changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix index ded96ac0ba22..a2be9041b8f2 100644 --- a/pkgs/development/python-modules/x-transformers/default.nix +++ b/pkgs/development/python-modules/x-transformers/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "x-transformers"; - version = "2.10.2"; + version = "2.11.23"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "x-transformers"; tag = version; - hash = "sha256-7tlaq1/2S1uVlhZud/6Nnuf/oopHe88HHq69TUuKITo="; + hash = "sha256-DkJTP5Y7zObnbJ0PlY/pqw/gHU697ctNgQ99yyTXv+A="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix deleted file mode 100644 index 53932099f0dc..000000000000 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, - setuptools, - appdirs, - ecdsa, - httpx, - ms-cv, - pydantic, - pytest-asyncio_0, - pytestCheckHook, - respx, -}: - -buildPythonPackage rec { - pname = "xbox-webapi"; - version = "2.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "OpenXbox"; - repo = "xbox-webapi-python"; - rev = "v${version}"; - hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - appdirs - ecdsa - httpx - ms-cv - pydantic - ]; - - nativeCheckInputs = [ - pytest-asyncio_0 - pytestCheckHook - respx - ]; - - # https://github.com/OpenXbox/xbox-webapi-python/issues/114 - disabledTests = [ "test_import" ]; - - meta = with lib; { - changelog = "https://github.com/OpenXbox/xbox-webapi-python/blob/${src.rev}/CHANGELOG.md"; - description = "Library to authenticate with Windows Live/Xbox Live and use their API"; - homepage = "https://github.com/OpenXbox/xbox-webapi-python"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index b16f1148da0f..c6ac22b0dd2c 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; tag = "v${version}"; - hash = "sha256-elPT+hwnFoy62CbpKsaTLP8D+Pui6BD2De7oJistM0w="; + hash = "sha256-Ix49ypsw8Ii7pkpznzNqP97vJ/x1QBEaAis8R/kOJe0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b19f1d9d9767..5c843a747789 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.11.0"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "XKNX"; repo = "xknx"; tag = version; - hash = "sha256-jWnDiGg7vjIt4xkqjKrauExnvHcrH8m0RGfHjQlljFY="; + hash = "sha256-Sb/qPLINeYt96s7NkRARcb0ZrcE6A0ByyENVd5aiHxk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix index 3a9288570f7c..617460d7072f 100644 --- a/pkgs/development/python-modules/xtensor-python/default.nix +++ b/pkgs/development/python-modules/xtensor-python/default.nix @@ -43,7 +43,6 @@ toPythonModule ( homepage = "https://github.com/xtensor-stack/xtensor-python"; description = "Python bindings for the xtensor C++ multi-dimensional array library"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lsix ]; }; }) ) diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 4701ab0cd557..0bb68452cbbe 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xvfbwrapper"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; src = fetchFromGitHub { owner = "cgoldberg"; repo = "xvfbwrapper"; tag = version; - sha256 = "sha256-9PDLR8oz6VcRfqWOrLCw08wCqJeNCI5leiE6+QZi7xY="; + sha256 = "sha256-2ExEhqq1XMjGniRII5qw4fj2cDqYjTa4BjKNYo6ZJCw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index de6cc24bbd39..24c447ca6c72 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "yalexs-ble"; tag = "v${version}"; - hash = "sha256-50gI1vcA3GPm5yqLxKa6tV0bv5xUMfNFvdabJ2KY99I="; + hash = "sha256-p2S+OWUg4zMa3C6YXrtLMmy2O8rywuCiJsSzpf+ItsE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 482b8252d0f8..cb3135509155 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.6.10"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = "yappi"; tag = version; - hash = "sha256-RVa8IzyRuIQMfI0DhKdybJBBwqmyc2KI8XjD0PKQ8M8="; + hash = "sha256-YbWPx5Wf1s1UCCiDCInw66VnZ005LfON81MN3phT+fU="; }; patches = [ ./tests.patch ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 6f1b2ecc831d..6b0d9737f7e8 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ydiff"; - version = "1.4.2"; + version = "1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "ymattw"; repo = "ydiff"; tag = version; - hash = "sha256-JaGkABroj+/7MrgpFYI2vE1bndsilIodopMUnfmNhwA="; + hash = "sha256-9a7M6+CqGRvO1yainImN2RQVH3XMxE9PTLXJGKekXLg="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 6f4a4700861c..171160c0e139 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.149"; + version = "0.0.150"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-BAw7K4BrWEsMGcNpCVlcuG1ioiaTdEzBprtMnBton1Q="; + hash = "sha256-kdbmg4SGMl3RYdPFLJhbUxfdMokQ/LrhG6hTlu8eujo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 138144f0f89e..1dae74548700 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.79"; + version = "0.0.80"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-rM0Hu/MjMBeQSyZ6HsNmHXZmWFDr3cMi0QoHaL/fKto="; + hash = "sha256-5zqF+EkpKcgmEkg4ZSjMsz3yZn/Y13ECbM/7fBhlnis="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c82046c81f4e..75983d04e358 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.86.0"; + version = "0.87.0"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-PROJKC8ZxAZ8zZR4if33553qtp7i9y58LPr1d1gCXVQ="; + hash = "sha256-gaKTU3cAx8TecafVasoLeefjWS/R1AJVCZn9F1oqyPY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index fb932352b120..c28c0c3a1ce2 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "zxcvbn-rs-py"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zxcvbn_rs_py"; inherit version; - hash = "sha256-DQzdOngHGZma2NyfrNuMppG6GzpGoKfwVQGUVmN7erA="; + hash = "sha256-0nQmgII6F0gj8HCnNAdLvowWBPExPAgXCxWAJuNsc6A="; }; build-system = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-WkaTEoVQVOwxcTyOIG5oHEvcv65fBEpokl3/6SxqiUw="; + hash = "sha256-S6K6ZzW24V2yFV89B+gN+Odc4h3R45lF+emZs69dzYg="; }; pythonImportsCheck = [ "zxcvbn_rs_py" ]; diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix index 44d14de952f3..95602bfb09bf 100644 --- a/pkgs/development/python2-modules/pytest/default.nix +++ b/pkgs/development/python2-modules/pytest/default.nix @@ -97,7 +97,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ lovek323 madjar - lsix ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/6/release-attrPaths.json index 82c540a1e17a..f0be0f956770 100644 --- a/pkgs/development/rocm-modules/6/release-attrPaths.json +++ b/pkgs/development/rocm-modules/6/release-attrPaths.json @@ -4,15 +4,19 @@ "adaptivecpp", "adios2", "adoptopenjdk-icedtea-web", + "aider-chat", "aider-chat-full", + "aider-chat-with-bedrock", + "aider-chat-with-browser", "aider-chat-with-help", + "aider-chat-with-playwright", "aitrack", "alpaca", "ants", "appcsxcad", "arpack-mpi", + "audiobookshelf", "backgroundremover", - "beets", "btop", "btop-cuda", "c3d", @@ -36,11 +40,15 @@ "elmerfem", "elpa", "envision", + "escrotum", "exhibit", "exo", "ezminc", "f3d", + "ffcast", + "ffmpeg-full", "ffmpeg_8-full", + "ffsubsync", "fftwMpi", "firefox", "firefox-beta", @@ -55,9 +63,11 @@ "galene-stt", "gdcm", "getdp", + "git-sim", "globalarrays", "gromacsDoubleMpi", "gromacsMpi", + "gruut", "hashcat", "haskellPackages.mpi-hs", "haskellPackages.mpi-hs-binary", @@ -65,6 +75,7 @@ "haskellPackages.mpi-hs-store", "hdf5-fortran-mpi", "hdf5-mpi", + "hieroglyphic", "highfive-mpi", "home-assistant-component-tests.tami4", "hp2p", @@ -73,6 +84,7 @@ "hypre", "hyprpanel", "ieda", + "imagination", "immich-machine-learning", "ior", "itk", @@ -81,6 +93,8 @@ "kagen", "kahip", "kaminpar", + "kdePackages.kdenlive", + "kikoplay", "lacus", "lammps-mpi", "libcircle", @@ -97,6 +111,10 @@ "maa-assistant-arknights", "maa-cli", "magika", + "magika-cli", + "manim", + "manim-slides", + "midivisualizer", "migrate", "minari", "mirtk", @@ -105,6 +123,7 @@ "monado", "mpi", "mpifileutils", + "mpvScripts.autosubsync-mpv", "mrtrix", "mumps-mpi", "nest-mpi", @@ -125,6 +144,7 @@ "opensplat", "opentrack", "otb", + "owncast", "owocr", "p4est", "p4est-dbg", @@ -134,17 +154,19 @@ "parmmg", "pcl", "pdi", + "peek", "petsc", "pfft", "pianotrans", "piper-phonemize", "piper-tts", - "pitivi", "pnetcdf", "pnfft", "precice", + "printrun", "python3Packages.accelerate", "python3Packages.adios2", + "python3Packages.aigpy", "python3Packages.albumentations", "python3Packages.ale-py", "python3Packages.anndata", @@ -155,12 +177,10 @@ "python3Packages.array-api-compat", "python3Packages.asteroid-filterbanks", "python3Packages.attacut", + "python3Packages.auditok", "python3Packages.augmax", "python3Packages.ax-platform", "python3Packages.baselines", - "python3Packages.beetcamp", - "python3Packages.beets", - "python3Packages.beets-audible", "python3Packages.bitsandbytes", "python3Packages.blackjax", "python3Packages.blosc2", @@ -173,6 +193,7 @@ "python3Packages.cleanvision", "python3Packages.clip", "python3Packages.clip-anytorch", + "python3Packages.clu", "python3Packages.cnvkit", "python3Packages.colbert-ai", "python3Packages.compressai", @@ -224,6 +245,7 @@ "python3Packages.funsor", "python3Packages.fvcore", "python3Packages.gdcm", + "python3Packages.gdsfactory", "python3Packages.geotorch", "python3Packages.gliner", "python3Packages.gluonts", @@ -235,6 +257,7 @@ "python3Packages.gradio-client", "python3Packages.gradio-pdf", "python3Packages.graphtage", + "python3Packages.gruut", "python3Packages.gstools", "python3Packages.guidance", "python3Packages.gymnasium", @@ -254,6 +277,7 @@ "python3Packages.k-diffusion", "python3Packages.kahip", "python3Packages.keras", + "python3Packages.kokoro", "python3Packages.kornia", "python3Packages.kornia-rs", "python3Packages.kserve", @@ -264,7 +288,6 @@ "python3Packages.layoutparser", "python3Packages.lerobot", "python3Packages.libretranslate", - "python3Packages.librosa", "python3Packages.libsupermesh", "python3Packages.lightning", "python3Packages.linear-operator", @@ -309,6 +332,7 @@ "python3Packages.magika", "python3Packages.manga-ocr", "python3Packages.manifest-ml", + "python3Packages.manimgl", "python3Packages.markitdown", "python3Packages.mayavi", "python3Packages.mdtraj", @@ -324,6 +348,7 @@ "python3Packages.mmcv", "python3Packages.mmengine", "python3Packages.mne", + "python3Packages.moderngl-window", "python3Packages.monai", "python3Packages.monotonic-alignment-search", "python3Packages.monty", @@ -365,6 +390,8 @@ "python3Packages.pyannote-audio", "python3Packages.pyannote-pipeline", "python3Packages.pydmd", + "python3Packages.pydub", + "python3Packages.pyglet", "python3Packages.pykrige", "python3Packages.pylance", "python3Packages.pymanopt", @@ -374,11 +401,13 @@ "python3Packages.pypasser", "python3Packages.pyprecice", "python3Packages.pyradiomics", + "python3Packages.pyrender", "python3Packages.pyro-ppl", "python3Packages.pyseries", "python3Packages.pysilero-vad", "python3Packages.python-csxcad", "python3Packages.python-openems", + "python3Packages.pytmx", "python3Packages.pytorch-bench", "python3Packages.pytorch-lightning", "python3Packages.pytorch-memlab", @@ -386,6 +415,7 @@ "python3Packages.pytorch-msssim", "python3Packages.pytorch-pfn-extras", "python3Packages.pytorch-tabnet", + "python3Packages.pytorch-tokenizers", "python3Packages.pytorch3d", "python3Packages.pytorchviz", "python3Packages.pyvista", @@ -395,7 +425,6 @@ "python3Packages.rapidocr-onnxruntime", "python3Packages.rembg", "python3Packages.rerun-sdk", - "python3Packages.resampy", "python3Packages.resize-right", "python3Packages.retinaface", "python3Packages.rlcard", @@ -456,6 +485,7 @@ "python3Packages.torchbench", "python3Packages.torchcodec", "python3Packages.torchcrepe", + "python3Packages.torchdata", "python3Packages.torchdiffeq", "python3Packages.torchinfo", "python3Packages.torchio", @@ -467,7 +497,7 @@ "python3Packages.torchsnapshot", "python3Packages.torchsummary", "python3Packages.torchtnt", - "python3Packages.torchtnt-nightly", + "python3Packages.torchtune", "python3Packages.torchvision", "python3Packages.trainer", "python3Packages.transformers", @@ -483,6 +513,7 @@ "python3Packages.unsloth-zoo", "python3Packages.unstructured-inference", "python3Packages.vllm", + "python3Packages.vmas", "python3Packages.vtk", "python3Packages.wandb", "python3Packages.waymax", @@ -499,9 +530,12 @@ "raxml-mpi", "rclip", "rembg", + "restream", "rlama", + "rofi-screenshot", "rtabmap", "scalapack", + "scalapack-ilp64", "scipopt-ug", "seagoat", "siesta", @@ -512,7 +546,6 @@ "slepc", "spfft", "spla", - "supergee", "superlu_dist", "tabby", "tests.pkg-config.defaultPkgConfigPackages.ompi", @@ -530,8 +563,10 @@ "thunderbird-unwrapped", "thunderbirdPackages.thunderbird", "thunderbirdPackages.thunderbird-latest", + "tidal-dl", "tmpi", "tocpdf", + "tone", "trilinos-mpi", "tt-metal", "tts", @@ -540,9 +575,11 @@ "unbook", "unstructured-api", "vectorcode", + "vimPlugins.aider-nvim", "vimPlugins.vectorcode-nvim", "viskores", "vllm", + "vokoscreen", "vtk", "vtk-dicom", "vtk-full", @@ -555,6 +592,7 @@ "wifite2", "witnessme", "wivrn", + "wlr-layout-ui", "wyoming-faster-whisper", "wyoming-piper", "xyce-parallel" diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 40a390ff5168..7fc9012751b6 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -82,7 +82,6 @@ let ''; homepage = "https://github.com/com-lihaoyi/Ammonite"; license = licenses.mit; - maintainers = [ maintainers.nequissimus ]; mainProgram = "amm"; platforms = platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 2d340c9bca3c..efb0253e4c65 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -68,8 +68,8 @@ let '' cp -a $src/* . substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}' - env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ - gradle run --no-daemon --quiet --console plain > $out + env GRADLE_USER_HOME=$TMPDIR/gradle GRADLE_OPTS=-Dorg.gradle.native.dir=$TMPDIR/native \ + gradle run --no-daemon --quiet --console plain > $out actual="$(<$out)" if [[ "${javaVersion}" != "$actual"* ]]; then echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2 @@ -129,8 +129,11 @@ let callPackage, makeWrapper, unzip, + coreutils, + findutils, ncurses5, ncurses6, + gnused, udev, testers, runCommand, @@ -176,28 +179,47 @@ let # We only need to patchelf some libs embedded in JARs. dontAutoPatchelf = true; + # All the installed Gradle libraries and binaries go here. Note that the Gradle wrapper + # will look for a lib directory above its own directory (which is presumed to be bin) + # for loading the main Gradle jar. + gradleLibexec = "${placeholder "out"}/libexec/gradle"; + installPhase = - with builtins; let # set toolchains via installations.path property in gradle.properties. # See https://docs.gradle.org/current/userguide/toolchains.html#sec:custom_loc - toolchainPaths = "org.gradle.java.installations.paths=${concatStringsSep "," javaToolchains}"; - jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else ""; - jnaFlag = - if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else ""; + toolchainPaths = "org.gradle.java.installations.paths=${lib.concatStringsSep "," javaToolchains}"; + jnaLibraryPath = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [ udev ]); + jnaFlag = lib.optionalString stdenv.hostPlatform.isLinux ''--add-flags "-Djna.library.path=${jnaLibraryPath}"''; in '' - mkdir -pv $out/lib/gradle/ - cp -rv lib/ $out/lib/gradle/ + # Install all the Gradle jars. + mkdir -vp $gradleLibexec + cp -av lib/ $gradleLibexec + [ -f $gradleLibexec/lib/gradle-launcher-*.jar ] || { echo "No Gradle launcher jar found!" >&2 && exit 1; } - gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar) - test -f $gradle_launcher_jar - makeWrapper ${java}/bin/java $out/bin/gradle \ - --set JAVA_HOME ${java} \ - ${jnaFlag} \ - --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" + # Set up toolchain paths in the gradle.properties. + echo ${lib.escapeShellArg toolchainPaths} > $gradleLibexec/gradle.properties - echo "${toolchainPaths}" > $out/lib/gradle/gradle.properties + # Just use the existing gradle wrapper (usually called `gradlew`) as the main program. + mkdir -vp $gradleLibexec/bin + cp -v bin/gradle $gradleLibexec/bin/gradlew + chmod +x $gradleLibexec/bin/gradlew + patchShebangs --host $gradleLibexec/bin/gradlew + + # Ensure that JAVA_HOME is set so the installed Gradle wrapper picks it up. + # The wrapper also needs coreutils, xargs, and sed. + mkdir -vp $out/bin + makeWrapper $gradleLibexec/bin/gradlew $out/bin/gradle \ + --set-default JAVA_HOME ${java} \ + --suffix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + gnused + ] + } \ + ${jnaFlag} ''; dontFixup = !stdenv.hostPlatform.isLinux; @@ -212,10 +234,10 @@ let export PATH="${buildPackages.jdk}/bin:$PATH" . ${./patching.sh} - nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" + nativeVersion="$(extractVersion native-platform $gradleLibexec/lib/native-platform-*.jar)" for variant in "" "-ncurses5" "-ncurses6"; do autoPatchelfInJar \ - $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ + $gradleLibexec/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ "${lib.getLib stdenv.cc.cc}/lib64:${ lib.makeLibraryPath [ stdenv.cc.cc @@ -228,14 +250,14 @@ let # The file-events library _seems_ to follow the native-platform version, but # we won’t assume that. if [ -n "${newFileEvents}" ]; then - fileEventsVersion="$(extractVersion gradle-fileevents $out/lib/gradle/lib/gradle-fileevents-*.jar)" + fileEventsVersion="$(extractVersion gradle-fileevents $gradleLibexec/lib/gradle-fileevents-*.jar)" autoPatchelfInJar \ - $out/lib/gradle/lib/gradle-fileevents-''${fileEventsVersion}.jar \ + $gradleLibexec/lib/gradle-fileevents-''${fileEventsVersion}.jar \ "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" else - fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" + fileEventsVersion="$(extractVersion file-events $gradleLibexec/lib/file-events-*.jar)" autoPatchelfInJar \ - $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + $gradleLibexec/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" fi @@ -253,7 +275,7 @@ let version = testers.testVersion { package = finalAttrs.finalPackage; command = '' - env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ + env GRADLE_USER_HOME=$TMPDIR/gradle GRADLE_OPTS=-Dorg.gradle.native.dir=$TMPDIR/native \ gradle --version ''; }; @@ -269,7 +291,11 @@ let } '' cp -a $src/* . - env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ + + # Make sure GRADLE_OPTS works. + env \ + GRADLE_USER_HOME=$TMPDIR/gradle \ + GRADLE_OPTS="-Dorg.gradle.native.dir=$TMPDIR/native -Dnix.test.mainClass=Main" \ gradle run --no-daemon --quiet --console plain > $out ''; }; diff --git a/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle b/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle index adfea7d6a2d2..555f587596ad 100644 --- a/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle +++ b/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle @@ -2,6 +2,14 @@ plugins { id('application') } +String getPropOrDie(String prop, String message) { + def ret = System.getProperty(prop) + if (!ret) { + throw new RuntimeException(message) + } + return ret +} + application { - mainClass = 'Main' + mainClass = getPropOrDie('nix.test.mainClass', 'No main class defined, perhaps GRADLE_OPTS broke?') } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index c6f0d8c5f7e8..f042d41f8764 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { ]; description = "Build tool for Scala, Java and more"; maintainers = with maintainers; [ - nequissimus kashw2 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 501edc0e60fa..cca98110ba7e 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.03"; + version = "25.09"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-zyfBQKVton+2vjYd6fqrUqkHY9bci411pujRGabvTjQ="; + hash = "sha256-GMLhGspaS+SsldYFwhMoxzpFgU6alm6WASv3lp/FRRY="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' @@ -41,6 +41,8 @@ let allowedRequisites = [ ]; }; + archives = ./stable.nix; + nativeBuildInputs = [ bison curl @@ -63,7 +65,7 @@ let mkdir -p util/crossgcc/tarballs ${lib.concatMapStringsSep "\n" (file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}") ( - callPackage ./stable.nix { } + callPackage finalAttrs.archives { } )} patchShebangs util/genbuild_h/genbuild_h.sh diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index d8ecb7b969d2..ffe9ffadf177 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -8,10 +8,10 @@ }; } { - name = "mpfr-4.2.1.tar.xz"; + name = "mpfr-4.2.2.tar.xz"; archive = fetchurl { - sha256 = "1cnb3y7y351qg6r7ynwsgaykm7l2a8zg2nlljs4rf9k778shfy17"; - url = "mirror://gnu/mpfr/mpfr-4.2.1.tar.xz"; + sha256 = "00ffqs0sssb81bx007d0k2wc7hsyxy4yiqil6xbais7p7qwa0yxn"; + url = "mirror://gnu/mpfr/mpfr-4.2.2.tar.xz"; }; } { @@ -29,17 +29,17 @@ }; } { - name = "binutils-2.43.1.tar.xz"; + name = "binutils-2.44.tar.xz"; archive = fetchurl { - sha256 = "1z9d2f0894xvjlfnvni4wbxnqgqd42j9x8wpnwc13if4lc145xqk"; - url = "mirror://gnu/binutils/binutils-2.43.1.tar.xz"; + sha256 = "0dvj6zs7fcfm5bln1k9ma1h96a4wqi79s3i4p7fnfgnnb7h1f86f"; + url = "mirror://gnu/binutils/binutils-2.44.tar.xz"; }; } { - name = "acpica-unix-20241212.tar.gz"; + name = "acpica-unix-20250404.tar.gz"; archive = fetchurl { - sha256 = "0q8rqc9nxvyg4310rc93az04j01p91q7ipzvhl2722rrxv7q7jlx"; - url = "https://github.com/acpica/acpica/releases/download/R2024_12_12/acpica-unix-20241212.tar.gz"; + sha256 = "0593dicbdx5qcx13ari1c0rhsay09bwwsq6w94pcjbfbws4m92f0"; + url = "https://downloadmirror.intel.com/852044/acpica-unix-20250404.tar.gz"; }; } { diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 55b2572df2ff..1e80532dcb97 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -217,7 +217,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pierron globin - lsix ]; }; } diff --git a/pkgs/development/tools/ocaml/melange/default.nix b/pkgs/development/tools/ocaml/melange/default.nix index 8352e41011f1..6e0139729635 100644 --- a/pkgs/development/tools/ocaml/melange/default.nix +++ b/pkgs/development/tools/ocaml/melange/default.nix @@ -23,13 +23,13 @@ let versionHash = if lib.versionAtLeast ocaml.version "5.4" then { - version = "6.0.0-54"; - hash = "sha256-689OK37ObYhopfcaJ3AmkScGC4lCu3ZOTEM6N+Npvzs="; + version = "6.0.1-54"; + hash = "sha256-bV5TD8qlLt7wQdm9W0TyhDDBFFo/PdJXGgiscnsBFmc="; } else if lib.versionAtLeast ocaml.version "5.3" then { - version = "6.0.0-53"; - hash = "sha256-jPTQvV095BPB4EDepwGJTZ9sB/60VTO4YJTj2wI39jc="; + version = "6.0.1-53"; + hash = "sha256-e1/RIsFsKeAbc2wgQf1Hhta+nyAXIuEP7uatXrU9cLs="; } else if lib.versionAtLeast ocaml.version "5.2" then { diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 4198995392f7..1ac4ffa3db94 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -15,11 +15,11 @@ assert lib.versionAtLeast ocaml.version "4.08.0"; stdenv.mkDerivation (finalAttrs: { pname = "opam"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz"; - hash = "sha256-xNBTApeTxxTk5zQLEVdCjA+QeDWF+xfzUVgkemQEZ9k="; + hash = "sha256-JfuY+WLEInwSYeFCr8aKQWd45ugZYAvV7j7EoYrh4jg="; }; strictDeps = true; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index ed605f2436b2..a83fbbb29621 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -96,6 +96,7 @@ tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json; tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json; tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json; + tree-sitter-slint = lib.importJSON ./tree-sitter-slint.json; tree-sitter-smithy = lib.importJSON ./tree-sitter-smithy.json; tree-sitter-sml = lib.importJSON ./tree-sitter-sml.json; tree-sitter-solidity = lib.importJSON ./tree-sitter-solidity.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json new file mode 100644 index 000000000000..1ebd0fab512f --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json @@ -0,0 +1,14 @@ +{ + "url": "https://github.com/slint-ui/tree-sitter-slint", + "rev": "96bc969d20ff347030519184ea2467f4046a524d", + "date": "2025-07-13T19:36:58Z", + "path": "/nix/store/vns80yp0k4hpjrdxyasbijnj1q2v1rlf-tree-sitter-slint", + "sha256": "0q55q7rjf53jvhdxxr4qbnxwi5j1vxbda6g9pw18swn11nw72dn9", + "hash": "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "fetchTags": false, + "leaveDotGit": false, + "rootDir": "" +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index c9518d9f17a8..91d2de40deda 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -500,6 +500,10 @@ let orga = "crystal-lang-tools"; repo = "tree-sitter-crystal"; }; + "tree-sitter-slint" = { + orga = "slint-ui"; + repo = "tree-sitter-slint"; + }; }; pinnedGrammars = [ diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 2b0e29f46ac1..748d95a0125f 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -15,8 +15,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.24.0"; - hash = "sha256-GW9L0XTry9mXhrM0UvFEyy3DLvTnE47URJHp1D1wLXU="; + version = "10.25.0"; + hash = "sha256-DzcmZUsLXlLlgAkE3haK/Dxmfiq/hL2wbZrBOGEEvZA="; }; }; diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 57239437c85b..427662df90a8 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -27,15 +27,15 @@ }: let - buildNum = "2025-06-12-1681"; + buildNum = "2025-10-29-1732"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.5"; + version = "2.6"; src = fetchurl { - url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-e7IxoaZi77klrihRO6vDh1o2Clj5lNsVlzQ7btgLsu4="; + url = "https://gpuopen.com/download/RadeonDeveloperToolSuite-${buildNum}.tgz"; + hash = "sha256-iqdfVAG0ARPfjkJEtX7v2hpDnf3k60nAvQ+AZzcFnBM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 1eb93930d0a5..59fcf039795c 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -39,7 +39,7 @@ index dfccc661..85233f3b 100644 +set -eu -o pipefail +o posix +shopt -s nullglob +export PROG=\"{}\" -+\"{}\" $@", ++\"{}\" \"$@\"", + unwrapped_lld.to_string_lossy().to_string(), + ld_wrapper_path.to_string_lossy().to_string(), + ); diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index a729dfa8108c..31b58ca0121d 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -46,14 +46,14 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) }; zls_0_15 = finalAttrs: { - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "zigtools"; repo = "zls"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-GFzSHUljcxy7sM1PaabbkQUdUnLwpherekPWJFxXtnk="; + hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8="; }; nativeBuildInputs = [ zig_0_15.hook ]; diff --git a/pkgs/development/tools/zls/deps_0_15.nix b/pkgs/development/tools/zls/deps_0_15.nix index 5e3f28ccc47a..90d48e99ecaa 100644 --- a/pkgs/development/tools/zls/deps_0_15.nix +++ b/pkgs/development/tools/zls/deps_0_15.nix @@ -1,5 +1,4 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) -# manually removed tracy as instructed here: https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13 { linkFarm, fetchzip }: diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix new file mode 100644 index 000000000000..23f3384cae0a --- /dev/null +++ b/pkgs/development/web/nodejs/v25.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + buildPackages, + callPackage, + fetchpatch2, + openssl, + python3, + enableNpm ? true, +}: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; + + gypPatches = + if stdenv.buildPlatform.isDarwin then + [ + ./gyp-patches-set-fallback-value-for-CLT-darwin.patch + ] + else + [ ]; +in +buildNodejs { + inherit enableNpm; + version = "25.2.1"; + sha256 = "aa7c4ac1076dc299a8949b8d834263659b2408ec0e5bba484673a8ce0766c8b9"; + patches = + ( + if (stdenv.hostPlatform.emulatorAvailable buildPackages) then + [ + ./configure-emulator.patch + ] + else + [ + (fetchpatch2 { + url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch"; + hash = "sha256-3g4aS+NmmUYNOYRNc6UMJKYoaTlpP5Knt9UHegx+o0Y="; + }) + ] + ) + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ + # This patch is concerning. + # https://github.com/nodejs/node/issues/54576 + # It is only supposed to affect clang >= 17, but I'm seeing it on clang 19. + # I'm keeping the predicate for this patch pretty strict out of caution, + # so if you see the error it's supposed to prevent, feel free to loosen it. + (fetchpatch2 { + url = "https://raw.githubusercontent.com/rubyjs/libv8-node/62476a398d4c9c1a670240a3b070d69544be3761/patch/v8-no-assert-trivially-copyable.patch"; + hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw="; + }) + ] + ++ [ + ./configure-armv6-vfpv2.patch + ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + ./bin-sh-node-run-v22.patch + ./use-nix-codesign.patch + ] + ++ gypPatches; +} diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 36234e2b0dab..863c529ee607 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -149,7 +149,6 @@ let license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kalekseev - marie ]; inherit (nodejs.meta) platforms; }; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 4a81ab7314be..e260175e7af8 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -50,7 +50,7 @@ let openmsx = fetchzip { url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip"; - hash = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M="; + hash = "sha256-ysNFIvo7iaLN8XoaeZuZQFLpBZlYUDLDg7rH6TabaHY="; }; # OpenTTD builds and uses some of its own tools during the build and we need those to be available for cross-compilation. diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 87da62de0c76..6c55f96fd06f 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,352 +1,352 @@ { "aurorae": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/aurorae-6.5.3.tar.xz", - "hash": "sha256-veKz6r6F9CQmsylkuSgqtoiKlckkmlc6aAoPJ751dHA=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/aurorae-6.5.4.tar.xz", + "hash": "sha256-+88IekKANr5effxH5nb3OzZHE6azPWbf+lDqa97vsXY=" }, "bluedevil": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/bluedevil-6.5.3.tar.xz", - "hash": "sha256-7kHZ+GTQSYH5ITSx+rke4jxZwW16f9x/hQqa+sfQBVo=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/bluedevil-6.5.4.tar.xz", + "hash": "sha256-OBPu54ecgYHPFrW8cDsFZYaO390GLZ7DhHnEBsuzJPE=" }, "breeze": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/breeze-6.5.3.tar.xz", - "hash": "sha256-14KHWkUQwxQ1zNWq0gnrUZwKTd/bfaOS9U6uhjwuhpk=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/breeze-6.5.4.tar.xz", + "hash": "sha256-K1Cy6P8lDKeC/2X46lFAEh1UTYuLpOqjRdYiToB2w9E=" }, "breeze-grub": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/breeze-grub-6.5.3.tar.xz", - "hash": "sha256-SFOW2Up8UGzeZlxr+4BuT208kOIxmU+d3EsBU3V2e+M=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/breeze-grub-6.5.4.tar.xz", + "hash": "sha256-nyb6GML1WysYFjr/Z7gwxx8soSniBLRUycZ1c9tpEVY=" }, "breeze-gtk": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/breeze-gtk-6.5.3.tar.xz", - "hash": "sha256-0mpg9i/OwNq4IBeGP0tb64oHt6IcpIr0Rw5FC/nco6o=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/breeze-gtk-6.5.4.tar.xz", + "hash": "sha256-nKoO1Av8nW5cuZeC+uugUnE/G5n86/qjJuGALRaKNks=" }, "breeze-plymouth": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/breeze-plymouth-6.5.3.tar.xz", - "hash": "sha256-5RVJfEOFu9vXFd05NHSURPtOAqN0Is5EicGIcF4FNpo=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/breeze-plymouth-6.5.4.tar.xz", + "hash": "sha256-mq4caQ/Luwai0QkDBDSWDgWYKw50KAZvq33y2YJJzGM=" }, "discover": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/discover-6.5.3.tar.xz", - "hash": "sha256-2FutPU1ugVREFgzZ1uG9NX3IOZUQ+0Uv77JVmqruiYI=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/discover-6.5.4.tar.xz", + "hash": "sha256-oVq82Akoj2/x+XXE4WweajmdXh4PAriFUMU9Dd0Qjk4=" }, "drkonqi": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/drkonqi-6.5.3.tar.xz", - "hash": "sha256-P361CnXx/geU4ipxV7w7Zjtn5E/tg2NRbxoYkwXf6v4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/drkonqi-6.5.4.tar.xz", + "hash": "sha256-7Mo3qm/aOpcZxO/aeg066sFTwOfQuvUvJ2SDDSSl4+0=" }, "flatpak-kcm": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/flatpak-kcm-6.5.3.tar.xz", - "hash": "sha256-QnBULxIREYZSy1o7kZixsBGNSYHHaYe5g0JpKmvKAaE=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/flatpak-kcm-6.5.4.tar.xz", + "hash": "sha256-DbNbXxYR53ps7ShEhLIqgagus9JridxlFTr4xeeAEbk=" }, "kactivitymanagerd": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kactivitymanagerd-6.5.3.tar.xz", - "hash": "sha256-rscEXnx5aZLiJneOnozXIOE7yI+f5CTf5wV0na98L+0=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kactivitymanagerd-6.5.4.tar.xz", + "hash": "sha256-JbbLsIRwmuBUgvG0NEu0NZhmpM37lmU44xCImvJJc0g=" }, "kde-cli-tools": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kde-cli-tools-6.5.3.tar.xz", - "hash": "sha256-/VMsPfWm20FRgIK8lFw2kxyNqCkRfCE3+zC5ORrrY/w=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kde-cli-tools-6.5.4.tar.xz", + "hash": "sha256-iP5DNUKczshC3pDqqIGTDszSm8lHUoyvb+Esk+YJ77Y=" }, "kde-gtk-config": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kde-gtk-config-6.5.3.tar.xz", - "hash": "sha256-jyRSFJWF4+BciP/tuC5D2sHsdmmgjmozwDutAzKJnz4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kde-gtk-config-6.5.4.tar.xz", + "hash": "sha256-N0dJbEdpGtsJEWsbhVh6ekQBWyUSnIoE+moqH63tJKg=" }, "kdecoration": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kdecoration-6.5.3.tar.xz", - "hash": "sha256-MjihNaZwNvhtlX81JHxR6xjktGYJJgR4pmMMrck0Sb0=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kdecoration-6.5.4.tar.xz", + "hash": "sha256-CIzTUnNbCZavj5GVTBjYN8n6O02KVFsIzDMZsQqiDvc=" }, "kdeplasma-addons": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kdeplasma-addons-6.5.3.tar.xz", - "hash": "sha256-hCZCmq8VvzPTx7f2GDfptWeem3znP2EiczmKepd8Yoc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kdeplasma-addons-6.5.4.tar.xz", + "hash": "sha256-JRBkaaaB82P3tBX7Jtia7Vc03CNxg5aXovBf1FWLQW8=" }, "kgamma": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kgamma-6.5.3.tar.xz", - "hash": "sha256-gfa5/TueYUXRHznfkUl1cLJF14welMPuHmHWL7gDlg0=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kgamma-6.5.4.tar.xz", + "hash": "sha256-Ezq5LfMlQ3H9F93wUTaRfygW40+aCOrrwAml3JXQ4r0=" }, "kglobalacceld": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kglobalacceld-6.5.3.tar.xz", - "hash": "sha256-R6nJgVsd00/Z7HfygmzpWSFvASdYUzdZNkNPEtySh9I=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kglobalacceld-6.5.4.tar.xz", + "hash": "sha256-Fga1AWtvpVTjpmD8A+Wf00AmneUtbKTuOmLmt53YWNI=" }, "kinfocenter": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kinfocenter-6.5.3.tar.xz", - "hash": "sha256-wrRk7VgKCCPY0XH7LRpTOmqi2huItBQtNgRTwVKDQwQ=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kinfocenter-6.5.4.tar.xz", + "hash": "sha256-qFRmn6yDFb7CBc0XrXmwPLQfn5wPevOngj1kEcaMM8o=" }, "kmenuedit": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kmenuedit-6.5.3.tar.xz", - "hash": "sha256-5QA00JFjVIb1Lo1De7ujg9DfAYWkFm0ZfTH4dl5bCuc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kmenuedit-6.5.4.tar.xz", + "hash": "sha256-5X12tCMeVvI3lXyc19imiBpCY4zt5ADR5CprtIoYlqk=" }, "knighttime": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/knighttime-6.5.3.tar.xz", - "hash": "sha256-Gu+3bcfhD3IrrGwMQphajowi3EDs4eqG0SxE1taVa5k=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/knighttime-6.5.4.tar.xz", + "hash": "sha256-33u/T+rbzUN9Xpd4WHjF2oKgyeyZvVoB3VeIQywHsMc=" }, "kpipewire": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kpipewire-6.5.3.tar.xz", - "hash": "sha256-Dw+IQFfHkCbOaak/LtltM1gUABVf7Ivdzi0ro7GX3MU=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kpipewire-6.5.4.tar.xz", + "hash": "sha256-/InvfM3Nu9xVuRR0IPX1z4W/OQLAezrgwNv51KI7pIo=" }, "krdp": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/krdp-6.5.3.tar.xz", - "hash": "sha256-W+z7fNiPdW31LU8g0/IytkUwPG4TLW1+33W2bhNC0ro=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/krdp-6.5.4.tar.xz", + "hash": "sha256-VCfuR//i9snQ1kaToQ8A7fQkWhNak90yc4W7fRkFMIk=" }, "kscreen": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kscreen-6.5.3.tar.xz", - "hash": "sha256-fwnvdUbO8khN/+CRhT1pKK2jindtX78LENR6yW3poMc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kscreen-6.5.4.tar.xz", + "hash": "sha256-ofJ/FTVWiL0M5EhNtNBjzOwZKJRO3ZYM1EEqyr9fZiU=" }, "kscreenlocker": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kscreenlocker-6.5.3.tar.xz", - "hash": "sha256-JkZKRhNHMF8qLLOyjjoOj8YC/KbKirXSynE3O32dpo4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kscreenlocker-6.5.4.tar.xz", + "hash": "sha256-RwAhqGtIalT10KYx3tw8KwKJmVPf+CSgPFNLYMhiOJk=" }, "ksshaskpass": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/ksshaskpass-6.5.3.tar.xz", - "hash": "sha256-2vXSFN7Mz7Xyi5LhyLwQKL8FEbJa2fUBFoSPXavpbg4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/ksshaskpass-6.5.4.tar.xz", + "hash": "sha256-T97wef64lj1anlVNwRrOjHKHMndfA0D8H0Oxq6mhaGE=" }, "ksystemstats": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/ksystemstats-6.5.3.tar.xz", - "hash": "sha256-GbN+ASZI0n/ob6MA0s0s5lwhZy07ohRcplVbrw4qqRM=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/ksystemstats-6.5.4.tar.xz", + "hash": "sha256-pTA4IyIht3PGlTEsbNPxGpA74aoYb9TCdN3e2MGsMfs=" }, "kwallet-pam": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwallet-pam-6.5.3.tar.xz", - "hash": "sha256-NvH4KbfonJdu7eN35sEhrp0bRAJcontVZW8lfRiNDHQ=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwallet-pam-6.5.4.tar.xz", + "hash": "sha256-Ztng423uos53E0uyTDTL+Nz2IxcEYrSpBC9/DmTCfd8=" }, "kwayland": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwayland-6.5.3.tar.xz", - "hash": "sha256-5sE7ekgSckEC/i+C9QLkL4gSEUOBqCu4G4YT6lqzhyU=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwayland-6.5.4.tar.xz", + "hash": "sha256-67c3G0AqC+0MxVlmzBDRO0MbKIy30Z4fQVGYU/mOPTk=" }, "kwayland-integration": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwayland-integration-6.5.3.tar.xz", - "hash": "sha256-FydO4DEBAM9/Ey+lN3ohFrTmjt9K2A0k4mppaBb+6nM=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwayland-integration-6.5.4.tar.xz", + "hash": "sha256-0aQwQ1KbPl4GmHBpYt5WIH25wscWP7TZDDKhZtguQs4=" }, "kwin": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwin-6.5.3.tar.xz", - "hash": "sha256-kOr3TXczpZHl+RcLWaSe4ONoTelUq3Vv7wQhwDUUn3E=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwin-6.5.4.tar.xz", + "hash": "sha256-JYRD9yGAz1qBQbRAu1GnFKLmfjCGdzYpB5POUNe7HXA=" }, "kwin-x11": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwin-x11-6.5.3.tar.xz", - "hash": "sha256-rnUVpZDXn4YT3DIrRBNyTLBGZ3EDaYb0fQEs7Oeem9k=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwin-x11-6.5.4.tar.xz", + "hash": "sha256-dVdiUjbQwGeTgEyTqS31AYklvG8AncHyBnCfw0cloiU=" }, "kwrited": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/kwrited-6.5.3.tar.xz", - "hash": "sha256-HB9zeSc+qnmRio+r1hcIztxIJpxNNn8vpWQwnkHTcJw=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/kwrited-6.5.4.tar.xz", + "hash": "sha256-jhMPXSHOYkqXTY5yZ0RvMXoX+gEqU9u3XRQPZdq36aY=" }, "layer-shell-qt": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/layer-shell-qt-6.5.3.tar.xz", - "hash": "sha256-lNfYVKFRw/UCh0jW6ojGiiimwdjHYQ02EHRdGI0nMEk=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/layer-shell-qt-6.5.4.tar.xz", + "hash": "sha256-u5XbJT/80p4IGRZWtqVEn4qIAMOCVoc+JSl0m1XqqAo=" }, "libkscreen": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/libkscreen-6.5.3.tar.xz", - "hash": "sha256-HgA2xIhoJLvrMPPOVYueTRA3OIXmAIfW2RVT8nN00i8=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/libkscreen-6.5.4.tar.xz", + "hash": "sha256-mKaE+sAdDT6jCaifAKdznsMiY9849ae5iOdDAq9Ub5Q=" }, "libksysguard": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/libksysguard-6.5.3.tar.xz", - "hash": "sha256-640B+89kEKnVrnjFODklJOILv03AqWGaNzKkcx1ecYc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/libksysguard-6.5.4.tar.xz", + "hash": "sha256-dPNwviRyKvoq55rPPXPtxqI/Dsuo4LcX3pc/XQ2gUI4=" }, "libplasma": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/libplasma-6.5.3.tar.xz", - "hash": "sha256-H+QPSIUBB43HAPPKAY5P9dTF00T7zUrbdqzoYmnHqfU=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/libplasma-6.5.4.tar.xz", + "hash": "sha256-Hunzem8cJr7ANTYNCdgbRNe27Yw/YKFV2Lhkw6ZQBu4=" }, "milou": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/milou-6.5.3.tar.xz", - "hash": "sha256-cnOvFoA9eFGo+ObbZggWWvSbd9E6fsauPPiOjjZyHLc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/milou-6.5.4.tar.xz", + "hash": "sha256-3VaTgeooJaR+uz9LmY/TXXU0EfRTUO+wBWbfaBRBtfc=" }, "ocean-sound-theme": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/ocean-sound-theme-6.5.3.tar.xz", - "hash": "sha256-QSmDsRVvICX8FYFQdfKbG5bzvC3hXFQM6iViRSEYQfY=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/ocean-sound-theme-6.5.4.tar.xz", + "hash": "sha256-wEzJT3AEe6o6yFBDSRWhGIctV2MHyKHqbtYzT+isvuQ=" }, "oxygen": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/oxygen-6.5.3.tar.xz", - "hash": "sha256-N5+Y252Cm5dbClmjilbZoyT+rEu2+V/CCl6loiA9bZQ=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/oxygen-6.5.4.tar.xz", + "hash": "sha256-vz8iRNLlBmK0G8cqrWkm17v1t9Dpa2W43BIwItyDuxI=" }, "oxygen-sounds": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/oxygen-sounds-6.5.3.tar.xz", - "hash": "sha256-mw4pp6gZ5q7qCb3TenQTQRX/ZnboK6dvOXuodsbxpyI=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/oxygen-sounds-6.5.4.tar.xz", + "hash": "sha256-CVh/F4twpdFqzkk3ykoVfzu9SjfCVBXtghUQFov5yZg=" }, "plasma-activities": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-activities-6.5.3.tar.xz", - "hash": "sha256-67KZCpUEhk7TMt6D+SlBkkr6dOV5udG0Brudh20O4h0=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-activities-6.5.4.tar.xz", + "hash": "sha256-niLzry86POMIUlZPrFlvSVY09DGcCtI+x2OplKvlBTk=" }, "plasma-activities-stats": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-activities-stats-6.5.3.tar.xz", - "hash": "sha256-3PMkaMumXscGfqY6rAz61BncJJdYBmmYk2mYFO45/NQ=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-activities-stats-6.5.4.tar.xz", + "hash": "sha256-3xJiOjD0uw60H87MtL6lOBcu8Jtx1qtAobRDr6jfvMo=" }, "plasma-browser-integration": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-browser-integration-6.5.3.tar.xz", - "hash": "sha256-zE1y8l5CkRDCpa0q2AjeN+0TiVfjLe/cFdGcigv/3U4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-browser-integration-6.5.4.tar.xz", + "hash": "sha256-OlDZTf/wbr+wOJ5BsHS6FXSowa9sUmqPgTlcltGW3rA=" }, "plasma-desktop": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-desktop-6.5.3.tar.xz", - "hash": "sha256-u3ZKLJd0f54wJ0KUJwRnVPs6x9/2rIIXFRHHFvqk0Lc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-desktop-6.5.4.tar.xz", + "hash": "sha256-4I0YQa36N0rxAByGYEpL8vDVoiMP4fLJJdthzZhLjAw=" }, "plasma-dialer": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-dialer-6.5.3.tar.xz", - "hash": "sha256-ZbmtEPxJf3Bk+9bPBeFtCadTTspxcLW0Tky51RMoa6s=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-dialer-6.5.4.tar.xz", + "hash": "sha256-C196ifp1IJAMeBB2jDdrvXxPPriBo65baLQRfwkjqfI=" }, "plasma-disks": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-disks-6.5.3.tar.xz", - "hash": "sha256-/6ismcPTQN/qCMedow34t2GOymN4NwjtG6ihBtr3m/w=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-disks-6.5.4.tar.xz", + "hash": "sha256-7IboZZwD8L2IZ7sX+odlhu4VrCSq1SiRHevxLFNMcRs=" }, "plasma-firewall": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-firewall-6.5.3.tar.xz", - "hash": "sha256-9b6VaxRJ+ZVq8tSg42+jwpHct2ywlQVz42Z7MsfuEGA=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-firewall-6.5.4.tar.xz", + "hash": "sha256-LD/k5O/zG2vwaUhf5Y2kfqnZLDXbU88Eml4JUEJEIhA=" }, "plasma-integration": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-integration-6.5.3.tar.xz", - "hash": "sha256-qq/y0E4+f8KJNT9GTJvgsneCrjWWpTxmfO1Drmu53Lg=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-integration-6.5.4.tar.xz", + "hash": "sha256-QeTBBz+aiFJzOq4/NHOHU/jt4GuYVZHuZ6eY5KCqXiM=" }, "plasma-mobile": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-mobile-6.5.3.tar.xz", - "hash": "sha256-a+TU1gevnBYbkg8TClUyuYyL8+4kMLi+IruyEQdbMFk=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-mobile-6.5.4.tar.xz", + "hash": "sha256-/VqGOZi6velx5LcuezsKl7ADxbB7/HEVvfogX4e9Pgg=" }, "plasma-nano": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-nano-6.5.3.tar.xz", - "hash": "sha256-4wECuW6/1MYdMMnPqA+a+ybWHvrt96UggNCKUOt8DLc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-nano-6.5.4.tar.xz", + "hash": "sha256-gOIdbA/L2z1f/CRXOsk4qe/4W7WW0sckGMjbEoVO0GM=" }, "plasma-nm": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-nm-6.5.3.tar.xz", - "hash": "sha256-mtaWHwzmxNGE79bufP4mH7RKrulkTrTKdMja68RW78M=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-nm-6.5.4.tar.xz", + "hash": "sha256-pYTGi+mBro76+qalQzmD1kdUVO4ngG7kHH4qTQhZyK8=" }, "plasma-pa": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-pa-6.5.3.tar.xz", - "hash": "sha256-Wyzwyyxq1nGji5ojJ4SVLKVhlzD3zeMA6uMpvFaosu4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-pa-6.5.4.tar.xz", + "hash": "sha256-ptuvnYR2Jw7NeAkF321Z0rXclwJXrrqPYmnu0d1/83U=" }, "plasma-sdk": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-sdk-6.5.3.tar.xz", - "hash": "sha256-DosLY3mbt4VVu82I4/gEUR3utWJ4WIVFRg6MeULeD98=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-sdk-6.5.4.tar.xz", + "hash": "sha256-DZyudSwhx1+pyHL+dQXONok8hjIQ1ztoeZp1G2VuewM=" }, "plasma-systemmonitor": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-systemmonitor-6.5.3.tar.xz", - "hash": "sha256-pPJKX+oGPMCyLT4ENvB80mxZ8qZy/KwZln/vOlOqHY0=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-systemmonitor-6.5.4.tar.xz", + "hash": "sha256-uGWG8jTCMQHukDJuD1F1GIJ20aBJdZIxZLQR8kAOg2c=" }, "plasma-thunderbolt": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-thunderbolt-6.5.3.tar.xz", - "hash": "sha256-YCvRd/aYjKgB64XXNyLxfYEfQBy40lzCVHOhymusihE=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-thunderbolt-6.5.4.tar.xz", + "hash": "sha256-AuklIfhbtqkza2q9c6x4zSLyMqXU9hTEekTV77DGs6g=" }, "plasma-vault": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-vault-6.5.3.tar.xz", - "hash": "sha256-5h5HULUzsofkAUAznD9d4gPmPpBgTyCkTgboHcpcK48=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-vault-6.5.4.tar.xz", + "hash": "sha256-7NiMm+J+zgC1QoEKcda9KD0bK/GuIlJgVQQWKBXKsMY=" }, "plasma-welcome": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-welcome-6.5.3.tar.xz", - "hash": "sha256-ZGgg/Gk7OI1wame2oet/RAlYUfa4fpQLywfM1UGqnzk=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-welcome-6.5.4.tar.xz", + "hash": "sha256-hU3qQRZWA+oszOtAGpHCIAx/4vI9CrwjH5TbcVosK+g=" }, "plasma-workspace": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-workspace-6.5.3.tar.xz", - "hash": "sha256-/2TLrcl0k+rw9jPLAJErz8IFNt2mhLq8+ks+7NSDyhc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-workspace-6.5.4.tar.xz", + "hash": "sha256-SUtnHXD2fuOC/q7Q3Kcu1n/npCOmM44s2yQR+TvOdB4=" }, "plasma-workspace-wallpapers": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma-workspace-wallpapers-6.5.3.tar.xz", - "hash": "sha256-RH06VnUNU/U84aJzXzUSRGY3bOPQiQtAIAvF+4jwHZc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma-workspace-wallpapers-6.5.4.tar.xz", + "hash": "sha256-k9byTW4KjZFXi8B98qv8leiCaMSk/dZvJHGhxr+fYvs=" }, "plasma5support": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plasma5support-6.5.3.tar.xz", - "hash": "sha256-tYu3vLWRTj88dtPekg2VPIeR8Pmo4tbrhBBRsYAJeX8=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plasma5support-6.5.4.tar.xz", + "hash": "sha256-rd62LZ7ubnCgZCh2zgDifkN8/W5tC9ruMaN4wmrD0lg=" }, "plymouth-kcm": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/plymouth-kcm-6.5.3.tar.xz", - "hash": "sha256-Y0uV8uUDNcuWgQt97Y2kV/RAad5JpR7AdrxcdFlEU0Q=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/plymouth-kcm-6.5.4.tar.xz", + "hash": "sha256-X+z5WUhcfWFnOXbjBrPz4UGXHfVc1HJdRWcxLoOAQIc=" }, "polkit-kde-agent-1": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/polkit-kde-agent-1-6.5.3.tar.xz", - "hash": "sha256-CytHmBtRqVsWVaOsOYX/BM6rurNxfrQDjo+uao6wdZo=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/polkit-kde-agent-1-6.5.4.tar.xz", + "hash": "sha256-q0RoQvzWDJp0DDTYUf7vmPyi72AKPJSfLsOFiDj7iiQ=" }, "powerdevil": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/powerdevil-6.5.3.tar.xz", - "hash": "sha256-KZksuRClYnVIYjvOWjv1Hn+mggxM1lDqJVtNPdCKOGM=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/powerdevil-6.5.4.tar.xz", + "hash": "sha256-meQnt1drGTC7QKNYQZ+brDbjtZ+R/30cTHO7bFgDPho=" }, "print-manager": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/print-manager-6.5.3.tar.xz", - "hash": "sha256-6+pmZL0fPNejAzufxvh5dkgiHF19c526VSQ9OnpHe+I=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/print-manager-6.5.4.tar.xz", + "hash": "sha256-h3YlVrEyf8420tHuxOQPxpA7rdxSBPKKt6QEXoRkZos=" }, "qqc2-breeze-style": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/qqc2-breeze-style-6.5.3.tar.xz", - "hash": "sha256-/zG01G47iypgAxpblk6on3wULN0zkr3mC0qA9i8mW9M=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/qqc2-breeze-style-6.5.4.tar.xz", + "hash": "sha256-qTZpnFZY4Rc3dGiDF34pxx0PDNqRsKWuSZ4fv5LffA8=" }, "sddm-kcm": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/sddm-kcm-6.5.3.tar.xz", - "hash": "sha256-f+4ZDdHK6g4ZP3BQMKl4qxhOBlGbTUUxO09+Oxk5QKM=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/sddm-kcm-6.5.4.tar.xz", + "hash": "sha256-4J+cYbWJ0eGA5EXTCYyNLuaQ/5JlZq59w6IB1BCv3rc=" }, "spacebar": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/spacebar-6.5.3.tar.xz", - "hash": "sha256-5ambyJlQ9M4rZEIj0sgDz5O5NSnZzYuP2LUXRErlqWM=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/spacebar-6.5.4.tar.xz", + "hash": "sha256-R2CWpBJVnayKunYwdAzSsDfyMuG/RQlvYQrYkBmWQFk=" }, "spectacle": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/spectacle-6.5.3.tar.xz", - "hash": "sha256-zxUBZuzUtAwvp7O0dhzuIv8IssyNpoz4zW/8Dvx4yLc=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/spectacle-6.5.4.tar.xz", + "hash": "sha256-s1bdk2LZVXIC2H1VYc5F7d4o+etKsOOP07iSYj8tS8E=" }, "systemsettings": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/systemsettings-6.5.3.tar.xz", - "hash": "sha256-lwLQeN/0+vrWpa+Mq5+GWcZF4d10x7n/firu7nKGf4o=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/systemsettings-6.5.4.tar.xz", + "hash": "sha256-eY72yCYQX0Qzlhr1mpoYL/do1YvUpRbhjJEuUCBgOAM=" }, "wacomtablet": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/wacomtablet-6.5.3.tar.xz", - "hash": "sha256-RssHC6n02Lv0yfc1M/qllwFe3msk9tABHDok6L2tOx4=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/wacomtablet-6.5.4.tar.xz", + "hash": "sha256-Tif/a3wDoMYkACCIrerDomfYl9sgjSdVVitIGasJpr4=" }, "xdg-desktop-portal-kde": { - "version": "6.5.3", - "url": "mirror://kde/stable/plasma/6.5.3/xdg-desktop-portal-kde-6.5.3.tar.xz", - "hash": "sha256-HtvipF/LxiAbm9M8XTX0CQDTxAQb9bIvaEyztth94ZI=" + "version": "6.5.4", + "url": "mirror://kde/stable/plasma/6.5.4/xdg-desktop-portal-kde-6.5.4.tar.xz", + "hash": "sha256-ALPyDbI3kA6wFaEAlfuF0yTagIDSCrr931ywROsSUWs=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index d714bb8e247d..ee32c6ccbc42 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -8,19 +8,6 @@ mkKdeDerivation { pname = "breeze"; - # Fix extra thicc padding on menu items - # FIXME: remove in next update - patches = [ - (fetchpatch { - url = "https://invent.kde.org/plasma/breeze/-/commit/4a8a46aba6b9e39bfb02c7f46933079b5a50eff5.diff"; - hash = "sha256-ZzRMMwz3OihChywzQWBNv9rPcZI+IcXNVzoRuXTWt9c="; - }) - (fetchpatch { - url = "https://invent.kde.org/plasma/breeze/-/commit/2cd5b37dad8f213aab4029b6d3b80ca7f159ea50.diff"; - hash = "sha256-3pOJEH1H3o+U40K/mtKnruPsoA+vy+HrAa8vU5Oza6c="; - }) - ]; - outputs = [ "out" "dev" diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b2457765bfaa..2545487ed477 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -220,12 +220,12 @@ in dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; tag = "v${version}"; - hash = "sha256-WNgCa8F618JQiHDM1YxHj7oR7w+7U6SU89K90RYIUh8="; + hash = "sha256-emR4G1P80OqxDO4DUrAd495SGLI+avpjpOYUYuoSoNU="; }; meta = { homepage = "https://draculatheme.com/tmux"; diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index a8088b063bde..650f4284a32a 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -3,7 +3,7 @@ generateSplicesForMkScope, callPackage, attributePathToSplice ? [ "freebsd" ], - branch ? "release/14.2.0", + branch ? "release/15.0.0", }: let diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.2/passwd-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/passwd-install.patch new file mode 100644 index 000000000000..7fdb0354d0a0 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/passwd-install.patch @@ -0,0 +1,24 @@ +diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile +index f8734053deb0..3bfc1d0e9b5a 100644 +--- a/usr.bin/passwd/Makefile ++++ b/usr.bin/passwd/Makefile +@@ -3,7 +3,7 @@ + PACKAGE = runtime + PROG = passwd + BINOWN = root +-BINMODE = 4555 ++BINMODE = 0555 + PRECIOUSPROG= + LIBADD = pam + .if ${MK_NIS} != "no" +@@ -11,10 +11,4 @@ SYMLINKS = passwd ${BINDIR}/yppasswd + MLINKS = passwd.1 yppasswd.1 + .endif + +-beforeinstall: +-.for i in passwd yppasswd +- [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ +- chflags noschg ${DESTDIR}${BINDIR}/$i || true +-.endfor +- + .include diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.2/stand-label.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/stand-label.patch new file mode 100644 index 000000000000..0bc61c46e1d8 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/stand-label.patch @@ -0,0 +1,390 @@ +diff --git a/stand/common/disk.c b/stand/common/disk.c +index c1650f0fa..1baf91efa 100644 +--- a/stand/common/disk.c ++++ b/stand/common/disk.c +@@ -468,7 +468,7 @@ disk_parsedev(struct devdesc **idev, const char *devspec, const char **path) + + if (*cp != '\0' && *cp != ':') + return (EINVAL); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->dd.d_unit = unit; +diff --git a/stand/efi/include/efi.h b/stand/efi/include/efi.h +index b603c3a78..d430a7012 100644 +--- a/stand/efi/include/efi.h ++++ b/stand/efi/include/efi.h +@@ -74,14 +74,16 @@ typedef uint32_t UINTN; + #include "efidef.h" + #include "efidevp.h" + #include "efipciio.h" +-#include "efiprot.h" + #include "eficon.h" ++#include "efiapi.h" ++#include "efipart.h" ++#include "efigpt.h" ++#include "efiprot.h" + #include "eficonsctl.h" + #include "efiser.h" + #include "efi_nii.h" + #include "efipxebc.h" + #include "efinet.h" +-#include "efiapi.h" + #include "efifs.h" + #include "efierr.h" + #include "efigop.h" +@@ -90,6 +92,7 @@ typedef uint32_t UINTN; + #include "efitcp.h" + #include "efipoint.h" + #include "efiuga.h" ++#include "efichar.h" + #include + + /* +diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h +index e1920430a..3bbd83a50 100644 +--- a/stand/efi/include/efilib.h ++++ b/stand/efi/include/efilib.h +@@ -40,6 +40,7 @@ extern EFI_RUNTIME_SERVICES *RS; + extern struct devsw efipart_fddev; + extern struct devsw efipart_cddev; + extern struct devsw efipart_hddev; ++extern struct devsw efipart_label; + extern struct devsw efihttp_dev; + extern struct devsw efinet_dev; + extern struct netif_driver efinetif; +@@ -58,6 +59,7 @@ typedef struct pdinfo + uint32_t pd_unit; /* unit number */ + uint32_t pd_open; /* reference counter */ + void *pd_bcache; /* buffer cache data */ ++ char pd_volname[36*2]; + struct pdinfo *pd_parent; /* Linked items (eg partitions) */ + struct devsw *pd_devsw; /* Back pointer to devsw */ + } pdinfo_t; +diff --git a/stand/efi/include/efiprot.h b/stand/efi/include/efiprot.h +index be11ea83b..1463c756c 100644 +--- a/stand/efi/include/efiprot.h ++++ b/stand/efi/include/efiprot.h +@@ -632,4 +632,41 @@ typedef struct _EFI_COMPONENT_NAME2 { + CHAR8 **SupportedLanguages; + } EFI_COMPONENT_NAME2; + ++// ++// Partition Info Protocol ++// ++ ++#define PARTITION_INFO_PROTOCOL \ ++ { 0x8cf2f62c, 0xbc9b, 0x4821, {0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0} } ++ ++INTERFACE_DECL(_EFI_PARTITION_INFO); ++ ++#define EFI_PARTITION_INFO_INTERFACE_REVISION 0x0001000 ++#define PARTITION_TYPE_OTHER 0x00 ++#define PARTITION_TYPE_MBR 0x01 ++#define PARTITION_TYPE_GPT 0x02 ++ ++#pragma pack(1) ++ ++typedef struct _EFI_PARTITION_INFO { ++ ++ UINT32 Revision; ++ UINT32 Type; ++ UINT8 System; ++ UINT8 Reserved[7]; ++ union { ++ /// ++ /// MBR data ++ /// ++ MBR_PARTITION_RECORD Mbr; ++ ++ /// ++ /// GPT data ++ /// ++ EFI_PARTITION_ENTRY Gpt; ++ } Info; ++} EFI_PARTITION_INFO; ++ ++#pragma pack() ++ + #endif +diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c +index 3df603457..a7b6050ff 100644 +--- a/stand/efi/libefi/efipart.c ++++ b/stand/efi/libefi/efipart.c +@@ -35,11 +35,10 @@ + + #include + #include +-#include +-#include + #include + + static EFI_GUID blkio_guid = BLOCK_IO_PROTOCOL; ++static EFI_GUID partinfo_guid = PARTITION_INFO_PROTOCOL; + + typedef bool (*pd_test_cb_t)(pdinfo_t *, pdinfo_t *); + static int efipart_initfd(void); +@@ -58,6 +57,12 @@ static int efipart_printfd(int); + static int efipart_printcd(int); + static int efipart_printhd(int); + ++static int efipart_get_volname(EFI_HANDLE h, char *dest, int size); ++static int label_parsedev(struct devdesc **idev, const char *devspec, const char **path); ++ ++static char *nullfmt(struct devdesc *vdev); ++static int nullinit(void); ++ + /* EISA PNP ID's for floppy controllers */ + #define PNP0604 0x604 + #define PNP0700 0x700 +@@ -104,6 +109,20 @@ struct devsw efipart_hddev = { + .dv_parsedev = disk_parsedev, + }; + ++struct devsw efipart_label = { ++ .dv_name = "label", ++ .dv_type = DEVT_LABEL, ++ .dv_init = nullinit, ++ .dv_strategy = efipart_strategy, ++ .dv_open = efipart_open, ++ .dv_close = efipart_close, ++ .dv_ioctl = efipart_ioctl, ++ .dv_print = efipart_printhd, ++ .dv_cleanup = nullsys, ++ .dv_fmtdev = nullfmt, ++ .dv_parsedev = label_parsedev, ++}; ++ + static pdinfo_list_t fdinfo = STAILQ_HEAD_INITIALIZER(fdinfo); + static pdinfo_list_t cdinfo = STAILQ_HEAD_INITIALIZER(cdinfo); + static pdinfo_list_t hdinfo = STAILQ_HEAD_INITIALIZER(hdinfo); +@@ -406,6 +425,8 @@ efipart_inithandles(void) + pd->pd_handle = hin[i]; + pd->pd_devpath = devpath; + pd->pd_blkio = blkio; ++ /* Do not fail here */ ++ efipart_get_volname(hin[i], pd->pd_volname, sizeof(pd->pd_volname)); + STAILQ_INSERT_TAIL(&pdinfo, pd, pd_link); + } + +@@ -419,6 +440,20 @@ efipart_inithandles(void) + return (0); + } + ++static int ++efipart_get_volname(EFI_HANDLE h, char *dest, int size) ++{ ++ EFI_PARTITION_INFO *partinfo; ++ int status; ++ ++ status = OpenProtocolByHandle(h, &partinfo_guid, (void **)&partinfo); ++ if (EFI_ERROR(status)) { ++ return (efi_status_to_errno(status)); ++ } ++ cpy16to8(partinfo->Info.Gpt.PartitionName, dest, size); ++ return (0); ++} ++ + /* + * Get node identified by pd_test() from plist. + */ +@@ -1249,3 +1284,99 @@ efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t size, + free(blkbuf); + return (rc); + } ++ ++static pdinfo_t * ++label_lookup_part(const char *label, struct devsw **dev) ++{ ++ pdinfo_t *dp, *pp; ++ ++ /* ++ * Check hard disks, then cd, then floppy ++ */ ++ STAILQ_FOREACH(dp, &hdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_hddev; ++ return (dp); ++ } ++ STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { ++ if (!strcmp(label, pp->pd_volname)) { ++ *dev = &efipart_hddev; ++ return (pp); ++ } ++ } ++ } ++ STAILQ_FOREACH(dp, &cdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_cddev; ++ return (dp); ++ } ++ STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { ++ if (!strcmp(label, pp->pd_volname)) { ++ *dev = &efipart_cddev; ++ return (pp); ++ } ++ } ++ } ++ STAILQ_FOREACH(dp, &fdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_fddev; ++ return (dp); ++ } ++ } ++ return (NULL); ++} ++ ++static int ++label_parsedev(struct devdesc **idev, const char *devspec, const char **path) ++{ ++ pdinfo_t *part; ++ const char *devspeci, *devspecp; ++ char *label; ++ struct disk_devdesc *dev; ++ ++ if (strncmp(devspec, "label:", strlen("label:"))) { ++ return (EINVAL); ++ } ++ devspeci = devspec + strlen("label:"); ++ devspecp = strchr(devspeci, ':'); ++ if (devspecp == NULL) { ++ return (EINVAL); ++ } ++ label = malloc(devspecp - devspeci + 1); ++ if (label == NULL) { ++ return (ENOMEM); ++ } ++ memcpy(label, devspeci, devspecp - devspeci); ++ label[devspecp - devspeci] = 0; ++ ++ dev = calloc(sizeof(*dev), 1); ++ if (dev == NULL) ++ return (ENOMEM); ++ ++ part = label_lookup_part(label, &dev->dd.d_dev); ++ if (part == NULL) { ++ return (ENOENT); ++ } ++ ++ dev->dd.d_unit = part->pd_parent->pd_unit; ++ dev->d_slice = part->pd_unit; ++ dev->d_partition = D_PARTISGPT; ++ *idev = &dev->dd; ++ if (path != NULL) { ++ *path = devspecp + 1; ++ } ++ ++ return (0); ++} ++ ++static char * ++nullfmt(struct devdesc *vdev) ++{ ++ return (""); ++} ++ ++static int ++nullinit(void) ++{ ++ return (0); ++} +diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c +index 3bc74ea63..042aa15b3 100644 +--- a/stand/efi/loader/conf.c ++++ b/stand/efi/loader/conf.c +@@ -40,6 +40,7 @@ struct devsw *devsw[] = { + &efipart_fddev, + &efipart_cddev, + &efipart_hddev, ++ &efipart_label, + &efihttp_dev, /* ordering with efinet_dev matters */ + #if defined(LOADER_NET_SUPPORT) + &efinet_dev, +diff --git a/stand/kboot/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c +index a9117d4c1..fc98bf534 100644 +--- a/stand/kboot/kboot/hostdisk.c ++++ b/stand/kboot/kboot/hostdisk.c +@@ -465,7 +465,7 @@ hostdisk_parsedev(struct devdesc **idev, const char *devspec, const char **path) + return (EINVAL); + } + free(fn); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->d_unit = 0; +diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c +index 5e3a789c1..dd7eb2cf8 100644 +--- a/stand/libofw/devicename.c ++++ b/stand/libofw/devicename.c +@@ -98,7 +98,7 @@ ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char **path + + if (ofw_path_to_handle(devspec, ofwtype, &rem_path) == -1) + return (ENOENT); +- idev = malloc(sizeof(struct ofw_devdesc)); ++ idev = calloc(sizeof(struct ofw_devdesc), 1); + if (idev == NULL) { + printf("ofw_parsedev: malloc failed\n"); + return ENOMEM; +diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c +index 1edc843d5..841615588 100644 +--- a/stand/libsa/dev.c ++++ b/stand/libsa/dev.c +@@ -72,7 +72,7 @@ default_parsedev(struct devdesc **dev, const char *devspec, + int unit, err; + char *cp; + +- idev = malloc(sizeof(struct devdesc)); ++ idev = calloc(sizeof(struct devdesc), 1); + if (idev == NULL) + return (ENOMEM); + +@@ -139,7 +139,8 @@ devparse(struct devdesc **dev, const char *devspec, const char **path) + if (err != 0) + return (err); + +- idev->d_dev = dv; ++ if (idev->d_dev == NULL) ++ idev->d_dev = dv; + if (dev != NULL) + *dev = idev; + else +diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h +index 260defa3a..8fb5c818d 100644 +--- a/stand/libsa/stand.h ++++ b/stand/libsa/stand.h +@@ -148,6 +148,7 @@ struct devsw { + #define DEVT_CD 3 + #define DEVT_ZFS 4 + #define DEVT_FD 5 ++#define DEVT_LABEL 6 + int (*dv_init)(void); /* early probe call */ + int (*dv_strategy)(void *devdata, int rw, daddr_t blk, + size_t size, char *buf, size_t *rsize); +diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c +index 70a102f64..2f7c1caaa 100644 +--- a/stand/libsa/zfs/zfs.c ++++ b/stand/libsa/zfs/zfs.c +@@ -1643,7 +1643,7 @@ zfs_parsedev(struct devdesc **idev, const char *devspec, const char **path) + spa = spa_find_by_name(poolname); + if (!spa) + return (ENXIO); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->pool_guid = spa->spa_guid; +diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c +index 4ee9c7fd7..23670d759 100644 +--- a/stand/uboot/devicename.c ++++ b/stand/uboot/devicename.c +@@ -102,7 +102,7 @@ uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, + } + if (dv == NULL) + return(ENOENT); +- idev = malloc(sizeof(struct uboot_devdesc)); ++ idev = calloc(sizeof(struct uboot_devdesc), 1); + err = 0; + np = (devspec + strlen(dv->dv_name)); + diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.2/su-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/su-install.patch new file mode 100644 index 000000000000..d85d23039f06 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/su-install.patch @@ -0,0 +1,13 @@ +diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile +index f6d95defa195..b43d7592ef89 100644 +--- a/usr.bin/su/Makefile ++++ b/usr.bin/su/Makefile +@@ -10,7 +10,7 @@ LIBADD+= bsm + .endif + + BINOWN= root +-BINMODE=4555 ++BINMODE=0555 + PRECIOUSPROG= + + .include diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.2/sysctl-funcname-backport.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/sysctl-funcname-backport.patch new file mode 100644 index 000000000000..f39900e870b1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/sysctl-funcname-backport.patch @@ -0,0 +1,27 @@ +commit faa845aab6113190ba8c75a171b2cca8673a6214 +Author: Zhenlei Huang +Date: Sun Jan 26 01:59:33 2025 +0800 + + kern_sysctl: Fix printing function name in the re-use sysctl leaf warning + + The helper function sysctl_warn_reuse() is intended to print the name of + the caller rather than that of itself. + + PR: 221853 + Fixes: 4ae2ade11426 Enhance debugibility of sysctl leaf re-use warnings + MFC after: 3 days + Differential Revision: https://reviews.freebsd.org/D48645 + +diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c +index 9d824fbd3cbd..da09aaed5558 100644 +--- a/sys/kern/kern_sysctl.c ++++ b/sys/kern/kern_sysctl.c +@@ -411,7 +411,7 @@ sysctl_warn_reuse(const char *func, struct sysctl_oid *leaf) + (void)sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); + sbuf_set_drain(&sb, sbuf_printf_drain, NULL); + +- sbuf_printf(&sb, "%s: can't re-use a leaf (", __func__); ++ sbuf_printf(&sb, "%s: can't re-use a leaf (", func); + + rc = sysctl_search_oid(nodes, leaf); + if (rc > 0) { diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch new file mode 100644 index 000000000000..20be3503fd17 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch @@ -0,0 +1,11 @@ +--- a/share/mk/src.libnames.mk 2023-12-21 23:56:50.767042385 -0800 ++++ b/share/mk/src.libnames.mk 2023-12-21 23:56:39.671089506 -0800 +@@ -392,7 +392,7 @@ + _DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp + # The libc dependencies are not strictly needed but are defined to make the + # assert happy. +-_DP_c= compiler_rt sys ++_DP_c= sys + # Use libssp_nonshared only on i386 and power*. Other archs emit direct calls + # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. + .if ${MK_SSP} != "no" && \ diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/bsd-lib-mk-force-static.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/bsd-lib-mk-force-static.patch new file mode 100644 index 000000000000..1052fa10adaf --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/bsd-lib-mk-force-static.patch @@ -0,0 +1,66 @@ +diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk +index 5f328d5378ca..89d16dc6fa41 100644 +--- a/share/mk/bsd.lib.mk ++++ b/share/mk/bsd.lib.mk +@@ -242,7 +242,7 @@ PO_FLAG=-pg + _LIBDIR:=${LIBDIR} + _SHLIBDIR:=${SHLIBDIR} + +-.if defined(SHLIB_NAME) ++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME) + .if ${MK_DEBUG_FILES} != "no" + SHLIB_NAME_FULL=${SHLIB_NAME}.full + # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory +@@ -277,7 +277,7 @@ LDFLAGS+= -Wl,--undefined-version + .endif + .endif + +-.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) ++.if defined(LIB) && !empty(LIB) || (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) + OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/} + BCOBJS+= ${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g} + LLOBJS+= ${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.llo/g} +@@ -320,14 +320,14 @@ lib${LIB_PRIVATE}${LIB}.ll: ${LLOBJS} + CLEANFILES+= lib${LIB_PRIVATE}${LIB}.bc lib${LIB_PRIVATE}${LIB}.ll + .endif + +-.if defined(SHLIB_NAME) || \ ++.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) + SOBJS+= ${OBJS:.o=.pico} + DEPENDOBJS+= ${SOBJS} + CLEANFILES+= ${SOBJS} + .endif + +-.if defined(SHLIB_NAME) ++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME) + _LIBS+= ${SHLIB_NAME} + + SOLINKOPTS+= -shared -Wl,-x +@@ -435,7 +435,7 @@ all: all-man + CLEANFILES+= ${_LIBS} + + _EXTRADEPEND: +-.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) ++.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) && !empty(SHLIB_NAME) + .if defined(DPADD) && !empty(DPADD) + echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE} + .endif +@@ -501,7 +501,7 @@ _libinstall: + ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/ + .endif + .endif +-.if defined(SHLIB_NAME) ++.if defined(SHLIB_NAME) && !empty(SHLIB_NAME) + ${INSTALL} ${LIB_TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ + ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ +@@ -588,7 +588,7 @@ OBJS_DEPEND_GUESS+= ${SRCS:M*.h} + OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.po+= ${_S} + .endfor + .endif +-.if defined(SHLIB_NAME) || \ ++.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) + .for _S in ${SRCS:N*.[hly]} + OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.pico+= ${_S} diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-install-dirs.patch new file mode 100644 index 000000000000..74728b090bff --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-install-dirs.patch @@ -0,0 +1,42 @@ +diff --git a/tools/build/Makefile b/tools/build/Makefile +index 948a5f9dfdb..592af84eeae 100644 +--- a/tools/build/Makefile ++++ b/tools/build/Makefile +@@ -327,15 +327,15 @@ host-symlinks: + # and cross-tools stages. We do this here using mkdir since mtree may not exist + # yet (this happens if we are crossbuilding from Linux/Mac). + INSTALLDIR_LIST= \ +- bin \ +- lib/geom \ +- usr/include/casper \ +- usr/include/openssl \ +- usr/include/private/ucl \ +- usr/include/private/zstd \ +- usr/lib \ +- usr/libdata/pkgconfig \ +- usr/libexec ++ ${BINDIR} \ ++ ${LIBDIR}/geom \ ++ ${INCLUDEDIR}/casper \ ++ ${INCLUDEDIR}/openssl \ ++ ${INCLUDEDIR}/private/ucl \ ++ ${INCLUDEDIR}/private/zstd \ ++ ${LIBDIR} \ ++ ${LIBDIR}/libdata/pkgconfig \ ++ ${LIBEXECDIR} + + installdirs: + mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,} +@@ -352,9 +352,9 @@ installdirs: + rm -rf "${DESTDIR}/${_dir}"; \ + fi + .endfor +- ln -sfn bin ${DESTDIR}/sbin +- ln -sfn ../bin ${DESTDIR}/usr/bin +- ln -sfn ../bin ${DESTDIR}/usr/sbin ++ ln -sfn bin ${DESTDIR}/${SBINDIR} ++ ln -sfn ../bin ${DESTDIR}/${BINDIR} ++ ln -sfn ../bin ${DESTDIR}/${SBINDIR} + .for _group in ${INCSGROUPS:NINCS} + mkdir -p "${DESTDIR}/${${_group}DIR}" + .endfor diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-systypes.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-systypes.patch new file mode 100644 index 000000000000..b520d04ee361 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/compat-systypes.patch @@ -0,0 +1,12 @@ +diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h +index 18b607ed82d2..ee7692b31273 100644 +--- a/tools/build/cross-build/include/common/sys/types.h ++++ b/tools/build/cross-build/include/common/sys/types.h +@@ -34,6 +34,7 @@ + * SUCH DAMAGE. + */ + #pragma once ++#include + #include_next + #include + /* diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/fsck-path.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/fsck-path.patch new file mode 100644 index 000000000000..d1e49d20103b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/fsck-path.patch @@ -0,0 +1,18 @@ +diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c +index 3757ed062ba5..584ada116386 100644 +--- a/sbin/fsck/fsck.c ++++ b/sbin/fsck/fsck.c +@@ -375,11 +375,8 @@ checkfs(const char *pvfstype, const char *spec, const char *mntpt, + _exit(0); + + /* Go find an executable. */ +- execvP(execbase, _PATH_SYSPATH, __DECONST(char * const *, argv)); +- if (spec) +- warn("exec %s for %s in %s", execbase, spec, _PATH_SYSPATH); +- else +- warn("exec %s in %s", execbase, _PATH_SYSPATH); ++ execvp(execbase, __DECONST(char * const *, argv)); ++ warn("exec %s not found", execbase); + _exit(1); + /* NOTREACHED */ + diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/install-bootstrap-Makefile.patch new file mode 100644 index 000000000000..a69c5501ddd1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/install-bootstrap-Makefile.patch @@ -0,0 +1,11 @@ +--- a/usr.bin/xinstall/Makefile 2023-09-23 19:18:49.165192183 -0700 ++++ b/usr.bin/xinstall/Makefile 2023-12-06 17:06:57.836888028 -0700 +@@ -14,7 +14,7 @@ + CFLAGS+= -I${SRCTOP}/lib/libnetbsd + + LIBADD= md +-CFLAGS+= -DWITH_MD5 -DWITH_RIPEMD160 ++CFLAGS+= -I${BSDSRCDIR}/contrib/libc-vis -I${BSDSRCDIR}/lib/libnetbsd + + .ifdef BOOTSTRAPPING + # For the bootstrap we disable copy_file_range() diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-msun-arch-subdir.patch new file mode 100644 index 000000000000..4a69e85a986a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-msun-arch-subdir.patch @@ -0,0 +1,11 @@ +--- a/lib/libc/Makefile ++++ b/lib/libc/Makefile +@@ -194,7 +194,7 @@ SUBDIR.${MK_TESTS}+= tests + # recording a build dependency + CFLAGS+= -I${SRCTOP}/lib/libutil + # Same issue with libm +-MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${SRCTOP}/lib/msun -V ARCH_SUBDIR ++MSUN_ARCH_SUBDIR = ${MACHINE_CPUARCH:S/i386/i387/} + # unfortunately msun/src contains both private and public headers + CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR} + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch new file mode 100644 index 000000000000..3cc8fee77355 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch @@ -0,0 +1,21 @@ +--- a/lib/libc/Makefile ++++ b/lib/libc/Makefile +@@ -58,7 +58,6 @@ CFLAGS+=${CANCELPOINTS_CFLAGS} + # Link with static libcompiler_rt.a. + # + LDFLAGS+= -nodefaultlibs +-LIBADD+= compiler_rt + LIBADD+= sys + + .if ${MK_SSP} != "no" && \ +--- a/lib/libsys/Makefile ++++ b/lib/libsys/Makefile +@@ -46,7 +46,6 @@ + # + LDFLAGS+= -nodefaultlibs + LDFLAGS+= -Wl,-Bsymbolic +-LIBADD+= compiler_rt + + .if ${MK_SSP} != "no" && \ + (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "") + diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libcxxrt-headers.patch new file mode 100644 index 000000000000..a1418bd49975 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libcxxrt-headers.patch @@ -0,0 +1,11 @@ +--- freebsd/lib/libcxxrt/Makefile 2024-05-30 14:27:42.328086005 -0700 ++++ freebsd/lib/libcxxrt/Makefile.mod 2024-05-30 14:27:48.048014581 -0700 +@@ -19,6 +19,8 @@ + SRCS+= terminate.cc + SRCS+= typeinfo.cc + ++INCS+=cxxabi.h ++ + WARNS?= 0 + CFLAGS+= -isystem ${SRCDIR} -nostdinc++ + CXXSTD?= c++14 diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libifconfig-no-internal.patch new file mode 100644 index 000000000000..d37f1e64a949 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libifconfig-no-internal.patch @@ -0,0 +1,34 @@ +diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile +index 6bdb202bec1d..ebc626901cfc 100644 +--- a/lib/libifconfig/Makefile ++++ b/lib/libifconfig/Makefile +@@ -1,5 +1,4 @@ + LIB= ifconfig +-INTERNALLIB= true + + LIBADD= m + +@@ -36,8 +35,8 @@ SRCS+= ${GEN} + CLEANFILES+= ${GEN} + + # If libifconfig become public uncomment those two lines +-#INCSDIR= ${INCLUDEDIR} +-#INCS= libifconfig.h libifconfig_sfp.h libifconfig_sfp_tables.h ++INCSDIR= ${INCLUDEDIR} ++INCS= libifconfig.h libifconfig_sfp.h libifconfig_sfp_tables.h + + #MAN= libifconfig.3 + +diff --git a/lib/libifconfig/Symbol.map b/lib/libifconfig/Symbol.map +index 2d80fb31652a..8b08947112e5 100644 +--- a/lib/libifconfig/Symbol.map ++++ b/lib/libifconfig/Symbol.map +@@ -2,6 +2,8 @@ + ifconfig_bridge_get_bridge_status; + ifconfig_bridge_free_bridge_status; + ifconfig_carp_get_info; ++ ifconfig_carp_get_vhid; ++ ifconfig_carp_set_info; + ifconfig_close; + ifconfig_create_interface; + ifconfig_create_interface_vlan; diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libncurses-tinfo-makefile-gnused.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libncurses-tinfo-makefile-gnused.patch new file mode 100644 index 000000000000..094c8b18980f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libncurses-tinfo-makefile-gnused.patch @@ -0,0 +1,22 @@ +diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile +index 08c2311cd7a9..9efadea9bee0 100644 +--- a/lib/ncurses/tinfo/Makefile ++++ b/lib/ncurses/tinfo/Makefile +@@ -269,7 +269,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses + cat curses.head > $@.new + AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ + ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >> $@.new +- sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@.new ++ sed -i 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@.new + cat ${NCURSES_DIR}/include/curses.wide >> $@.new + cat ${NCURSES_DIR}/include/curses.tail >> $@.new + mv -f $@.new $@ +@@ -394,7 +394,7 @@ unctrl.h: unctrl.h.in + terminfo.5: MKterminfo.sh terminfo.head Caps + sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ + ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ +- sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@ ++ sed -i 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@ + + CLEANFILES+= terminfo.5 + diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libnetbsd-do-install.patch new file mode 100644 index 000000000000..a7bd032d2be5 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/libnetbsd-do-install.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index 22710f3d933..22effc848cf 100644 +--- a/lib/libnetbsd/Makefile ++++ b/lib/libnetbsd/Makefile +@@ -9,6 +9,26 @@ CFLAGS+= -I${.CURDIR} + + SRCS+= efun.c sockaddr_snprintf.c strsuftoll.c util.c util.h + +-INTERNALLIB= ++INCSGROUPS= INCS SYSINCS NETINETINCS ++ ++INCS+= \ ++ glob.h \ ++ pthread.h \ ++ rmd160.h \ ++ sha1.h \ ++ sha2.h \ ++ stdlib.h \ ++ util.h ++ ++SYSINCSDIR= ${INCLUDEDIR}/sys ++SYSINCS+= \ ++ sys/cdefs.h \ ++ sys/event.h \ ++ sys/types.h \ ++ sys/wait.h ++ ++NETINETINCSDIR= ${INCLUDEDIR}/netinet ++NETINETINCS+= \ ++ netinet/in.h + + .include diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/librpcsvc-include-subdir.patch new file mode 100644 index 000000000000..38e06682869f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/librpcsvc-include-subdir.patch @@ -0,0 +1,11 @@ +--- a/lib/librpcsvc/Makefile ++++ b/lib/librpcsvc/Makefile +@@ -20,7 +20,7 @@ OTHERSRCS+= yp_passwd.c yp_update.c + + RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C + +-INCDIRS= -I${SYSROOT:U${DESTDIR}}/usr/include/rpcsvc ++INCDIRS= -I${INCLUDEDIR}/rpcsvc + + CFLAGS+= -DYP ${INCDIRS} + diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/localedef.patch new file mode 100644 index 000000000000..27593ce9bf44 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/localedef.patch @@ -0,0 +1,158 @@ +diff --git a/include/_ctype.h b/include/_ctype.h +index 91e6b1d14f6b..a6896b598da3 100644 +--- a/include/_ctype.h ++++ b/include/_ctype.h +@@ -44,7 +44,7 @@ + #define __CTYPE_H_ + + #include +-#include ++#include + + #define _CTYPE_A 0x00000100L /* Alpha */ + #define _CTYPE_C 0x00000200L /* Control */ +diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h +index 2d3723b49f5b..6bbff732b9d7 100644 +--- a/lib/libc/locale/collate.h ++++ b/lib/libc/locale/collate.h +@@ -36,6 +36,7 @@ + #ifndef _COLLATE_H_ + #define _COLLATE_H_ + ++#include + #include + #include + #include "xlocale_private.h" +diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c +index 44b7e3292eae..79c30b7cf372 100644 +--- a/usr.bin/localedef/charmap.c ++++ b/usr.bin/localedef/charmap.c +@@ -31,6 +31,7 @@ + * CHARMAP file handling for localedef. + */ + ++#include + #include + #include + +diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c +index 2a080773a95e..3f0030c638f5 100644 +--- a/usr.bin/localedef/collate.c ++++ b/usr.bin/localedef/collate.c +@@ -31,6 +31,7 @@ + * LC_COLLATE database generation routines for localedef. + */ + ++#include + #include + #include + +diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c +index ab7b76e57b2d..846c6d6480a8 100644 +--- a/usr.bin/localedef/ctype.c ++++ b/usr.bin/localedef/ctype.c +@@ -32,6 +32,7 @@ + /* + * LC_CTYPE database generation routines for localedef. + */ ++#include + #include + #include + +diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c +index 5ff146d6f655..ed69aa1f0c0e 100644 +--- a/usr.bin/localedef/localedef.c ++++ b/usr.bin/localedef/localedef.c +@@ -32,7 +32,7 @@ + * POSIX localedef. + */ + #include +-#include ++#include + #include + #include + +diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c +index 6b8eb9d684dd..0155821d0e56 100644 +--- a/usr.bin/localedef/messages.c ++++ b/usr.bin/localedef/messages.c +@@ -31,6 +31,7 @@ + /* + * LC_MESSAGES database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c +index 7a77ac7e256c..7636c4deca1f 100644 +--- a/usr.bin/localedef/monetary.c ++++ b/usr.bin/localedef/monetary.c +@@ -31,6 +31,7 @@ + /* + * LC_MONETARY database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c +index 5533b7c10e1a..9c47494f815c 100644 +--- a/usr.bin/localedef/numeric.c ++++ b/usr.bin/localedef/numeric.c +@@ -31,6 +31,7 @@ + /* + * LC_NUMERIC database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/parser.y b/usr.bin/localedef/parser.y +index 23b3b54f8a6e..e01330f0152d 100644 +--- a/usr.bin/localedef/parser.y ++++ b/usr.bin/localedef/parser.y +@@ -33,6 +33,7 @@ + * POSIX localedef grammar. + */ + ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c +index c6d45a993f28..b17670ef4b4a 100644 +--- a/usr.bin/localedef/scanner.c ++++ b/usr.bin/localedef/scanner.c +@@ -32,6 +32,7 @@ + * This file contains the "scanner", which tokenizes the input files + * for localedef for processing by the higher level grammar processor. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c +index 7a56e244c921..0e409a742d0a 100644 +--- a/usr.bin/localedef/time.c ++++ b/usr.bin/localedef/time.c +@@ -31,6 +31,7 @@ + /* + * LC_TIME database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c +index 062e120e6912..a199cddb198d 100644 +--- a/usr.bin/localedef/wide.c ++++ b/usr.bin/localedef/wide.c +@@ -34,6 +34,7 @@ + * to the wide character forms used internally by libc. Unfortunately, + * this approach means that we need a method for each and every encoding. + */ ++#include + #include + #include + #include diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/more-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/more-gnu-date.patch new file mode 100644 index 000000000000..1fd2df7c1a71 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/more-gnu-date.patch @@ -0,0 +1,13 @@ +diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh +index 8541d61ed76c..368f233de1e1 100755 +--- a/stand/common/newvers.sh ++++ b/stand/common/newvers.sh +@@ -45,7 +45,7 @@ shift $((OPTIND - 1)) + LC_ALL=C; export LC_ALL + u=${USER-root} h=${HOSTNAME-`hostname`} + if [ -n "$SOURCE_DATE_EPOCH" ]; then +- if ! t=$(date -ur $SOURCE_DATE_EPOCH 2>/dev/null); then ++ if ! t=$(date -d @$SOURCE_DATE_EPOCH 2>/dev/null); then + echo "Invalid SOURCE_DATE_EPOCH" >&2 + exit 1 + fi diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/mount-use-path.patch new file mode 100644 index 000000000000..614c327dda69 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/mount-use-path.patch @@ -0,0 +1,18 @@ +diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c +index 2fcc94e40818..7de6da1bb20e 100644 +--- a/sbin/mount/mount.c ++++ b/sbin/mount/mount.c +@@ -155,12 +155,9 @@ exec_mountprog(const char *name, const char *execname, char *const argv[]) + EXIT(1); + case 0: /* Child. */ + /* Go find an executable. */ +- execvP(execname, _PATH_SYSPATH, argv); ++ execvp(execname, argv); + if (errno == ENOENT) { + xo_warn("exec %s not found", execname); +- if (execname[0] != '/') { +- xo_warnx("in path: %s", _PATH_SYSPATH); +- } + } + EXIT(1); + default: /* Parent. */ diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/mtree-Makefile.patch new file mode 100644 index 000000000000..2a6e560d1d28 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/mtree-Makefile.patch @@ -0,0 +1,13 @@ +--- a/contrib/mtree/Makefile 2023-12-04 23:02:13.919144141 -0700 ++++ b/contrib/mtree/Makefile 2023-12-04 23:02:58.371810109 -0700 +@@ -10,8 +10,8 @@ + SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \ + verify.c getid.c pack_dev.c only.c + .if (${HOSTPROG:U} == "") +-DPADD+= ${LIBUTIL} +-LDADD+= -lutil ++LIBADD+= ${LIBUTIL} ++#LIBADD+= -lutil + .endif + + CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/mknod diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/no-perms-BSD.include.dist.patch new file mode 100644 index 000000000000..9181c957b313 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/no-perms-BSD.include.dist.patch @@ -0,0 +1,11 @@ +--- a/etc/mtree/BSD.include.dist ++++ b/etc/mtree/BSD.include.dist +@@ -3,7 +3,7 @@ + # Please see the file src/etc/mtree/README before making changes to this file. + # + +-/set type=dir uname=root gname=wheel mode=0755 tags=package=clibs-dev ++/set type=dir + . + arpa + .. diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-no-verify.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-no-verify.patch new file mode 100644 index 000000000000..ea088c8afb73 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-no-verify.patch @@ -0,0 +1,17 @@ +--- a/libexec/rc/rc 2024-08-25 17:13:49.568517103 -0700 ++++ b/libexec/rc/rc 2024-08-25 17:14:00.909389872 -0700 +@@ -62,14 +62,7 @@ + sh /etc/rc.initdiskless + fi + +-# Run these after determining whether we are booting diskless in order +-# to minimize the number of files that are needed on a diskless system, +-# and to make the configuration file variables available to rc itself. +-# +-# -o verify has no effect if mac_veriexec is not active +-set -o verify + . /etc/rc.subr +-set +o verify + load_rc_config $rc_config_xtra + + if have DebugOn; then diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-user.patch new file mode 100644 index 000000000000..27e8f9a13f21 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-user.patch @@ -0,0 +1,17 @@ +diff --git a/libexec/rc/rc b/libexec/rc/rc +index 0ea61a4b2c0a..d9bfb228224c 100644 +--- a/libexec/rc/rc ++++ b/libexec/rc/rc +@@ -87,6 +87,12 @@ if ! [ -e ${firstboot_sentinel} ]; then + skip_firstboot="-s firstboot" + fi + ++if [ -z "$USER_LOGIN" ]; then ++ skip="$skip -s user" ++else ++ skip="$skip -k user" ++fi ++ + # Do a first pass to get everything up to $early_late_divider so that + # we can do a second pass that includes $local_startup directories + # diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-makefile-nolibsys.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-makefile-nolibsys.patch new file mode 100644 index 000000000000..76b4adf75be6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-makefile-nolibsys.patch @@ -0,0 +1,10 @@ +diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile +index b6ff7681e658..9a65abcab442 100644 +--- a/libexec/rtld-elf/Makefile ++++ b/libexec/rtld-elf/Makefile +@@ -131,4 +131,4 @@ CFLAGS+= -Wno-redundant-decls + + # Add dependencies on libc and libsys archives after bsd.prog.mk + # includes bsd.libnames.mk so they are defined. +-rtld_libc.a: ${LIBC_NOSSP_PIC} ${LIBSYS_PIC} ++rtld_libc.a: ${LIBC_NOSSP_PIC} diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch new file mode 100644 index 000000000000..45f0d0c51eec --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch @@ -0,0 +1,10 @@ +--- a/libexec/rtld-elf/Makefile ++++ b/libexec/rtld-elf/Makefile +@@ -86,7 +86,6 @@ + + # Some of the required math functions (div & mod) are implemented in + # libcompiler_rt on some architectures. +-LIBADD+= compiler_rt + + .include + ${PROG_FULL}: ${VERSION_MAP} diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/stand-label.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/stand-label.patch new file mode 100644 index 000000000000..7ce4cab5d7bb --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/stand-label.patch @@ -0,0 +1,390 @@ +diff --git a/stand/common/disk.c b/stand/common/disk.c +index c1650f0fa..1baf91efa 100644 +--- a/stand/common/disk.c ++++ b/stand/common/disk.c +@@ -468,7 +468,7 @@ disk_parsedev(struct devdesc **idev, const char *devspec, const char **path) + + if (*cp != '\0' && *cp != ':') + return (EINVAL); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->dd.d_unit = unit; +diff --git a/stand/efi/include/efi.h b/stand/efi/include/efi.h +index b603c3a78..d430a7012 100644 +--- a/stand/efi/include/efi.h ++++ b/stand/efi/include/efi.h +@@ -74,14 +74,16 @@ typedef uint32_t UINTN; + #include "efidef.h" + #include "efidevp.h" + #include "efipciio.h" +-#include "efiprot.h" + #include "eficon.h" ++#include "efiapi.h" ++#include "efipart.h" ++#include "efigpt.h" ++#include "efiprot.h" + #include "eficonsctl.h" + #include "efiser.h" + #include "efi_nii.h" + #include "efipxebc.h" + #include "efinet.h" +-#include "efiapi.h" + #include "efifs.h" + #include "efierr.h" + #include "efigop.h" +@@ -91,6 +93,7 @@ typedef uint32_t UINTN; + #include "efipoint.h" + #include "efiuga.h" + #include ++#include "efichar.h" + + /* + * Global variables +diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h +index e1920430a..3bbd83a50 100644 +--- a/stand/efi/include/efilib.h ++++ b/stand/efi/include/efilib.h +@@ -40,6 +40,7 @@ extern EFI_RUNTIME_SERVICES *RS; + extern struct devsw efipart_fddev; + extern struct devsw efipart_cddev; + extern struct devsw efipart_hddev; ++extern struct devsw efipart_label; + extern struct devsw efihttp_dev; + extern struct devsw efinet_dev; + extern struct netif_driver efinetif; +@@ -58,6 +59,7 @@ typedef struct pdinfo + uint32_t pd_unit; /* unit number */ + uint32_t pd_open; /* reference counter */ + void *pd_bcache; /* buffer cache data */ ++ char pd_volname[36*2]; + struct pdinfo *pd_parent; /* Linked items (eg partitions) */ + struct devsw *pd_devsw; /* Back pointer to devsw */ + } pdinfo_t; +diff --git a/stand/efi/include/efiprot.h b/stand/efi/include/efiprot.h +index be11ea83b..1463c756c 100644 +--- a/stand/efi/include/efiprot.h ++++ b/stand/efi/include/efiprot.h +@@ -632,4 +632,41 @@ typedef struct _EFI_COMPONENT_NAME2 { + CHAR8 **SupportedLanguages; + } EFI_COMPONENT_NAME2; + ++// ++// Partition Info Protocol ++// ++ ++#define PARTITION_INFO_PROTOCOL \ ++ { 0x8cf2f62c, 0xbc9b, 0x4821, {0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0} } ++ ++INTERFACE_DECL(_EFI_PARTITION_INFO); ++ ++#define EFI_PARTITION_INFO_INTERFACE_REVISION 0x0001000 ++#define PARTITION_TYPE_OTHER 0x00 ++#define PARTITION_TYPE_MBR 0x01 ++#define PARTITION_TYPE_GPT 0x02 ++ ++#pragma pack(1) ++ ++typedef struct _EFI_PARTITION_INFO { ++ ++ UINT32 Revision; ++ UINT32 Type; ++ UINT8 System; ++ UINT8 Reserved[7]; ++ union { ++ /// ++ /// MBR data ++ /// ++ MBR_PARTITION_RECORD Mbr; ++ ++ /// ++ /// GPT data ++ /// ++ EFI_PARTITION_ENTRY Gpt; ++ } Info; ++} EFI_PARTITION_INFO; ++ ++#pragma pack() ++ + #endif +diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c +index 3df603457..a7b6050ff 100644 +--- a/stand/efi/libefi/efipart.c ++++ b/stand/efi/libefi/efipart.c +@@ -35,11 +35,10 @@ + + #include + #include +-#include +-#include + #include + + static EFI_GUID blkio_guid = BLOCK_IO_PROTOCOL; ++static EFI_GUID partinfo_guid = PARTITION_INFO_PROTOCOL; + + typedef bool (*pd_test_cb_t)(pdinfo_t *, pdinfo_t *); + static int efipart_initfd(void); +@@ -58,6 +57,12 @@ static int efipart_printfd(int); + static int efipart_printcd(int); + static int efipart_printhd(int); + ++static int efipart_get_volname(EFI_HANDLE h, char *dest, int size); ++static int label_parsedev(struct devdesc **idev, const char *devspec, const char **path); ++ ++static char *nullfmt(struct devdesc *vdev); ++static int nullinit(void); ++ + /* EISA PNP ID's for floppy controllers */ + #define PNP0604 0x604 + #define PNP0700 0x700 +@@ -104,6 +109,20 @@ struct devsw efipart_hddev = { + .dv_parsedev = disk_parsedev, + }; + ++struct devsw efipart_label = { ++ .dv_name = "label", ++ .dv_type = DEVT_LABEL, ++ .dv_init = nullinit, ++ .dv_strategy = efipart_strategy, ++ .dv_open = efipart_open, ++ .dv_close = efipart_close, ++ .dv_ioctl = efipart_ioctl, ++ .dv_print = efipart_printhd, ++ .dv_cleanup = nullsys, ++ .dv_fmtdev = nullfmt, ++ .dv_parsedev = label_parsedev, ++}; ++ + static pdinfo_list_t fdinfo = STAILQ_HEAD_INITIALIZER(fdinfo); + static pdinfo_list_t cdinfo = STAILQ_HEAD_INITIALIZER(cdinfo); + static pdinfo_list_t hdinfo = STAILQ_HEAD_INITIALIZER(hdinfo); +@@ -406,6 +425,8 @@ efipart_inithandles(void) + pd->pd_handle = hin[i]; + pd->pd_devpath = devpath; + pd->pd_blkio = blkio; ++ /* Do not fail here */ ++ efipart_get_volname(hin[i], pd->pd_volname, sizeof(pd->pd_volname)); + STAILQ_INSERT_TAIL(&pdinfo, pd, pd_link); + } + +@@ -419,6 +440,20 @@ efipart_inithandles(void) + return (0); + } + ++static int ++efipart_get_volname(EFI_HANDLE h, char *dest, int size) ++{ ++ EFI_PARTITION_INFO *partinfo; ++ int status; ++ ++ status = OpenProtocolByHandle(h, &partinfo_guid, (void **)&partinfo); ++ if (EFI_ERROR(status)) { ++ return (efi_status_to_errno(status)); ++ } ++ cpy16to8(partinfo->Info.Gpt.PartitionName, dest, size); ++ return (0); ++} ++ + /* + * Get node identified by pd_test() from plist. + */ +@@ -1249,3 +1284,99 @@ efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t size, + free(blkbuf); + return (rc); + } ++ ++static pdinfo_t * ++label_lookup_part(const char *label, struct devsw **dev) ++{ ++ pdinfo_t *dp, *pp; ++ ++ /* ++ * Check hard disks, then cd, then floppy ++ */ ++ STAILQ_FOREACH(dp, &hdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_hddev; ++ return (dp); ++ } ++ STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { ++ if (!strcmp(label, pp->pd_volname)) { ++ *dev = &efipart_hddev; ++ return (pp); ++ } ++ } ++ } ++ STAILQ_FOREACH(dp, &cdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_cddev; ++ return (dp); ++ } ++ STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { ++ if (!strcmp(label, pp->pd_volname)) { ++ *dev = &efipart_cddev; ++ return (pp); ++ } ++ } ++ } ++ STAILQ_FOREACH(dp, &fdinfo, pd_link) { ++ if (!strcmp(label, dp->pd_volname)) { ++ *dev = &efipart_fddev; ++ return (dp); ++ } ++ } ++ return (NULL); ++} ++ ++static int ++label_parsedev(struct devdesc **idev, const char *devspec, const char **path) ++{ ++ pdinfo_t *part; ++ const char *devspeci, *devspecp; ++ char *label; ++ struct disk_devdesc *dev; ++ ++ if (strncmp(devspec, "label:", strlen("label:"))) { ++ return (EINVAL); ++ } ++ devspeci = devspec + strlen("label:"); ++ devspecp = strchr(devspeci, ':'); ++ if (devspecp == NULL) { ++ return (EINVAL); ++ } ++ label = malloc(devspecp - devspeci + 1); ++ if (label == NULL) { ++ return (ENOMEM); ++ } ++ memcpy(label, devspeci, devspecp - devspeci); ++ label[devspecp - devspeci] = 0; ++ ++ dev = calloc(sizeof(*dev), 1); ++ if (dev == NULL) ++ return (ENOMEM); ++ ++ part = label_lookup_part(label, &dev->dd.d_dev); ++ if (part == NULL) { ++ return (ENOENT); ++ } ++ ++ dev->dd.d_unit = part->pd_parent->pd_unit; ++ dev->d_slice = part->pd_unit; ++ dev->d_partition = D_PARTISGPT; ++ *idev = &dev->dd; ++ if (path != NULL) { ++ *path = devspecp + 1; ++ } ++ ++ return (0); ++} ++ ++static char * ++nullfmt(struct devdesc *vdev) ++{ ++ return (""); ++} ++ ++static int ++nullinit(void) ++{ ++ return (0); ++} +diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c +index 3bc74ea63..042aa15b3 100644 +--- a/stand/efi/loader/conf.c ++++ b/stand/efi/loader/conf.c +@@ -40,6 +40,7 @@ struct devsw *devsw[] = { + &efipart_fddev, + &efipart_cddev, + &efipart_hddev, ++ &efipart_label, + &efihttp_dev, /* ordering with efinet_dev matters */ + #if defined(LOADER_NET_SUPPORT) + &efinet_dev, +diff --git a/stand/kboot/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c +index a9117d4c1..fc98bf534 100644 +--- a/stand/kboot/kboot/hostdisk.c ++++ b/stand/kboot/kboot/hostdisk.c +@@ -465,7 +465,7 @@ hostdisk_parsedev(struct devdesc **idev, const char *devspec, const char **path) + return (EINVAL); + } + free(fn); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->d_unit = 0; +diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c +index 5e3a789c1..dd7eb2cf8 100644 +--- a/stand/libofw/devicename.c ++++ b/stand/libofw/devicename.c +@@ -98,7 +98,7 @@ ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char **path + + if (ofw_path_to_handle(devspec, ofwtype, &rem_path) == -1) + return (ENOENT); +- idev = malloc(sizeof(struct ofw_devdesc)); ++ idev = calloc(sizeof(struct ofw_devdesc), 1); + if (idev == NULL) { + printf("ofw_parsedev: malloc failed\n"); + return ENOMEM; +diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c +index 1edc843d5..841615588 100644 +--- a/stand/libsa/dev.c ++++ b/stand/libsa/dev.c +@@ -72,7 +72,7 @@ default_parsedev(struct devdesc **dev, const char *devspec, + int unit, err; + char *cp; + +- idev = malloc(sizeof(struct devdesc)); ++ idev = calloc(sizeof(struct devdesc), 1); + if (idev == NULL) + return (ENOMEM); + +@@ -139,7 +139,8 @@ devparse(struct devdesc **dev, const char *devspec, const char **path) + if (err != 0) + return (err); + +- idev->d_dev = dv; ++ if (idev->d_dev == NULL) ++ idev->d_dev = dv; + if (dev != NULL) + *dev = idev; + else +diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h +index 260defa3a..8fb5c818d 100644 +--- a/stand/libsa/stand.h ++++ b/stand/libsa/stand.h +@@ -148,6 +148,7 @@ struct devsw { + #define DEVT_CD 3 + #define DEVT_ZFS 4 + #define DEVT_FD 5 ++#define DEVT_LABEL 6 + int (*dv_init)(void); /* early probe call */ + int (*dv_strategy)(void *devdata, int rw, daddr_t blk, + size_t size, char *buf, size_t *rsize); +diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c +index 70a102f64..2f7c1caaa 100644 +--- a/stand/libsa/zfs/zfs.c ++++ b/stand/libsa/zfs/zfs.c +@@ -1643,7 +1643,7 @@ zfs_parsedev(struct devdesc **idev, const char *devspec, const char **path) + spa = spa_find_by_name(poolname); + if (!spa) + return (ENXIO); +- dev = malloc(sizeof(*dev)); ++ dev = calloc(sizeof(*dev), 1); + if (dev == NULL) + return (ENOMEM); + dev->pool_guid = spa->spa_guid; +diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c +index 4ee9c7fd7..23670d759 100644 +--- a/stand/uboot/devicename.c ++++ b/stand/uboot/devicename.c +@@ -102,7 +102,7 @@ uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, + } + if (dv == NULL) + return(ENOENT); +- idev = malloc(sizeof(struct uboot_devdesc)); ++ idev = calloc(sizeof(struct uboot_devdesc), 1); + err = 0; + np = (devspec + strlen(dv->dv_name)); + diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-gnu-date.patch new file mode 100644 index 000000000000..64d36f7dcfbc --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-gnu-date.patch @@ -0,0 +1,13 @@ +diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh +index c594724d814..d5287c7b992 100644 +--- a/sys/conf/newvers.sh ++++ b/sys/conf/newvers.sh +@@ -177,7 +177,7 @@ u=${USER:-root} + d=$(pwd) + h=${HOSTNAME:-$(hostname)} + if [ -n "$SOURCE_DATE_EPOCH" ]; then +- if ! t=$(date -ur $SOURCE_DATE_EPOCH 2>/dev/null); then ++ if ! t=$(date -d @$SOURCE_DATE_EPOCH 2>/dev/null); then + echo "Invalid SOURCE_DATE_EPOCH" >&2 + exit 1 + fi diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-no-explicit-intrinsics-dep.patch new file mode 100644 index 000000000000..ce11dc450207 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/sys-no-explicit-intrinsics-dep.patch @@ -0,0 +1,41 @@ +--- a/sys/modules/aesni/Makefile 2023-12-16 09:19:28.454892154 -0700 ++++ b/sys/modules/aesni/Makefile 2023-12-16 09:19:41.975047684 -0700 +@@ -1,5 +1,4 @@ + .PATH: ${SRCTOP}/sys/crypto/aesni +-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers + + KMOD= aesni + SRCS= aesni.c +@@ -39,8 +38,8 @@ + aesni_ghash.o: aesni.h + aesni_wrap.o: aesni.h + aesni_ccm.o: aesni.h +-intel_sha1.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h +-intel_sha256.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h ++intel_sha1.o: sha_sse.h ++intel_sha256.o: sha_sse.h + + .include + +diff --git a/sys/modules/blake2/Makefile b/sys/modules/blake2/Makefile +index e4b3fb9f126..5bfd9c2ae02 100644 +--- a/sys/modules/blake2/Makefile ++++ b/sys/modules/blake2/Makefile +@@ -3,7 +3,6 @@ + .PATH: ${SRCTOP}/sys/contrib/libb2 + .PATH: ${SRCTOP}/sys/crypto/blake2 + .PATH: ${SRCTOP}/sys/opencrypto +-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers + + KMOD = blake2 + +@@ -64,8 +63,7 @@ ${src:S/.c/.o/}: ${src} + -D_MM_MALLOC_H_INCLUDED -Wno-unused-function ${.IMPSRC} + ${CTFCONVERT_CMD} + +-${src:S/.c/.o/}: intrin.h emmintrin.h tmmintrin.h smmintrin.h immintrin.h \ +- x86intrin.h ${SRCS:M*.h} ++${src:S/.c/.o/}: ${SRCS:M*.h} + .endfor + + # FreeBSD-specific sources: diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/tinfo-host-cc.patch new file mode 100644 index 000000000000..6446322a8a0a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/tinfo-host-cc.patch @@ -0,0 +1,15 @@ +--- a/lib/ncurses/tinfo/Makefile 2023-12-26 23:02:07.827892619 -0800 ++++ b/lib/ncurses/tinfo/Makefile 2023-12-26 23:01:24.175546100 -0800 +@@ -282,10 +282,10 @@ + build-tools: make_hash make_keys + + make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c + + make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ + ${NCURSES_DIR}/ncurses/tinfo/make_hash.c + .endif + .if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/arp.nix b/pkgs/os-specific/bsd/freebsd/pkgs/arp.nix new file mode 100644 index 000000000000..467ef8d7080e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/arp.nix @@ -0,0 +1,12 @@ +{ + lib, + mkDerivation, + libxo, +}: +mkDerivation { + path = "usr.sbin/arp"; + buildInputs = [ libxo ]; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "arp"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix index 0e058a790030..73e9894c2b92 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix @@ -63,6 +63,10 @@ mkDerivation { sed -E -i -e 's/mktemp -t ka/mktemp -t kaXXXXXX/' $BSDSRCDIR/bin/sh/mkbuiltins $BSDSRCDIR/bin/sh/mktokens ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-unterminated-string-initialization" + ]; + preBuild = '' export NIX_CFLAGS_COMPILE="-I$BSDSRCDIR/sys $NIX_CFLAGS_COMPILE" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index d56026227294..ce0e5a7c5918 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -65,6 +65,57 @@ mkDerivation { "sys/sys/bitstring.h" "sys/sys/nv_namespace.h" ] + ++ lib.optionals (versionData.major >= 15) [ + "crypto/krb5/src/include/gssapi.h" + "crypto/krb5/src/include/kdb.h" + "crypto/krb5/src/include/krb5.h" + "crypto/krb5/src/include/krad.h" + "crypto/krb5/src/include/gssrpc/auth.h" + "crypto/krb5/src/include/gssrpc/auth_gss.h" + "crypto/krb5/src/include/gssrpc/auth_gssapi.h" + "crypto/krb5/src/include/gssrpc/auth_unix.h" + "crypto/krb5/src/include/gssrpc/clnt.h" + "crypto/krb5/src/include/gssrpc/netdb.h" + "crypto/krb5/src/include/gssrpc/pmap_clnt.h" + "crypto/krb5/src/include/gssrpc/pmap_prot.h" + "crypto/krb5/src/include/gssrpc/pmap_rmt.h" + "crypto/krb5/src/include/gssrpc/rename.h" + "crypto/krb5/src/include/gssrpc/rpc_msg.h" + "crypto/krb5/src/include/gssrpc/rpc.h" + "crypto/krb5/src/include/gssrpc/svc_auth.h" + "crypto/krb5/src/include/gssrpc/svc.h" + "krb5/include/gssrpc/types.h" + "crypto/krb5/src/include/gssrpc/xdr.h" + "crypto/krb5/src/util/et/com_err.h" + "crypto/krb5/src/util/verto/verto-module.h" + "crypto/krb5/src/util/verto/verto.h" + "crypto/krb5/src/lib/gssapi/krb5/gssapi_krb5.h" + "crypto/krb5/src/lib/gssapi/generic/gssapi_alloc.h" + "crypto/krb5/src/lib/gssapi/generic/gssapi_generic.h" + "crypto/krb5/src/lib/gssapi/generic/gssapi_ext.h" + "crypto/krb5/src/include/krb5/ccselect_plugin.h" + "crypto/krb5/src/include/krb5/certauth_plugin.h" + "crypto/krb5/src/include/krb5/clpreauth_plugin.h" + "crypto/krb5/src/include/krb5/hostrealm_plugin.h" + "crypto/krb5/src/include/krb5/kadm5_auth_plugin.h" + "crypto/krb5/src/include/krb5/kadm5_hook_plugin.h" + "crypto/krb5/src/include/krb5/kdcpolicy_plugin.h" + "crypto/krb5/src/include/krb5/kdcpreauth_plugin.h" + "crypto/krb5/src/include/krb5/localauth_plugin.h" + "crypto/krb5/src/include/krb5/locate_plugin.h" + "crypto/krb5/src/include/krb5/plugin.h" + "crypto/krb5/src/include/krb5/preauth_plugin.h" + "crypto/krb5/src/include/krb5/pwqual_plugin.h" + + "sys/sys/_callout.h" + "sys/sys/_lock.h" + "sys/sys/_lockmgr.h" + "sys/sys/_task.h" + "sys/sys/_nv.h" + "sys/sys/md4.h" + + "contrib/libedit/readline/readline.h" + ] ++ [ # Listed in Makefile as SYSINCS diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix index 9e653bb4f51e..d1a0cb695a41 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix @@ -3,6 +3,7 @@ mkDerivation, compatIfNeeded, libdwarf, + libelf, zlib, libspl, }: @@ -29,6 +30,7 @@ mkDerivation { libdwarf zlib libspl + libelf ]; meta.license = lib.licenses.cddl; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ctfmerge.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ctfmerge.nix new file mode 100644 index 000000000000..2803df747350 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ctfmerge.nix @@ -0,0 +1,35 @@ +{ + lib, + mkDerivation, + compatIfNeeded, + libelf, + zlib, + libspl, +}: + +mkDerivation { + path = "cddl/usr.bin/ctfmerge"; + extraPaths = [ + "cddl/compat/opensolaris" + "cddl/contrib/opensolaris" + "sys/cddl/compat/opensolaris" + "sys/cddl/contrib/opensolaris" + "sys/contrib/openzfs" + ]; + OPENSOLARIS_USR_DISTDIR = "$(SRCTOP)/cddl/contrib/opensolaris"; + OPENSOLARIS_SYS_DISTDIR = "$(SRCTOP)/sys/cddl/contrib/opensolaris"; + + makeFlags = [ + "STRIP=-s" + "MK_WERROR=no" + "MK_TESTS=no" + ]; + + buildInputs = compatIfNeeded ++ [ + zlib + libspl + libelf + ]; + + meta.license = lib.licenses.cddl; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix new file mode 100644 index 000000000000..243a7c577748 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix @@ -0,0 +1,51 @@ +{ + lib, + mkDerivation, + libutil, + flex, + byacc, +}: +mkDerivation { + path = "sbin/devd"; + + outputs = [ + "out" + "etc" + "man" + "debug" + ]; + + buildInputs = [ + libutil + ]; + + extraNativeBuildInputs = [ + flex + byacc + ]; + + clangFixup = false; + + MK_TESTS = "no"; + MK_AUTOFS = "yes"; + MK_BLUETOOTH = "yes"; + MK_HYPERV = "yes"; + MK_USB = "yes"; + MK_ZFS = "yes"; + + postPatch = '' + substituteInPlace $BSDSRCDIR/sbin/devd/Makefile --replace-fail /etc $etc/etc + ''; + + NIX_CFLAGS_COMPILE = [ + "-Wno-c++20-extensions" + "-Wno-nullability-completeness" + ]; + + postInstall = '' + make $makeFlags installconfig + ''; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "devd"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix index 4f4595b1b6fb..08cfbc537640 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix @@ -8,18 +8,24 @@ withIntel ? true, }: mkDerivation rec { + path = "..."; pname = "drm-kmod-firmware" + lib.optionalString withAmd "-amd" + lib.optionalString withIntel "-intel"; - version = "20230625_8"; + version = "20230625_4"; # there is a _8 but freebsd-ports is pinned to _4 src = fetchFromGitHub { owner = "freebsd"; repo = "drm-kmod-firmware"; rev = version; - hash = "sha256-Ly9B0zf+YODel/X1sZYVVUVWh38faNLhkcXcjEnQwII="; + hash = "sha256-RS8uXZMYoHfjDSC0OUJUU81eR8rLlEgFhuh+Y7+kXtA="; }; + outputs = [ + "out" + "debug" + ]; + extraNativeBuildInputs = [ buildFreebsd.xargs-j ]; hardeningDisable = [ @@ -39,9 +45,16 @@ mkDerivation rec { env = sys.passthru.env; SYSDIR = "${sys.src}/sys"; + KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; KMODDIR = "${placeholder "out"}/kernel"; + makeFlags = [ + "DEBUG_FLAGS=-g" + ]; + meta = { description = "GPU firmware for FreeBSD drm-kmod"; platforms = lib.platforms.freebsd; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix index e18446b1c434..3807b9f01c9b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix @@ -11,9 +11,9 @@ let reldate = lib.toIntBase10 versionData.reldate; branch = if reldate >= 1500008 then - "6.1-lts" + "6.6-lts" else if reldate >= 1400097 then - "5.15-lts" + "6.1-lts" else if reldate >= 1302000 then "5.10-lts" else @@ -21,15 +21,21 @@ let fetchOptions = (lib.importJSON ./versions.json).${branch}; in -mkDerivation { +mkDerivation rec { # this derivation is tricky; it is not an in-tree FreeBSD build but it is meant to be built # at the same time as the in-tree FreeBSD code, so it expects the same environment. Therefore, # it is appropriate to use the freebsd mkDerivation. + path = "..."; pname = "drm-kmod"; version = branch; src = fetchFromGitHub fetchOptions; + outputs = [ + "out" + "debug" + ]; + extraNativeBuildInputs = [ xargs-j ]; hardeningDisable = [ @@ -38,12 +44,31 @@ mkDerivation { ]; # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + NIX_CFLAGS_COMPILE = [ + "-fno-stack-protector" + "-Wno-unneeded-internal-declaration" # some openzfs code trips this + "-Wno-default-const-init-field-unsafe" # added in clang 21 + "-Wno-uninitialized-const-pointer" # added in clang 21 + "-Wno-format" # error: passing 'printf' format string where 'freebsd_kprintf' format string is expected + "-Wno-sometimes-uninitialized" # this one is actually kind of concerning but it does trip + "-Wno-unused-function" + ]; env = sys.passthru.env; SYSDIR = "${sys.src}/sys"; KMODDIR = "${placeholder "out"}/kernel"; + KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; + + preBuild = '' + mkdir -p linuxkpi/dummy/include + ''; + + makeFlags = [ + "DEBUG_FLAGS=-g" + ]; meta = { description = "Linux drm driver, ported to FreeBSD"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py index c724e3cbd104..cb3a4c592446 100755 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py @@ -5,7 +5,7 @@ import subprocess import json import os.path -BRANCHES = ["5.10-lts", "5.15-lts", "6.1-lts"] +BRANCHES = ["5.10-lts", "5.15-lts", "6.1-lts", "6.6-lts"] BASE_DIR = os.path.dirname(os.path.abspath(__file__)) versions = dict() diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json index 9375e53e9d4d..bd413bf3d5aa 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json @@ -1,20 +1,26 @@ { "5.10-lts": { - "hash": "sha256-6v8FhaEch9fJfo0/1UXeo0bcZh5n4Y2TyAsyHmCBJgw=", + "hash": "sha256-cmjdoqgCs4Rm7z0VzlDB5eJGdEWKl9uqZ+vcHqc6gbU=", "owner": "freebsd", "repo": "drm-kmod", - "rev": "e7950546196d44af502dd6abf162d1453f6f0dd0" + "rev": "17498c322eeae74eea80d4c2589540a059bb59e5" }, "5.15-lts": { - "hash": "sha256-i768QfnYo2hqxnoCEnfYqOurDSRwkAsC4qsP7TUalxc=", + "hash": "sha256-R/OHaqjzY4CkUeW/zNj34UzUr8nRk0iALShHQa7efZU=", "owner": "freebsd", "repo": "drm-kmod", - "rev": "d7dc64fb8e63208afaca01e6d48284aa2305df35" + "rev": "9efcad4186ed869300e41b759598c3cb057b0753" }, "6.1-lts": { - "hash": "sha256-+CsqQ0beJgoO3SSWzwLcAO8JP15oaDW9HR+bxwPaan4=", + "hash": "sha256-CWLUA8SGhQ8FZ/8y1iKhLdK7qx0r4IHLnNG2+oQkHBw=", "owner": "freebsd", "repo": "drm-kmod", - "rev": "f2d6d4b58446fa45de575bae76d6435439b3ca8b" + "rev": "f52b90d97d3bcefe4b2f09cad1ae668ffff99c53" + }, + "6.6-lts": { + "hash": "sha256-XY+Q2AqS3t2rPL/aaFzjaOUgAn5IL0bXUPjkzp+qz1Y=", + "owner": "freebsd", + "repo": "drm-kmod", + "rev": "b0b44e1905934a37d8d4870791b36b3e8ff1face" } } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/elfcopy.nix b/pkgs/os-specific/bsd/freebsd/pkgs/elfcopy.nix new file mode 100644 index 000000000000..2cd0aeac2b83 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/elfcopy.nix @@ -0,0 +1,27 @@ +{ + mkDerivation, + compatIfNeeded, + libelf, + libelftc, + libarchive, + libpe, +}: + +mkDerivation { + path = "usr.bin/elfcopy"; + extraPaths = [ + "contrib/elftoolchain" + "sys/sys/elf_common.h" + "sys/sys/elf32.h" + ]; + + buildInputs = compatIfNeeded ++ [ + libelf + libelftc + libarchive + libpe + ]; + + # since we built libpe and co separate they are not internal and thus not pie...? + MK_PIE = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix index 99b8d74ec4ed..0dc679df1cd8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix @@ -6,5 +6,9 @@ mkDerivation { "sbin/fsck" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-unterminated-string-initialization" + ]; + meta.platforms = lib.platforms.freebsd; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/growfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/growfs.nix new file mode 100644 index 000000000000..02f8988342c1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/growfs.nix @@ -0,0 +1,28 @@ +{ + lib, + mkDerivation, + libufs, + libutil, +}: +mkDerivation { + path = "sbin/growfs"; + extraPaths = [ + "sbin/mount" + ]; + + buildInputs = [ + libufs + libutil + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + MK_TESTS = "no"; + + meta.mainProgram = "growfs"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kbdmap.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kbdmap.nix new file mode 100644 index 000000000000..9f3b3b0742bf --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kbdmap.nix @@ -0,0 +1,21 @@ +{ + lib, + mkDerivation, + libbsddialog, +}: +mkDerivation { + path = "usr.sbin/kbdmap"; + + outputs = [ + "out" + "man" + "debug" + ]; + + buildInputs = [ + libbsddialog + ]; + + meta.mainProgram = "kbdmap"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix index fd092950b2da..4119b0690cee 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix @@ -4,12 +4,24 @@ mkDerivation, compatIfNeeded, libelf, + elfcopy, }: mkDerivation { path = "usr.sbin/kldxref"; + extraPaths = [ + "lib/libkldelf" + ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ libelf ] ++ compatIfNeeded; + extraNativeBuildInputs = [ + elfcopy + ]; + + preBuild = '' + make -C $BSDSRCDIR/lib/libkldelf $makeFlags + ''; + # We symlink in our modules, make it follow symlinks postPatch = '' sed -i 's/FTS_PHYSICAL/FTS_LOGICAL/' $BSDSRCDIR/usr.sbin/kldxref/kldxref.c diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix index c5977cb80c4c..6ad205b215ab 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix @@ -7,6 +7,8 @@ gencat, csu, i18n, + libsys, + llvmPackages, extraSrc ? [ ], }: @@ -18,6 +20,7 @@ mkDerivation { "lib/msun" "lib/libmd" "lib/libutil" + "lib/libsys" "libexec/rtld-elf" "include/rpcsvc" "contrib/libc-pwcache" @@ -34,6 +37,7 @@ mkDerivation { "etc/master.passwd" "etc/shells" "include/paths.h" + "include/gssapi" ] ++ extraSrc; @@ -47,6 +51,7 @@ mkDerivation { buildInputs = [ include + libsys ]; extraNativeBuildInputs = [ @@ -66,8 +71,10 @@ mkDerivation { substituteInPlace $BSDSRCDIR/include/paths.h --replace '/usr/share/i18n' '${i18n}/share/i18n' ''; + # -fno-blocks is a mystery to me--clang recognizes it and is like yeah we have blocks + # but compiler-rt is seemingly not providing Block.h. not sure why. preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I../libsys -B${csu}/lib -fno-blocks" ''; postBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcrypt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcrypt.nix index f5c90f841e67..c0179e9751f3 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcrypt.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcrypt.nix @@ -3,6 +3,7 @@ include, libcMinimal, libgcc, + libmd, csu, }: @@ -27,6 +28,7 @@ mkDerivation { include libcMinimal libgcc + libmd ]; preBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libctf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libctf.nix new file mode 100644 index 000000000000..73e330c4361c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libctf.nix @@ -0,0 +1,46 @@ +{ + lib, + mkDerivation, + libspl, + zlib, +}: +mkDerivation { + path = "cddl/lib/libctf"; + extraPaths = [ + "cddl/contrib/opensolaris/common/ctf" + "cddl/contrib/opensolaris/lib/libctf/common" + + "sys/contrib/openzfs/include" + "sys/contrib/openzfs/lib/libspl/include" + + "sys/cddl/compat/opensolaris" + "cddl/compat/opensolaris/include" + + "sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h" + "cddl/contrib/opensolaris/head" + "cddl/contrib/opensolaris/common/ctf" + "cddl/contrib/opensolaris/lib/libctf/common" + "sys/cddl/contrib/opensolaris/uts/common" + ]; + + outputs = [ + "out" + "man" + ]; + + buildInputs = [ + zlib + libspl + ]; + + preBuild = '' + export OPENSOLARIS_USR_DISTDIR=$BSDSRCDIR/cddl/contrib/opensolaris + export OPENSOLARIS_SYS_DISTDIR=$BSDSRCDIR/sys/cddl/contrib/opensolaris + ''; + + MK_WERROR = "no"; + + alwaysKeepStatic = true; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdevinfo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdevinfo.nix new file mode 100644 index 000000000000..d4c2dae684f9 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdevinfo.nix @@ -0,0 +1,15 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "lib/libdevinfo"; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix index 5f0b8109dae3..276fe18bdc9a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix @@ -3,6 +3,7 @@ include, libcMinimal, libgcc, + libsys, csu, }: @@ -26,6 +27,7 @@ mkDerivation { include libcMinimal libgcc + libsys ]; preBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix index ee4d57b021b1..cbd3bda91925 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix @@ -3,6 +3,7 @@ m4, compatIfNeeded, zlib, + libelf, }: mkDerivation { @@ -15,6 +16,9 @@ mkDerivation { "sys/sys/elf_common.h" ]; extraNativeBuildInputs = [ m4 ]; - buildInputs = compatIfNeeded ++ [ zlib ]; + buildInputs = compatIfNeeded ++ [ + zlib + libelf + ]; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelftc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelftc.nix new file mode 100644 index 000000000000..44a26482bc83 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelftc.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, + libelf, + compatIfNeeded, +}: +mkDerivation { + path = "lib/libelftc"; + extraPaths = [ + "contrib/elftoolchain" + "sys/sys/elf_common.h" + ]; + + buildInputs = compatIfNeeded ++ [ + libelf + ]; + + postPatch = '' + sed -E -i -e '/INTERNALLIB/d' lib/libelftc/Makefile + ''; + + alwaysKeepStatic = true; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix index c2de9562f6d5..f6f0598d849a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix @@ -23,6 +23,8 @@ mkDerivation ( extraPaths = [ "sys/crypto" "sys/sys" + "sys/kern" + "lib/libc/Versions.def" ] ++ extraSrc; @@ -34,6 +36,8 @@ mkDerivation ( noLibc = !bootstrapInstallation; + MK_TESTS = "no"; + buildInputs = lib.optionals (!bootstrapInstallation) [ libcMinimal diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-form.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-form.nix new file mode 100644 index 000000000000..81acde8cf242 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-form.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, + libncurses-tinfo, + libncurses, +}: +mkDerivation { + pname = "ncurses-form"; + path = "lib/ncurses/form"; + extraPaths = [ + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ]; + buildInputs = [ + libncurses-tinfo + libncurses + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnetgraph.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnetgraph.nix new file mode 100644 index 000000000000..f24cfda716dc --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnetgraph.nix @@ -0,0 +1,15 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "lib/libnetgraph"; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix index 2afb20377d6b..07eb78a04a11 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix @@ -2,6 +2,8 @@ mkDerivation, openssl, libradius, + libutil, + pwd_mkdb, }: mkDerivation { path = "lib/libpam/libpam"; @@ -15,6 +17,9 @@ mkDerivation { buildInputs = [ libradius openssl + (libutil.override { + withPwdMkdb = pwd_mkdb; + }) ]; MK_NIS = "no"; # TODO diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libpe.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libpe.nix new file mode 100644 index 000000000000..1abdef936041 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libpe.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "lib/libpe"; + extraPaths = [ + "contrib/elftoolchain" + "sys/sys/elf_common.h" + ]; + + postPatch = '' + sed -E -i -e '/INTERNALLIB/d' lib/libpe/Makefile + ''; + + alwaysKeepStatic = true; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libproc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libproc.nix new file mode 100644 index 000000000000..bcef5e4c0c7f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libproc.nix @@ -0,0 +1,34 @@ +{ + lib, + mkDerivation, + libctf, + librtld-db, + zlib, +}: +mkDerivation { + path = "lib/libproc"; + extraPaths = [ + "sys/contrib/openzfs/include" + "sys/contrib/openzfs/lib/libspl/include" + "sys/contrib/openzfs/lib/libspl/include" + "sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h" + "cddl/contrib/opensolaris/lib/libctf/common" + "sys/cddl/contrib/opensolaris/uts/common" + "sys/cddl/compat/opensolaris" + ]; + + buildInputs = [ + libctf + librtld-db + zlib + ]; + + outputs = [ + "out" + "debug" + ]; + + MK_TESTS = "no"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix index 7ed03a6b2662..88982f03552a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix @@ -18,6 +18,7 @@ mkDerivation { "sys/contrib/pcg-c" "sys/opencrypto" "sys/crypto" + "sys/modules/zfs" ] ++ extraSrc; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/librt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/librt.nix index 2cc2fc746153..fb921467e2f9 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/librt.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/librt.nix @@ -2,6 +2,7 @@ mkDerivation, include, libcMinimal, + libsys, libgcc, libthr, csu, @@ -26,6 +27,7 @@ mkDerivation { libcMinimal libgcc libthr + libsys ]; preBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/librtld-db.nix b/pkgs/os-specific/bsd/freebsd/pkgs/librtld-db.nix new file mode 100644 index 000000000000..6e8a2389d7d4 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/librtld-db.nix @@ -0,0 +1,25 @@ +{ + lib, + mkDerivation, + libelf, + libprocstat, +}: +mkDerivation { + path = "lib/librtld_db"; + extraPaths = [ + "lib/libproc/libproc.h" + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + buildInputs = [ + libelf + libprocstat + ]; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index 0aed42cbaa40..d327e17dda4a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -18,7 +18,6 @@ mkDerivation { alwaysKeepStatic = true; meta = with lib; { - platforms = platforms.freebsd; license = licenses.cddl; }; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix new file mode 100644 index 000000000000..67611f7e0ce1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix @@ -0,0 +1,35 @@ +{ + mkDerivation, + include, + csu, +}: + +mkDerivation { + pname = "libsys"; + path = "lib/libsys"; + extraPaths = [ + "sys/sys" + "lib/libc/string" + "lib/libc/include" + "lib/libc/Versions.def" + "lib/libcompat" + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + noLibc = true; + + buildInputs = [ + include + csu + ]; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I. -B${csu}/lib" + ''; + + alwaysKeepStatic = true; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix index 9d27a1577031..f2774d37b88c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix @@ -6,8 +6,12 @@ mkDerivation { "libexec/rtld-elf" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-unterminated-string-initialization" + ]; + preBuild = '' - sed -E -i -e "s|..INCLUDEDIR.|${stdenv.cc.libc}/include|g" $BSDSRCDIR/lib/libsysdecode/Makefile + sed -E -i -e "s|\\$\\{INCLUDEDIR\\}|${stdenv.cc.libc}/include|g" $BSDSRCDIR/lib/libsysdecode/Makefile ''; MK_TESTS = "no"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix index d60de4758af2..93852910f743 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix @@ -3,6 +3,7 @@ stdenv, fetchpatch, mkDerivation, + libsys, libcMinimal, include, libgcc, @@ -15,6 +16,7 @@ mkDerivation { extraPaths = [ "lib/libthread_db" "lib/libc" # needs /include + arch-specific files + "lib/libsys" "libexec/rtld-elf" ] ++ extraSrc; @@ -31,6 +33,7 @@ mkDerivation { libcMinimal include libgcc + libsys ]; patches = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libusb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libusb.nix new file mode 100644 index 000000000000..1318d967b7b6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libusb.nix @@ -0,0 +1,19 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "lib/libusb"; + + outputs = [ + "out" + "man" + "debug" + ]; + + postInstall = '' + mv $out/data/pkgconfig $out/lib/pkgconfig + ''; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libusbhid.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libusbhid.nix new file mode 100644 index 000000000000..62e1e70eb69b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libusbhid.nix @@ -0,0 +1,15 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "lib/libusbhid"; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index e28ec53331ee..bd2bf5d2bec8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,13 +1,18 @@ { + lib, mkDerivation, include, libgcc, libcMinimal, csu, + withPwdMkdb ? null, }: mkDerivation { path = "lib/libutil"; - extraPaths = [ "lib/libc/gen" ]; + extraPaths = [ + "lib/libc/gen" + "lib/libc/Versions.def" + ]; outputs = [ "out" @@ -23,6 +28,15 @@ mkDerivation { libcMinimal ]; + # XXX mass rebuild moment + postPatch = + if withPwdMkdb == null then + null + else + '' + substituteInPlace lib/libutil/pw_util.c --replace-fail _PATH_PWD_MKDB '"${lib.getExe withPwdMkdb}"' + ''; + preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib" ''; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix index ae57d195fd6a..565fdbddfa3f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix @@ -77,6 +77,8 @@ mkDerivation { "debug" ]; + MK_TESTS = "no"; + meta = { platforms = lib.platforms.freebsd; license = with lib.licenses; [ cddl ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/netstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/netstat.nix new file mode 100644 index 000000000000..fbe77f936516 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/netstat.nix @@ -0,0 +1,23 @@ +{ + lib, + mkDerivation, + libxo, + libutil, + libmemstat, + libjail, + libnetgraph, +}: +mkDerivation { + path = "usr.bin/netstat"; + + buildInputs = [ + libxo + libutil + libmemstat + libjail + libnetgraph + ]; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "netstat"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-driver/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-driver/package.nix new file mode 100644 index 000000000000..81bbed336fa3 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-driver/package.nix @@ -0,0 +1,48 @@ +{ + lib, + mkDerivation, + fetchurl, + sys, + drm-kmod, + xargs-j, +}: +mkDerivation rec { + path = "..."; + pname = "nvidia-driver"; + version = "570.124.04"; + src = fetchurl { + url = "https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${version}/NVIDIA-FreeBSD-x86_64-${version}.tar.xz"; + hash = "sha256-3FNJPZWg23H/YiUdIfO4KOUZ7BrJ2/xw8LD6MMSEICY="; + }; + + outputs = [ + "out" + "debug" + ]; + + extraNativeBuildInputs = [ + xargs-j + ]; + + preConfigure = '' + cd src + ''; + + makeFlags = [ + "BSDSRCTOP=${sys.src}" + "SYSDIR=${sys.src}/sys" + "DRMKMODDIR=${drm-kmod.src}" + "KMODDIR=${builtins.placeholder "out"}/kernel" + "NO_XREF=1" + "DEBUG_FLAGS=-g" + ]; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + ]; + + env.NIX_CFLAGS_COMPILE_AFTER = "-O0"; # XXX REMOVE + + meta.platforms = [ "x86_64-freebsd" ]; + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod-firmware/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod-firmware/package.nix new file mode 100644 index 000000000000..70f523abd1e7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod-firmware/package.nix @@ -0,0 +1,36 @@ +{ + lib, + mkDerivation, + sys, + xargs-j, + kldxref, + nvidia-drm-kmod, +}: +mkDerivation { + path = "..."; + pname = "nvidia-drm-kmod-firmware"; + inherit (nvidia-drm-kmod) version src; + + extraNativeBuildInputs = [ + xargs-j + kldxref + ]; + + makeFlags = [ + "SYSDIR=${sys.src}/sys" + "KMODDIR=${builtins.placeholder "out"}/kernel" + "NO_XREF=1" + ]; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + ]; + + preConfigure = '' + cd firmware + ''; + + meta.platforms = [ "x86_64-freebsd" ]; + meta.license = lib.licenses.unfreeRedistributableFirmware; + meta.sourceProvenance = [ lib.sourceTypes.binaryFirmware ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod/package.nix new file mode 100644 index 000000000000..7c1d55622ebc --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + mkDerivation, + fetchurl, + fetchpatch, + sys, + drm-kmod, + xargs-j, + nvidia-driver, +}: +mkDerivation rec { + path = "..."; + pname = "nvidia-drm-kmod"; + inherit (nvidia-driver) version src; + + outputs = [ + "out" + "debug" + ]; + + patches = + lib.optionals (lib.versionOlder version "565") [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/d07cdab9108a8cf6ab66aa1ff834339f8695f457/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h"; + extraPrefix = "a/src/nvidia-drm"; + hash = "sha256-EgzEx1VxQyoNpnY0MnNVa08A0ENSyU/rdRM2hOwUE2g="; + }) + ] + ++ lib.optionals (lib.versionOlder version "555") [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/d07cdab9108a8cf6ab66aa1ff834339f8695f457/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c"; + extraPrefix = "a/src/nvidia-drm"; + hash = "sha256-aFOs811J5e9Nu8Kwd6dImiSefEOlKlnRp3kg7DTIccg="; + }) + ]; + + postPatch = + lib.optionalString (lib.versionAtLeast version "570") '' + sed -E -i -e 's:\&nv_drm_fbdev_module_param\, 1\,:\&nv_drm_fbdev_module_param\, 0\,:' src/nvidia-drm/nvidia-drm-freebsd-lkpi.c + sed -E -i -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' src/nvidia-drm/nvidia-drm-os-interface.c + '' + + '' + sed -E -i -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' src/nvidia-drm/Makefile + + mkdir -p $TMP/bin + ln -s ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}nm $TMP/bin/nm + export PATH=$PATH:$TMP/bin + ''; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; # conftests rely on this + env.CONFTEST_BSD_KMODPATHS = "${sys}/kernel ${drm-kmod}/kernel"; + + extraNativeBuildInputs = [ + xargs-j + ]; + + preConfigure = '' + cd src/nvidia-drm + ''; + + makeFlags = [ + "BSDSRCTOP=${sys.src}" + "SYSDIR=${sys.src}/sys" + "DRMKMODDIR=${drm-kmod.src}" + "NO_XREF=1" + "DEBUG_FLAGS=-g" + ]; + + KMODDIR = "${builtins.placeholder "out"}/kernel"; + KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + ]; + + meta.platforms = [ "x86_64-freebsd" ]; + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix new file mode 100644 index 000000000000..fe15b8e71c56 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix @@ -0,0 +1,56 @@ +{ + mkDerivation, + nvidia-driver, + autoPatchelfHook, + xorg, + freetype, + gtk2, + gtk3, + cairo, + pango, + fontconfig, + glib, + libintl, + libdrm, + libgbm, +}: +mkDerivation { + path = "..."; + pname = "nvidia-libs"; + inherit (nvidia-driver) src version; + + extraNativeBuildInputs = [ + autoPatchelfHook + ]; + buildInputs = [ + libdrm + libgbm + gtk2 + gtk3 + cairo + pango + fontconfig + glib + libintl + freetype + xorg.libXext + xorg.libX11 + ]; + + env.LOCALBASE = "${builtins.placeholder "out"}"; + env.VKICD_PATH = "${builtins.placeholder "out"}/share/vulkan/icd.d"; + env.VKLAYERS_PATH = "${builtins.placeholder "out"}/share/vulkan/implicit_layer.d"; + env.EGL_GLVND_JSON_PATH = "${builtins.placeholder "out"}/share/glvnd/egl_vendor.d"; + env.EGL_EXTERNAL_PLATFORM_JSON_PATH = "${builtins.placeholder "out"}/share/egl/egl_external_platform.d"; + + postPatch = '' + substituteInPlace lib/libGLX_nvidia/Makefile \ + --replace-fail /usr/share/nvidia $out/share/nvidia \ + --replace-fail " '''" "" + ''; + + dontBuild = true; + installPhase = '' + make -C lib install + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-nvml.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-nvml.nix new file mode 100644 index 000000000000..eaf0dbda7e04 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-nvml.nix @@ -0,0 +1,30 @@ +{ + lib, + mkDerivation, + nvidia-driver, + nvidia-libs, + autoPatchelfHook, +}: +mkDerivation { + path = "..."; + pname = "nvidia-nvml"; + inherit (nvidia-driver) src version; + + extraNativeBuildInputs = [ + autoPatchelfHook + ]; + + runtimeDependencies = [ nvidia-libs ]; + buildInputs = [ nvidia-libs ]; + + env.LOCALBASE = "${builtins.placeholder "out"}"; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + make -C nvml install + ''; + + meta.platforms = [ "x86_64-freebsd" ]; + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-x11.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-x11.nix new file mode 100644 index 000000000000..84243e4b7a11 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-x11.nix @@ -0,0 +1,31 @@ +{ + lib, + mkDerivation, + nvidia-driver, + nvidia-libs, + autoPatchelfHook, +}: +mkDerivation { + path = "..."; + pname = "nvidia-x11"; + inherit (nvidia-driver) src version; + + extraNativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + nvidia-libs + ]; + + env.LOCALBASE = "${builtins.placeholder "out"}"; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + make -C x11 install + ''; + + meta.platforms = [ "x86_64-freebsd" ]; + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/passwd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/passwd.nix new file mode 100644 index 000000000000..bcce00501130 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/passwd.nix @@ -0,0 +1,25 @@ +{ + lib, + mkDerivation, + libpam, +}: +mkDerivation { + path = "usr.bin/passwd"; + + buildInputs = [ + libpam + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + postPatch = '' + sed -E -i -e '/BINOWN|BINMODE|PRECIOUSPROG/d' $BSDSRCDIR/usr.bin/passwd/Makefile + ''; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "passwd"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix new file mode 100644 index 000000000000..a2e5b03d2e22 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix @@ -0,0 +1,16 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "usr.sbin/pciconf"; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platorms = lib.platforms.freebsd; + meta.mainProgram = "pciconf"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix index 27c3a9cec42a..3ba690ff5119 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix @@ -3,4 +3,6 @@ mkDerivation { path = "usr.sbin/pwd_mkdb"; extraPaths = [ "lib/libc/gen" ]; + + meta.mainProgram = "pwd_mkdb"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix index cd4d7ab854b5..96aadbc618f2 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix @@ -34,7 +34,9 @@ mkDerivation { ]; postPatch = '' - substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc + substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" \ + --replace-fail /etc $out/etc \ + --replace-fail /libexec $out/libexec substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" \ --replace-fail /etc $services/etc \ --replace-fail /var $services/var diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix index f9ecef321bc4..eef5e067da29 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix @@ -3,6 +3,7 @@ fetchpatch, include, rpcgen, + libsys, flex, byacc, csu, @@ -18,6 +19,7 @@ mkDerivation { "lib/msun" "lib/libutil" "lib/libc_nonshared" + "lib/libsys" "include/rpcsvc" "contrib/libc-pwcache" "contrib/libc-vis" @@ -28,6 +30,7 @@ mkDerivation { "sys/kern" "sys/libkern" "sys/crypto" + "include/gssapi" ] ++ extraSrc; @@ -51,6 +54,7 @@ mkDerivation { buildInputs = [ include + libsys ]; extraNativeBuildInputs = [ @@ -59,13 +63,24 @@ mkDerivation { byacc ]; + # see comment in libc-minimal about -fno-blocks preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib" + ln -s ${libsys}/lib/libsys_pic.a ../../lib/libsys/libsys_pic.a + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fno-blocks -B${csu}/lib" make -C $BSDSRCDIR/lib/libc $makeFlags libc_nossp_pic.a ''; + # freebsd does not do this link correctly if the target is the nix store + postInstall = '' + ln -sf $out/bin/ld-elf.so.1 $out/libexec/ld-elf.so.1 + ''; + # definitely a bad idea to enable stack protection on the stack protection initializers - hardeningDisable = [ "stackprotector" ]; + # no fortify because then it pulls in __whatever_chk functions which are not built bc no ssp + hardeningDisable = [ + "stackprotector" + "fortify" + ]; env.MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix index 85f45a5c7835..b343736a8cfd 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix @@ -6,6 +6,7 @@ buildPackages, freebsd-lib, vtfontcvt, + elfcopy, }: let hostArchBsd = freebsd-lib.mkBsdArch stdenv; @@ -21,11 +22,14 @@ mkDerivation { "lib/libc" "lib/liblua" "libexec/flua" - "lib/flua" + #"lib/flua" "stand" "sys" ]; - extraNativeBuildInputs = [ vtfontcvt ]; + extraNativeBuildInputs = [ + vtfontcvt + elfcopy + ]; makeFlags = [ "STRIP=-s" # flag to install, not command @@ -35,16 +39,21 @@ mkDerivation { ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ + "stackprotector" + "fortify" + ]; # ??? preBuild = '' - NIX_CFLAGS_COMPILE+=" -I${include}/include -I$BSDSRCDIR/sys/sys -I$BSDSRCDIR/sys/${hostArchBsd}/include" + NIX_CFLAGS_COMPILE+=" -I${include}/include -I$BSDSRCDIR/sys/sys -I$BSDSRCDIR/sys/${hostArchBsd}/include -fno-stack-protector" export NIX_CFLAGS_COMPILE make -C $BSDSRCDIR/stand/libsa $makeFlags + make -C $BSDSRCDIR/stand/libsa32 $makeFlags make -C $BSDSRCDIR/stand/ficl $makeFlags make -C $BSDSRCDIR/stand/liblua $makeFlags + make -C $BSDSRCDIR/stand/liblua32 $makeFlags ''; postPatch = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/su.nix b/pkgs/os-specific/bsd/freebsd/pkgs/su.nix new file mode 100644 index 000000000000..bc39baabb89e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/su.nix @@ -0,0 +1,27 @@ +{ + lib, + mkDerivation, + libpam, + libbsm, +}: +mkDerivation { + path = "usr.bin/su"; + + outputs = [ + "out" + "man" + "debug" + ]; + + buildInputs = [ + libpam + libbsm + ]; + + postPatch = '' + sed -E -i -e '/BINOWN|BINMODE|PRECIOUSPROG/d' $BSDSRCDIR/usr.bin/su/Makefile + ''; + + meta.mainProgram = "su"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix b/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix index d7bd8a870b8f..62744b83bd79 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix @@ -1 +1,7 @@ -{ mkDerivation }: mkDerivation { path = "sbin/swapon"; } +{ + mkDerivation, +}: +mkDerivation { + path = "sbin/swapon"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 3dbfe3d9c284..e2a765552add 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -24,6 +24,8 @@ bintrans, xargs-j, kldxref, + ctfconvert, + ctfmerge, }: let baseConfigFile = @@ -46,17 +48,13 @@ let "include" ]; postPatch = '' - for f in sys/conf/kmod.mk sys/contrib/dev/acpica/acpica_prep.sh; do + for f in sys/contrib/dev/acpica/acpica_prep.sh; do substituteInPlace "$f" --replace-warn 'xargs -J' 'xargs-j ' done for f in sys/conf/*.mk; do substituteInPlace "$f" --replace-quiet 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' done - - sed -i sys/${hostArchBsd}/conf/${baseConfig} \ - -e 's/WITH_CTF=1/WITH_CTF=0/' \ - -e '/KDTRACE/d' '' + lib.optionalString (baseConfigFile != null) '' cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig} @@ -64,15 +62,12 @@ let }; # Kernel modules need this for kern.opts.mk - env = { - MK_CTF = "no"; - } - // (lib.flip lib.mapAttrs' extraFlags ( + env = lib.flip lib.mapAttrs' extraFlags ( name: value: { name = "MK_${lib.toUpper name}"; value = lib.boolToYesNo value; } - )); + ); in mkDerivation rec { pname = "sys"; @@ -96,6 +91,8 @@ mkDerivation rec { bintrans xargs-j kldxref + ctfconvert + ctfmerge ]; # --dynamic-linker /red/herring is used when building the kernel. @@ -114,11 +111,18 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fno-stack-protector" "-Wno-unneeded-internal-declaration" # some openzfs code trips this + "-Wno-default-const-init-field-unsafe" # added in clang 21 + "-Wno-uninitialized-const-pointer" # added in clang 21 + "-Wno-format" # error: passing 'printf' format string where 'freebsd_kprintf' format string is expected + "-Wno-sometimes-uninitialized" # this one is actually kind of concerning but it does trip + "-Wno-unused-function" ]; inherit env; passthru.env = env; + makeFlags = [ "XARGS_J=xargs-j" ]; + KODIR = "${placeholder "out"}/kernel"; KMODDIR = "${placeholder "out"}/kernel"; DTBDIR = "${placeholder "out"}/dbt"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix index 42b956614c51..fd8460470f49 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix @@ -1,5 +1,11 @@ -{ mkDerivation, ... }: +{ + mkDerivation, + libjail, +}: mkDerivation { path = "sbin/sysctl"; + buildInputs = [ + libjail + ]; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix index 33b7acdf9800..fa31af456822 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix @@ -1,4 +1,10 @@ -{ mkDerivation, lib }: +{ + mkDerivation, + lib, + libcasper, + libcapsicum, + libnv, +}: mkDerivation { path = "usr.sbin/syslogd"; @@ -7,6 +13,12 @@ mkDerivation { "sys/sys" ]; + buildInputs = [ + libcasper + libcapsicum + libnv + ]; + # These want to install some config files which we don't want MK_FTP = "no"; MK_LPR = "no"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tip.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tip.nix new file mode 100644 index 000000000000..0cc1b74b9d83 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tip.nix @@ -0,0 +1,19 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "usr.bin/tip"; + extraPaths = [ + "usr.bin/Makefile.inc" + ]; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; + meta.mainProgram = "tip"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/usbconfig.nix b/pkgs/os-specific/bsd/freebsd/pkgs/usbconfig.nix new file mode 100644 index 000000000000..b1a5e313a2ff --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/usbconfig.nix @@ -0,0 +1,21 @@ +{ + lib, + mkDerivation, + libusb, +}: +mkDerivation { + path = "usr.sbin/usbconfig"; + + outputs = [ + "out" + "man" + "debug" + ]; + + buildInputs = [ + libusb + ]; + + meta.mainProgram = "usbconfig"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/v4l-compat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/v4l-compat.nix new file mode 100644 index 000000000000..6b350d8b0c54 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/v4l-compat.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, +}: +let + types_h = fetchurl { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/3da53417998c611f340d75e45962da2fa912add5/multimedia/libv4l/files/types.h"; + hash = "sha256-vbw82kxDC02vFhqdK3klh52pk/ecL+HwmmgQYYMEV9w="; + }; + videodev_h = fetchurl { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/3da53417998c611f340d75e45962da2fa912add5/multimedia/libv4l/files/videodev.h"; + hash = "sha256-tcSZeBkaRo+K6i/tUYjhgQdEAuMhstvWsyVydIevAU4="; + }; +in +stdenv.mkDerivation rec { + pname = "v4l-compat"; + version = "5.8"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; + hash = "sha256-5/dRhqoGQhFK+PGdmVWZNzAMonrK90UbNtT5sPhc8fU="; + }; + allFiles = [ + "linux/cec.h" + "linux/cec-funcs.h" + "linux/const.h" + "linux/dvb/audio.h" + "linux/dvb/ca.h" + "linux/dvb/dmx.h" + "linux/dvb/frontend.h" + "linux/dvb/net.h" + "linux/dvb/osd.h" + "linux/dvb/version.h" + "linux/dvb/video.h" + "linux/ivtv.h" + "linux/lirc.h" + "linux/media.h" + "linux/media-bus-format.h" + "linux/v4l2-common.h" + "linux/v4l2-controls.h" + "linux/v4l2-mediabus.h" + "linux/v4l2-subdev.h" + "linux/videodev2.h" + ]; + + buildPhase = ":"; + + installPhase = '' + for f in $allFiles; do + mkdir -p $(dirname $out/include/$f) + cp include/uapi/$f $out/include/$f + done + cp ${types_h} $out/include/linux/types.h + cp ${videodev_h} $out/include/linux/videodev.h + ''; + + meta = { + description = "Video4Linux header files for FreeBSD"; + maintainers = [ lib.maintainers.rhelmot ]; + platforms = lib.platforms.freebsd; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix b/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix new file mode 100644 index 000000000000..45d70b5fc35e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix @@ -0,0 +1,10 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "usr.sbin/vidcontrol"; + + meta.mainProgram = "vidcontrol"; + meta.platorms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix index a0ea69b3fd4d..14212c82062d 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix @@ -2,4 +2,8 @@ mkDerivation { path = "usr.bin/vtfontcvt"; extraPaths = [ "sys/cddl/contrib/opensolaris/common/lz4" ]; + + NIX_CFLAGS_COMPILE = [ + "-Wno-unterminated-string-initialization" + ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix new file mode 100644 index 000000000000..7bf3e1b28574 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix @@ -0,0 +1,23 @@ +{ + stdenv, + fetchFromGitHub, + xorg, + pkg-config, +}: +stdenv.mkDerivation rec { + pname = "xf86-video-scfb"; + version = "0.0.7"; + src = fetchFromGitHub { + owner = "rayddteam"; + repo = pname; + rev = version; + hash = "sha256-hYBGnk/lpVOrl05tN6kXxEft6QktU5432wgZ8a+WdZc="; + }; + + postPatch = '' + sed -E -i -e "/xf86DisableRandR/d" src/scfb_driver.c + ''; + + buildInputs = [ xorg.xorgserver ]; + nativeBuildInputs = [ pkg-config ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json index eefea201ebe9..0f80beabb7d4 100644 --- a/pkgs/os-specific/bsd/freebsd/versions.json +++ b/pkgs/os-specific/bsd/freebsd/versions.json @@ -1,19 +1,19 @@ { "main": { - "hash": "sha256-f69U2FX+3GQimdUJunWApFseeKJhzjgNw4h26ZBPiT0=", + "hash": "sha256-2bJSM8zOFzAFXhrWZX06ULA0p6MvdJZ3VEHI9Q+bU1g=", "ref": "main", "refType": "branch", - "rev": "9357c694e8dca627c25b15529e8435b2ab3dd48b", + "rev": "9ec8196f68bac015965164f7f1a65c619bab4e85", "supported": false, "version": { "branch": "CURRENT", - "major": 15, + "major": 16, "minor": 0, - "reldate": "1500036", - "release": "15.0-CURRENT", - "revision": "15.0", + "reldate": "1600004", + "release": "16.0-CURRENT", + "revision": "16.0", "type": "FreeBSD", - "version": "FreeBSD 15.0-CURRENT" + "version": "FreeBSD 16.0-CURRENT" } }, "release/13.0.0": { @@ -178,6 +178,42 @@ "version": "FreeBSD 14.2-RELEASE" } }, + "release/14.3.0": { + "hash": "sha256-lKeK6lUoNZiwrDjBZzyz4C1JmjaMJ0HhuSmr4yH1q1I=", + "ref": "release/14.3.0", + "refType": "tag", + "rev": "8c9ce319fef765890ce518cab85d3a470b669849", + "supported": false, + "version": { + "branch": "RELEASE", + "major": 14, + "minor": 3, + "patch": 0, + "reldate": "1403000", + "release": "14.3-RELEASE", + "revision": "14.3", + "type": "FreeBSD", + "version": "FreeBSD 14.3-RELEASE" + } + }, + "release/15.0.0": { + "hash": "sha256-rr/NWV+oIidsYy4e/zW3Kqtyryt1YdCV2MBarfLJYOM=", + "ref": "release/15.0.0", + "refType": "tag", + "rev": "7aedc8de6446ad5a10d553b926423c689f0a3363", + "supported": false, + "version": { + "branch": "RELEASE", + "major": 15, + "minor": 0, + "patch": 0, + "reldate": "1500068", + "release": "15.0-RELEASE", + "revision": "15.0", + "type": "FreeBSD", + "version": "FreeBSD 15.0-RELEASE" + } + }, "releng/13.0": { "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=", "ref": "releng/13.0", @@ -251,38 +287,39 @@ } }, "releng/13.4": { - "hash": "sha256-y61CplXIRVDkGRtbH2TX9AKr0kiaNaqAT/+fXdkvy6g=", + "hash": "sha256-nkVvW/LfJYUzKPRNOpzl50yLI/ppuPHB7ISt7WN168s=", "ref": "releng/13.4", "refType": "branch", - "rev": "27f132c05c39138b375591d2bf9f73f680997de3", - "supported": true, + "rev": "3bc5467e7f6c9b29db95b35298e687435412a0ce", + "supported": false, "version": { - "branch": "RELEASE-p4", + "branch": "RELEASE-p5", "major": 13, "minor": 4, - "patch": "4", + "patch": "5", "reldate": "1304000", - "release": "13.4-RELEASE-p4", + "release": "13.4-RELEASE-p5", "revision": "13.4", "type": "FreeBSD", - "version": "FreeBSD 13.4-RELEASE-p4" + "version": "FreeBSD 13.4-RELEASE-p5" } }, "releng/13.5": { - "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=", + "hash": "sha256-EULbS8fjJnJorpx5SJia/DVLSDTPSZznVioczzZ+TVg=", "ref": "releng/13.5", "refType": "branch", - "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85", + "rev": "4fc17862cb506bfe121c293500177e8447120068", "supported": true, "version": { - "branch": "RELEASE", + "branch": "RELEASE-p7", "major": 13, "minor": 5, + "patch": "7", "reldate": "1305000", - "release": "13.5-RELEASE", + "release": "13.5-RELEASE-p7", "revision": "13.5", "type": "FreeBSD", - "version": "FreeBSD 13.5-RELEASE" + "version": "FreeBSD 13.5-RELEASE-p7" } }, "releng/14.0": { @@ -322,34 +359,69 @@ } }, "releng/14.2": { - "hash": "sha256-iSeTif/cEkqhIQ5hSNF+Rx7dORU13Bc0Dk8Zv4TYWtA=", + "hash": "sha256-KVq3glUpQFpCFNOWf6YBE9p+EK2ITugqhwbaTcta+80=", "ref": "releng/14.2", "refType": "branch", - "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", - "supported": true, + "rev": "16a79708d089423ec0c3d32f25e7ca97ae58e97b", + "supported": false, "version": { - "branch": "RELEASE-p2", + "branch": "RELEASE-p7", "major": 14, "minor": 2, - "patch": "2", + "patch": "7", "reldate": "1402000", - "release": "14.2-RELEASE-p2", + "release": "14.2-RELEASE-p7", "revision": "14.2", "type": "FreeBSD", - "version": "FreeBSD 14.2-RELEASE-p2" + "version": "FreeBSD 14.2-RELEASE-p7" + } + }, + "releng/14.3": { + "hash": "sha256-LJCcq5R1UoVNkWOr78kPAK96APrd9XETvHsptSTTX2A=", + "ref": "releng/14.3", + "refType": "branch", + "rev": "476b20984a6fed7e966f7b790444e23700603b6b", + "supported": true, + "version": { + "branch": "RELEASE-p6", + "major": 14, + "minor": 3, + "patch": "6", + "reldate": "1403000", + "release": "14.3-RELEASE-p6", + "revision": "14.3", + "type": "FreeBSD", + "version": "FreeBSD 14.3-RELEASE-p6" + } + }, + "releng/15.0": { + "hash": "sha256-rr/NWV+oIidsYy4e/zW3Kqtyryt1YdCV2MBarfLJYOM=", + "ref": "releng/15.0", + "refType": "branch", + "rev": "7aedc8de6446ad5a10d553b926423c689f0a3363", + "supported": true, + "version": { + "branch": "RELEASE", + "major": 15, + "minor": 0, + "reldate": "1500068", + "release": "15.0-RELEASE", + "revision": "15.0", + "type": "FreeBSD", + "version": "FreeBSD 15.0-RELEASE" } }, "stable/13": { - "hash": "sha256-rex3CUXyyNDz/TouNqlzZFo6DAwSOKXTdC5HaRQoKKc=", + "hash": "sha256-6y1resHdgF7WAbj09qCbTxwwliM7VFgkA/98hXfv80c=", "ref": "stable/13", "refType": "branch", - "rev": "64f5a71c1cb79c09e50a37ddbe958224bb64add4", + "rev": "02a810d9b4cc8b3cd30d7e6bfe01b5e3c68ee492", "supported": true, "version": { "branch": "STABLE", "major": 13, "minor": 5, - "reldate": "1305500", + "reldate": "1305502", "release": "13.5-STABLE", "revision": "13.5", "type": "FreeBSD", @@ -357,20 +429,37 @@ } }, "stable/14": { - "hash": "sha256-s+pj8LttAnKNNohUsJNOJRFmLg6x06tlkJn3xQnFQiY=", + "hash": "sha256-MPDqTsFlZiAZ/IcSwK3YIuEOPVSUw03dUGdZ7a6IiZ4=", "ref": "stable/14", "refType": "branch", - "rev": "e6a470ffcbd708cf404472bb871c2cb76eaa7b39", + "rev": "1869d604e22d88c8c7487cd8a547de42847a40be", "supported": true, "version": { "branch": "STABLE", "major": 14, - "minor": 2, - "reldate": "1402504", - "release": "14.2-STABLE", - "revision": "14.2", + "minor": 3, + "reldate": "1403506", + "release": "14.3-STABLE", + "revision": "14.3", "type": "FreeBSD", - "version": "FreeBSD 14.2-STABLE" + "version": "FreeBSD 14.3-STABLE" + } + }, + "stable/15": { + "hash": "sha256-8L7nqwh9QujoaecqW4I253Dc5QF916XxnC2irqd71xs=", + "ref": "stable/15", + "refType": "branch", + "rev": "06c2e9b7685b630d90b20364bbe778007086a624", + "supported": true, + "version": { + "branch": "STABLE", + "major": 15, + "minor": 0, + "reldate": "1500503", + "release": "15.0-STABLE", + "revision": "15.0", + "type": "FreeBSD", + "version": "FreeBSD 15.0-STABLE" } } } diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix index c8dd0cb670c1..bee269007663 100644 --- a/pkgs/os-specific/cygwin/w32api/default.nix +++ b/pkgs/os-specific/cygwin/w32api/default.nix @@ -32,8 +32,6 @@ }; meta = { - # Marked broken 2025-11-28 because it has failed on Hydra for at least one year. - broken = true; description = "MinGW w32api package for Cygwin"; inherit (windows.mingw_w64_headers.meta) homepage diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 06e713a9dacd..be5c25312345 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -73,38 +73,53 @@ stdenv.mkDerivation rec { ++ lib.optionals enableStatic [ "fortify" ]; patches = [ + # Allow BusyBox to be invoked as "-busybox". This is + # necessary when it's run from the Nix store as -busybox during + # stdenv bootstrap. ./busybox-in-store.patch + # libbb: sockaddr2str: ensure only printable characters are returned for the hostname part (fetchurl { name = "CVE-2022-28391.patch"; url = "https://git.alpinelinux.org/aports/plain/main/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-yviw1GV+t9tbHbY7YNxEqPi7xEreiXVqbeRyf8c6Awo="; }) + # nslookup: sanitize all printed strings with printable_string (fetchurl { name = "CVE-2022-28391.patch"; url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w="; }) + # shell: avoid segfault on ${0::0/0~09J} + # See also: https://bugs.busybox.net/show_bug.cgi?id=15216 (fetchpatch { - name = "CVE-2022-48174.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15216 + name = "CVE-2022-48174.patch"; url = "https://git.busybox.net/busybox/patch/?id=d417193cf37ca1005830d7e16f5fa7e1d8a44209"; hash = "sha256-mpDEwYncpU6X6tmtj9xM2KCrB/v2ys5bYxmPPrhm6es="; }) + # Make sure we don't read past the end of the string in next_token() + # when backslash is the last character in an (invalid) regexp. + # See also: https://bugs.busybox.net/show_bug.cgi?id=15874 + # This patch is also used by Alpine, see https://git.alpinelinux.org/aports/tree/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch (fetchpatch { - name = "CVE-2023-42366.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15874 - # This patch is also used by Alpine, see https://git.alpinelinux.org/aports/tree/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch + name = "CVE-2023-42366.patch"; url = "https://bugs.busybox.net/attachment.cgi?id=9697"; hash = "sha256-2eYfLZLjStea9apKXogff6sCAdG9yHx0ZsgUBaGfQIA="; }) + # awk: fix use after free (CVE-2023-42363) + # See also: https://bugs.busybox.net/show_bug.cgi?id=15865 (fetchpatch { - name = "CVE-2023-42363.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15865 + name = "CVE-2023-42363.patch"; url = "https://git.launchpad.net/ubuntu/+source/busybox/plain/debian/patches/CVE-2023-42363.patch?id=c9d8a323b337d58e302717d41796aa0242963d5a"; hash = "sha256-1W9Q8+yFkYQKzNTrvndie8QuaEbyAFL1ZASG2fPF+Z4="; }) + # awk: fix ternary operator and precedence of = + # See also: https://bugs.busybox.net/show_bug.cgi?id=15871 https://bugs.busybox.net/show_bug.cgi?id=15868 (fetchpatch { - name = "CVE-2023-42364_CVE-2023-42365.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15871 https://bugs.busybox.net/show_bug.cgi?id=15868 + name = "CVE-2023-42364_CVE-2023-42365.patch"; url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2023-42364-CVE-2023-42365.patch?id=8a4bf5971168bf48201c05afda7bee0fbb188e13"; hash = "sha256-nQPgT9eA1asCo38Z9X7LR9My0+Vz5YBPba3ARV3fWcc="; }) + # tar: fix TOCTOU symlink race condition (fetchurl { url = "https://git.alpinelinux.org/aports/plain/main/busybox/0001-tar-fix-TOCTOU-symlink-race-condition.patch?id=9e42dea5fba84a8afad1f1910b7d3884128a567e"; hash = "sha256-GmXQhwB1/IPVjXXpGi5RjRvuGJgIMIb7lQKB63m306g="; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix index 2d20d8bb0f02..620bd9f3c447 100644 --- a/pkgs/os-specific/linux/hid-tmff2/default.nix +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "hid-tmff2"; # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12 - version = "0-unstable-2025-11-07"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "Kimplul"; repo = "hid-tmff2"; - rev = "2a7b3568792d50e94479298b5d0e5602d4e230f8"; - hash = "sha256-NcIQ0rW7ZPujq7MRMYW0sQ4qWRwhLnovHDqzzxkwtwY="; + rev = "c4b70d4ec36404c9454199bec208eaf3116ef453"; + hash = "sha256-IYfDlKfd4OL7s+MJPNYJ/tpyTiKHy1DQGQaIR7qfzZU="; # For hid-tminit. Source: https://github.com/scarburato/hid-tminit fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 82432a9773df..5ea3e16a8c55 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1224,6 +1224,7 @@ let KEXEC_FILE = option yes; KEXEC_JUMP = option yes; + KEXEC_HANDOVER = whenAtLeast "6.16" (option yes); PARTITION_ADVANCED = yes; # Needed for LDM_PARTITION # Windows Logical Disk Manager (Dynamic Disk) support diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8546fa4b3354..1d10800b97de 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,33 +5,33 @@ "lts": false }, "6.1": { - "version": "6.1.158", - "hash": "sha256:1nmz4rknw82k9ylyrbm4g2m0hh4lmgkwi1g3gm7hzv04nvyqn1md", + "version": "6.1.159", + "hash": "sha256:17ib6ila2s8rclqpfxlkk1g72azj2r46k2x1q3n2j24qjfz7w80z", "lts": true }, "5.15": { - "version": "5.15.196", - "hash": "sha256:018ffzi91xh46l7r3fgc4mpri3pxzl6wc1n946vny0lbb59pj5c3", + "version": "5.15.197", + "hash": "sha256:12k6c09lgs4ahmxbrg8g3q1ngldajmzyz7y2nr1l8yhhwbw8s8gx", "lts": true }, "5.10": { - "version": "5.10.246", - "hash": "sha256:0xd8r8qqgxh3zhqkl4a5plmgsycxrffhpc9q2rwhkp6jd717cszb", + "version": "5.10.247", + "hash": "sha256:037yv5lryfanpfbk3z60yfsx14nskgf386b6cfkbzn7wl5xvij3h", "lts": true }, "6.6": { - "version": "6.6.118", - "hash": "sha256:0zdifhri9flxa99hzrk9bz8yqi8h1v6zpsvldz9cibvlakixrpab", + "version": "6.6.119", + "hash": "sha256:1s75ad95g4y80idadzqmj9kj4rb3dhnvny9lg4lcq15l1fc9p81x", "lts": true }, "6.12": { - "version": "6.12.60", - "hash": "sha256:1y6wkk4500pisk9l2dibmidqix1gpci7dy6brs1xc4bl2jr9cc56", + "version": "6.12.61", + "hash": "sha256:0d8pbx0j5g2ag4im5k3dcqiwp5jxjja29p195zqpd1jj0m8p8s8s", "lts": true }, "6.17": { - "version": "6.17.10", - "hash": "sha256:1kf8slgkvv9x6i1111l78p93y65rscdxarh05spx1njh797k8zzs", + "version": "6.17.11", + "hash": "sha256:0zi5mw6953iic9hwx78bjww81mcpb9y2sj5dgf819w9506pihjwk", "lts": false }, "6.18": { diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4f7751ade196..f1737bdb50e0 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.12.59"; - hash = "sha256-IvKN4osLSZmMPeQFUZ05W7YLZYS1HLsxDoAFbi7sxKQ="; + version = "6.12.61"; + hash = "sha256-7m4Ehmy463rQK265fEvTMjndqZXs+PJ35HE+tZVKgGQ="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.17.9"; - hash = "sha256-M0M8jEflWgGMSUqQ2oEePISaYR5UIJbGrSmphCTIKYI="; + version = "6.17.11"; + hash = "sha256-NJQ67MOjFMScwECxQd00F3SZ+kITbuBp/3imNXdUqlQ="; }; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 8a11373d0e2a..9c8c1c626a62 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.17.9"; # zen + version = "6.18"; # zen suffix = "zen1"; # zen - sha256 = "0xrmhs2kabiszdldqx7c4bj3zicbslvvgmw8j77zlc49zddxhz1q"; # zen + sha256 = "04bi1xmlllxhmqy9h6y0gnw82bhkh42rzzwc72rn8rknbb7qq8bj"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/morse-driver/0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch b/pkgs/os-specific/linux/morse-driver/0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch new file mode 100644 index 000000000000..10ad8e5e85ad --- /dev/null +++ b/pkgs/os-specific/linux/morse-driver/0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch @@ -0,0 +1,156 @@ +From d144e153686e063ef3febeb3dbcaa5e98c3831ae Mon Sep 17 00:00:00 2001 +From: Govind Singh +Date: Thu, 6 Nov 2025 11:25:53 +0400 +Subject: [PATCH] fix build compatibility till Linux 6.12.3 with strict type + checks + +Signed-off-by: Govind Singh +--- + Makefile | 2 +- + apf.c | 27 +++++++++++++++++++++++++++ + debug.h | 2 +- + firmware.h | 4 +++- + mac.c | 1 + + morse.h | 2 +- + vendor.c | 2 -- + 7 files changed, 34 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 5dc7bb2..fce34ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -155,6 +155,7 @@ morse-y += coredump.o + morse-y += peer.o + morse-y += led.o + morse-y += bss_stats.o ++morse-y += apf.o + morse-$(CONFIG_MORSE_MONITOR) += monitor.o + morse-$(CONFIG_MORSE_SDIO) += sdio.o + morse-$(CONFIG_MORSE_SPI) += spi.o +@@ -164,7 +165,6 @@ morse-$(CONFIG_MORSE_USER_ACCESS) += uaccess.o + morse-$(CONFIG_MORSE_HW_TRACE) += hw_trace.o + morse-$(CONFIG_MORSE_PAGESET_TRACE) += pageset_trace.o + morse-$(CONFIG_MORSE_BUS_TRACE) += bus_trace.o +-morse-$(CONFIG_ANDROID) += apf.o + + ifeq ($(CONFIG_DISABLE_MORSE_RC),y) + morse-y += minstrel_rc.o +diff --git a/apf.c b/apf.c +index baecd05..96b4b1b 100644 +--- a/apf.c ++++ b/apf.c +@@ -16,6 +16,7 @@ + #define MORSE_APF_WARN(_m, _f, _a...) morse_warn(FEATURE_ID_APF, _m, _f, ##_a) + #define MORSE_APF_ERR(_m, _f, _a...) morse_err(FEATURE_ID_APF, _m, _f, ##_a) + ++#ifdef CONFIG_ANDROID + struct nla_policy morse_apf_nla_policy[VENDOR_ATTR_PACKET_FILTER_MAX] = { + [VENDOR_ATTR_PACKET_FILTER_VERSION] = { .type = NLA_U32}, + [VENDOR_ATTR_PACKET_FILTER_MAX_LENGTH] = { .type = NLA_U32}, +@@ -210,3 +211,29 @@ exit: + kfree(program); + return ret; + } ++#else ++int morse_vendor_cmd_get_supported_feature_set(struct wiphy *wiphy, ++ struct wireless_dev *wdev, const void *data, int data_len) ++{ ++ return -EOPNOTSUPP; ++} ++ ++int morse_vendor_cmd_apf_get_capabilities(struct wiphy *wiphy, ++ struct wireless_dev *wdev, const void *data, int data_len) ++{ ++ return -EOPNOTSUPP; ++} ++ ++int morse_vendor_cmd_apf_set_packet_filter(struct wiphy *wiphy, ++ struct wireless_dev *wdev, const void *data, int data_len) ++{ ++ return -EOPNOTSUPP; ++} ++ ++int morse_vendor_cmd_apf_read_packet_filter_data(struct wiphy *wiphy, ++ struct wireless_dev *wdev, const void *data, int data_len) ++{ ++ return -EOPNOTSUPP; ++} ++ ++#endif /* CONFIG_ANDROID */ +diff --git a/debug.h b/debug.h +index 2b734d5..f03f419 100644 +--- a/debug.h ++++ b/debug.h +@@ -156,7 +156,7 @@ extern uint debug_mask; + * + * @returns True if output would be generated and false otherwise. + */ +-bool morse_log_is_enabled(u32 id, u8 level); ++bool morse_log_is_enabled(enum morse_feature_id id, u8 level); + + /** + * Set the default logging level for all features. +diff --git a/firmware.h b/firmware.h +index 217339a..0b1815f 100644 +--- a/firmware.h ++++ b/firmware.h +@@ -32,6 +32,8 @@ + #error "Capability subset filled by firmware is to big" + #endif + ++enum morse_config_test_mode; ++ + enum morse_fw_info_tlv_type { + MORSE_FW_INFO_TLV_BCF_ADDR = 1, + MORSE_FW_INFO_TLV_COREDUMP_MEM_REGION = 2, +@@ -146,7 +148,7 @@ struct extended_host_table { + u8 ext_host_table_data_tlvs[]; + } __packed; + +-int morse_firmware_init(struct morse *mors, uint test_mode); ++int morse_firmware_init(struct morse *mors, enum morse_config_test_mode test_mode); + + /** + * @brief Do necessary preparation and then initialise firmware +diff --git a/mac.c b/mac.c +index 7844af9..3b3595f 100644 +--- a/mac.c ++++ b/mac.c +@@ -4295,6 +4295,7 @@ static void morse_mac_ops_sta_rc_update(struct ieee80211_hw *hw, + #else + struct ieee80211_link_sta *link_sta, + #endif ++ + u32 changed) + { + struct morse *mors; +diff --git a/morse.h b/morse.h +index d001ab5..850587c 100644 +--- a/morse.h ++++ b/morse.h +@@ -55,7 +55,7 @@ + /* Re-Define the IGNORE channel flag, if not defined by the cfg80211 patch. + * The flag won't be used by MM81xx. + */ +-#if defined(__x86_64__) ++#ifndef IEEE80211_CHAN_IGNORE + #define IEEE80211_CHAN_IGNORE IEEE80211_CHAN_DISABLED + #endif + +diff --git a/vendor.c b/vendor.c +index 0556715..7fcd31a 100644 +--- a/vendor.c ++++ b/vendor.c +@@ -14,9 +14,7 @@ + #include "wiphy.h" + #include "vendor.h" + #include "mesh.h" +-#ifdef CONFIG_ANDROID + #include "apf.h" +-#endif + + /** Extra overhead to account for any additional netlink framing */ + #define VENDOR_EVENT_OVERHEAD (30) +-- +2.34.1 + diff --git a/pkgs/os-specific/linux/morse-driver/default.nix b/pkgs/os-specific/linux/morse-driver/default.nix new file mode 100644 index 000000000000..a16ef40e1d22 --- /dev/null +++ b/pkgs/os-specific/linux/morse-driver/default.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kernelModuleMakeFlags, +}: + +stdenv.mkDerivation { + pname = "morse-driver"; + version = "1.16.4-${kernel.version}"; + + src = fetchFromGitHub { + owner = "MorseMicro"; + repo = "morse_driver"; + rev = "7f95fe37750a09259b4d2988a9cf22df60f76fdf"; + hash = "sha256-kMEFl1sfDGqh96t5emF9UtzOqauFClKXBsXrS1NZ33E="; + fetchSubmodules = true; + }; + + patches = [ + ./0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch + ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = + kernelModuleMakeFlags + ++ [ + "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + + # --- Morse-specific Kconfig options --- + "CONFIG_WLAN_VENDOR_MORSE=m" + "CONFIG_MORSE_SDIO=y" + "CONFIG_MORSE_SDIO_ALIGNMENT=4" + "CONFIG_MORSE_USER_ACCESS=y" + "CONFIG_MORSE_VENDOR_COMMAND=y" + "CONFIG_MORSE_COUNTRY=US" + "CONFIG_MORSE_DEBUG_MASK=4" + "CONFIG_MORSE_SDIO_RESET_TIME=400" + "CONFIG_MORSE_POWERSAVE_MODE=0" + "CONFIG_ANDROID=n" + "CONFIG_MORSE_WATCHDOG_RESET_DEFAULT_DISABLED=y" + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + installPhase = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + install -D -m 644 morse.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/morse.ko" + install -D -m 644 dot11ah/dot11ah.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/dot11ah.ko" + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Morse Micro Wi-Fi driver"; + homepage = "https://github.com/MorseMicro/morse_driver"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ govindsi ]; + broken = kernel.kernelOlder "6.1" || kernel.kernelAtLeast "6.12.56"; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 4d4e61a5942f..2f55aca3a92c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; mainProgram = "nv-fabricmanager"; - maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 6b5fa18531fe..15a0f84045ca 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -340,7 +340,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; maintainers = with maintainers; [ kiskae - edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index 2705375237ce..bd4ca2183635 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation rec { description = "Linux driver for QC71 laptop"; homepage = "https://github.com/pobrn/qc71_laptop/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ aacebedo ]; + maintainers = with maintainers; [ + aacebedo + lucasfa + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 83966fdc19d0..66e151e7d8c6 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2025-05-29"; + version = "${kernel.version}-unstable-2025-12-04"; src = fetchFromGitHub { - owner = "morrownr"; - repo = "88x2bu-20210702"; - rev = "fe48647496798cac77976e310ee95da000b436c9"; - hash = "sha256-h20vwCgLOiNh0LN3MGwPl3F/PSWGc2XS4t1sdeFAOko="; + owner = "RinCat"; + repo = "RTL88x2BU-Linux-Driver"; + rev = "825556e195ecde9ce8f5f4cbad9953f398c8598e"; + hash = "sha256-MkvVCWyMOCBzCRufbKMuaaFOPhokZdFnXHYnrAwBe6M="; }; hardeningDisable = [ "pic" ]; @@ -38,10 +38,13 @@ stdenv.mkDerivation { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/morrownr/88x2bu-20210702"; + homepage = "https://github.com/RinCat/RTL88x2BU-Linux-Driver"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ otavio ]; - broken = kernel.kernelAtLeast "6.17"; + maintainers = with maintainers; [ + otavio + claymorwan + ]; + broken = kernel.kernelOlder "5.11"; }; } diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index f12a7636ffbd..7d88e07c1f6b 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "0-unstable-2025-10-20"; + version = "0-unstable-2025-11-30"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "9bc8fecb61d4ad59e46b4dbd003d60ef2d8437a8"; - hash = "sha256-/nA0U1Ry+xt4F4GC9ymMDFhkiHAqeodv7uUXAaALmdg="; + rev = "3309c45c283cbd996e1e05eeddf90c4fa589b90b"; + hash = "sha256-AtDAzguL71hvgh/xvbBKWmza05n2D5Q+W3YkHQXdup8="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index ef6e4badf064..0aef6baf61ae 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -11,19 +11,27 @@ libseccomp, nix-update-script, nixosTests, + fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "scx_rustscheds"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "sched-ext"; repo = "scx"; tag = "v${finalAttrs.version}"; - hash = "sha256-RkTY7gDcKbkNUKl7NJDX3Ac/I+dRG1Gj8rRHynbbxUU="; + hash = "sha256-bOldw2Sob5aANmVzw6VwCgJ4+VzEsohKUxOxntow7VY="; }; - cargoHash = "sha256-tuZhqDT1xMP+Pufwz6SBt44qNzHuGzcU9QmVNIg2zS0="; + cargoHash = "sha256-ik05X+5jIdxtXYhN6fb1URW8TKKzgFuevi5+Wm2j15Y="; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/sched-ext/scx/pull/3127.patch"; + hash = "sha256-HpGJR3eBZKE+VsqGivjJp1n7JIORhZUxG87AsP1WWi0="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -59,6 +67,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=cpumask" "--skip=topology" "--skip=proc_data::tests::test_thread_operations" + "--skip=json::tests::test_with_resources" + "--skip=json::tests::test_with_dir" ]; passthru.tests.basic = nixosTests.scx; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a0d654c1a4cd..071d67509065 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -898,6 +898,7 @@ stdenv.mkDerivation (finalAttrs: { withLocaled withMachined withNetworkd + withNspawn withPortabled withSysupdate withTimedated diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 6ca2efdfc275..418efb57d438 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -5,21 +5,18 @@ kernel, kmod, kernelModuleMakeFlags, + nix-update-script, }: -let - version = "0.15.1"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "v4l2loopback"; - version = "${version}-${kernel.version}"; + version = "0.15.3"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; tag = "v${version}"; - hash = "sha256-uokj0MB6bw4I8q5dVmSO9XMDvh4T7YODBoCCHvEf4v4="; + hash = "sha256-KXJgsEJJTr4TG4Ww5HlF42v2F1J+AsHwrllUP1n/7g8="; }; hardeningDisable = [ @@ -54,6 +51,8 @@ stdenv.mkDerivation { "v4l2loopback.ko" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Kernel module to create V4L2 loopback devices"; mainProgram = "v4l2loopback-ctl"; diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 70f1ef00cad7..ffd607ec1335 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, kernel, kernelModuleMakeFlags, bluez, @@ -20,6 +21,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-evmjQrQPHe8F+6w12bnUv6P4QKGkm63cmP1HEv6equw="; }; + patches = [ + # Remove deprecated ida_simple_xx() usage + (fetchpatch { + url = "https://github.com/orderedstereographic/xpadneo/commit/233e1768fff838b70b9e942c4a5eee60e57c54d4.patch"; + hash = "sha256-HL+SdL9kv3gBOdtsSyh49fwYgMCTyNkrFrT+Ig0ns7E="; + stripLen = 2; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src ''; @@ -44,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ kira-bruneau ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kira-bruneau ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/pkgs-lib/formats/java-properties/default.nix b/pkgs/pkgs-lib/formats/java-properties/default.nix index c97e9b275d19..f94663a9b386 100644 --- a/pkgs/pkgs-lib/formats/java-properties/default.nix +++ b/pkgs/pkgs-lib/formats/java-properties/default.nix @@ -65,89 +65,96 @@ in generate = name: value: - pkgs.runCommand name + pkgs.callPackage ( { - # Requirements - # ============ - # - # 1. Strings in Nix carry over to the same - # strings in Java => need proper escapes - # 2. Generate files quickly - # - A JVM would have to match the app's - # JVM to avoid build closure bloat - # - Even then, JVM startup would slow - # down config generation. - # - # - # Implementation - # ============== - # - # Escaping has two steps - # - # 1. jq - # Escape known separators, in order not - # to break up the keys and values. - # This handles typical whitespace correctly, - # but may produce garbage for other control - # characters. - # - # 2. iconv - # Escape >ascii code points to java escapes, - # as .properties files are supposed to be - # encoded in ISO 8859-1. It's an old format. - # UTF-8 behavior may exist in some apps and - # libraries, but we can't rely on this in - # general. + runCommand, + jq, + libiconvReal, + }: + runCommand name + { + # Requirements + # ============ + # + # 1. Strings in Nix carry over to the same + # strings in Java => need proper escapes + # 2. Generate files quickly + # - A JVM would have to match the app's + # JVM to avoid build closure bloat + # - Even then, JVM startup would slow + # down config generation. + # + # + # Implementation + # ============== + # + # Escaping has two steps + # + # 1. jq + # Escape known separators, in order not + # to break up the keys and values. + # This handles typical whitespace correctly, + # but may produce garbage for other control + # characters. + # + # 2. iconv + # Escape >ascii code points to java escapes, + # as .properties files are supposed to be + # encoded in ISO 8859-1. It's an old format. + # UTF-8 behavior may exist in some apps and + # libraries, but we can't rely on this in + # general. - preferLocalBuild = true; - passAsFile = [ "value" ]; - value = builtins.toJSON value; - nativeBuildInputs = [ - pkgs.jq - pkgs.libiconvReal - ]; + preferLocalBuild = true; + passAsFile = [ "value" ]; + value = builtins.toJSON value; + nativeBuildInputs = [ + jq + libiconvReal + ]; - jqCode = - let - main = '' - to_entries - | .[] - | "\( - .key - | ${commonEscapes} - | gsub(" "; "\\ ") - | gsub("="; "\\=") - ) = \( - .value - | ${commonEscapes} - | gsub("^ "; "\\ ") - | gsub("\\n "; "\n\\ ") - )" - ''; - # Most escapes are equal for both keys and values. - commonEscapes = '' - gsub("\\\\"; "\\\\") - | gsub("\\n"; "\\n\\\n") - | gsub("#"; "\\#") - | gsub("!"; "\\!") - | gsub("\\t"; "\\t") - | gsub("\r"; "\\r") - ''; - in - main; + jqCode = + let + main = '' + to_entries + | .[] + | "\( + .key + | ${commonEscapes} + | gsub(" "; "\\ ") + | gsub("="; "\\=") + ) = \( + .value + | ${commonEscapes} + | gsub("^ "; "\\ ") + | gsub("\\n "; "\n\\ ") + )" + ''; + # Most escapes are equal for both keys and values. + commonEscapes = '' + gsub("\\\\"; "\\\\") + | gsub("\\n"; "\\n\\\n") + | gsub("#"; "\\#") + | gsub("!"; "\\!") + | gsub("\\t"; "\\t") + | gsub("\r"; "\\r") + ''; + in + main; - inputEncoding = "UTF-8"; + inputEncoding = "UTF-8"; - inherit comment; + inherit comment; - } - '' - ( - echo "$comment" | while read -r ln; do echo "# $ln"; done - echo - jq -r --arg hash '#' "$jqCode" "$valuePath" \ - | iconv --from-code "$inputEncoding" --to-code JAVA \ - ) > "$out" - ''; + } + '' + ( + echo "$comment" | while read -r ln; do echo "# $ln"; done + echo + jq -r --arg hash '#' "$jqCode" "$valuePath" \ + | iconv --from-code "$inputEncoding" --to-code JAVA \ + ) > "$out" + '' + ) { }; }; } diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix index d7957a589c90..5b8bc99e992d 100644 --- a/pkgs/pkgs-lib/tests/default.nix +++ b/pkgs/pkgs-lib/tests/default.nix @@ -51,10 +51,12 @@ let in # It has to be a link farm for inclusion in the hydra unstable jobset. -pkgs.linkFarm "pkgs-lib-formats-tests" ( - mapAttrsToList (k: v: { - name = k; - path = v; - }) (flatten "" structured) -) +{ + formats-tests = pkgs.linkFarm "pkgs-lib-formats-tests" ( + mapAttrsToList (k: v: { + name = k; + path = v; + }) (flatten "" structured) + ); +} // structured diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 32920197ce27..d2b4f68661fe 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -85,6 +85,5 @@ stdenv.mkDerivation rec { description = "Authoritative only, high performance, simple and open source name server"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.hrdinka ]; }; } diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 186b97d710e8..9ea571dc219a 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://felix.apache.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - maintainers = [ maintainers.sander ]; mainProgram = "felix.jar"; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3dd771bb4a66..19e4da7a5cc0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.11.3"; + version = "2025.12.2"; components = { "3_day_blinds" = ps: with ps; [ @@ -116,6 +116,10 @@ ps: with ps; [ pyairnow ]; + "airobot" = + ps: with ps; [ + pyairobotrest + ]; "airos" = ps: with ps; [ airos @@ -269,6 +273,10 @@ ps: with ps; [ anel-pwrctrl-homeassistant ]; + "anglian_water" = + ps: with ps; [ + pyanglianwater + ]; "anova" = ps: with ps; [ anova-wifi @@ -539,6 +547,10 @@ ps: with ps; [ azure-storage-blob ]; + "backblaze_b2" = + ps: with ps; [ + b2sdk + ]; "backup" = ps: with ps; [ aiohasupervisor @@ -718,11 +730,6 @@ pyspeex-noise zeroconf ]; - "bluetooth_tracker" = - ps: with ps; [ - bt-proximity - pybluez - ]; "bmw_connected_drive" = ps: with ps; @@ -844,6 +851,7 @@ ps: with ps; [ caldav icalendar + vobject ]; "calendar" = ps: with ps; [ @@ -1026,6 +1034,9 @@ ps: with ps; [ pycoolmasternet-async ]; + "cosori" = + ps: with ps; [ + ]; "counter" = ps: with ps; [ ]; @@ -1054,10 +1065,6 @@ crownstone-uart pyserial ]; - "cups" = - ps: with ps; [ - pycups - ]; "currencylayer" = ps: with ps; [ ]; @@ -1103,10 +1110,6 @@ ps: with ps; [ pydeconz ]; - "decora" = - ps: with ps; [ - bluepy - ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ decora-wifi @@ -1251,14 +1254,6 @@ ps: with ps; [ pydiscovergy ]; - "dlib_face_detect" = - ps: with ps; [ - face-recognition - ]; - "dlib_face_identify" = - ps: with ps; [ - face-recognition - ]; "dlink" = ps: with ps; [ pyw215 @@ -1278,10 +1273,6 @@ ps: with ps; [ aiodns ]; - "dominos" = - ps: with ps; [ - pizzapi - ]; "doods" = ps: with ps; [ pillow @@ -1425,13 +1416,6 @@ ps: with ps; [ aioecowitt ]; - "eddystone_temperature" = - ps: - with ps; - [ - beacontools - ] - ++ beacontools.optional-dependencies.scan; "edimax" = ps: with ps; [ pyedimax @@ -1542,6 +1526,10 @@ psutil-home-assistant sqlalchemy ]; + "energyid" = + ps: with ps; [ + energyid-webhooks + ]; "energyzero" = ps: with ps; [ energyzero @@ -1644,6 +1632,10 @@ pyspeex-noise zeroconf ]; + "essent" = + ps: with ps; [ + essent-dynamic-pricing + ]; "etherscan" = ps: with ps; [ python-etherscan-api @@ -1843,10 +1835,6 @@ ps: with ps; [ pyflic ]; - "flick_electric" = - ps: with ps; [ - pyflick - ]; "flipr" = ps: with ps; [ flipr-api @@ -2111,6 +2099,9 @@ ical oauth2client ]; + "google_air_quality" = + ps: with ps; [ + ]; # missing inputs: google_air_quality_api "google_assistant" = ps: with ps; [ aiohasupervisor @@ -2175,6 +2166,10 @@ ps: with ps; [ google-maps-routing ]; + "google_weather" = + ps: with ps; [ + python-google-weather-api + ]; "google_wifi" = ps: with ps; [ ]; @@ -2240,9 +2235,6 @@ ps: with ps; [ growattserver ]; - "gstreamer" = - ps: with ps; [ - ]; # missing inputs: gstreamer-player "gtfs" = ps: with ps; [ pygtfs @@ -2255,6 +2247,9 @@ ps: with ps; [ habiticalib ]; + "hanna" = + ps: with ps; [ + ]; # missing inputs: hanna-cloud "hardkernel" = ps: with ps; [ aiohasupervisor @@ -2501,13 +2496,39 @@ "huawei_lte" = ps: with ps; [ huawei-lte-api - stringcase url-normalize ]; "hue" = ps: with ps; [ aiohue ]; + "hue_ble" = + ps: with ps; [ + aioesphomeapi + aiohasupervisor + aioruuvigateway + aioshelly + aiousbwatcher + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + hueble + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + zeroconf + ]; "huisbaasje" = ps: with ps; [ energyflip-client @@ -3012,9 +3033,6 @@ "kentuckypower" = ps: with ps; [ ]; - "keyboard" = - ps: with ps; [ - ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ asyncinotify @@ -3130,6 +3148,9 @@ ps: with ps; [ pykwb ]; + "labs" = + ps: with ps; [ + ]; "lacrosse" = ps: with ps; [ pylacrosse @@ -3360,9 +3381,6 @@ "linx" = ps: with ps; [ ]; - "lirc" = - ps: with ps; [ - ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ pylitejet @@ -3512,6 +3530,7 @@ ]; "matrix" = ps: with ps; [ + aiofiles matrix-nio pillow ]; @@ -4487,10 +4506,6 @@ ps: with ps; [ panasonic-viera ]; - "pandora" = - ps: with ps; [ - pexpect - ]; "panel_custom" = ps: with ps; [ home-assistant-frontend @@ -5148,9 +5163,6 @@ ps: with ps; [ rova ]; - "rpi_camera" = - ps: with ps; [ - ]; "rpi_power" = ps: with ps; [ rpi-bad-power @@ -5250,6 +5262,9 @@ ps: with ps; [ satel-integra ]; + "saunum" = + ps: with ps; [ + ]; # missing inputs: pysaunum "scene" = ps: with ps; [ ]; @@ -5546,6 +5561,7 @@ ]; "slack" = ps: with ps; [ + aiofiles slack-sdk ]; "sleep_as_android" = @@ -5615,10 +5631,6 @@ ps: with ps; [ pysmlight ]; - "sms" = - ps: with ps; [ - python-gammu - ]; "smtp" = ps: with ps; [ ]; @@ -5629,11 +5641,6 @@ ps: with ps; [ snapcast ]; - "snips" = - ps: with ps; [ - aiohasupervisor - paho-mqtt - ]; "snmp" = ps: with ps; [ pysnmp @@ -5676,7 +5683,6 @@ psutil-home-assistant solaredge-web sqlalchemy - stringcase ]; "solaredge_local" = ps: with ps; [ @@ -5712,6 +5718,7 @@ "sonos" = ps: with ps; [ async-upnp-client + defusedxml ifaddr plexapi plexauth @@ -6055,13 +6062,6 @@ "template" = ps: with ps; [ ]; - "tensorflow" = - ps: with ps; [ - numpy - pillow - pycocotools - tensorflow - ]; # missing inputs: tf-models-official "tesla_fleet" = ps: with ps; [ tesla-fleet-api @@ -6317,7 +6317,6 @@ "traccar" = ps: with ps; [ pytraccar - stringcase ]; "traccar_server" = ps: with ps; [ @@ -6516,6 +6515,9 @@ "vacuum" = ps: with ps; [ ]; + "vagner_pool" = + ps: with ps; [ + ]; "vallox" = ps: with ps; [ vallox-websocket-api @@ -6575,6 +6577,32 @@ ps: with ps; [ pyvicare ]; + "victron_ble" = + ps: with ps; [ + aioesphomeapi + aiohasupervisor + aioruuvigateway + aioshelly + aiousbwatcher + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + zeroconf + ]; # missing inputs: victron-ble-ha-parser "victron_remote_monitoring" = ps: with ps; [ victron-vrm @@ -6803,7 +6831,7 @@ ]; "xbox" = ps: with ps; [ - xbox-webapi + python-xbox ]; "xeoma" = ps: with ps; [ @@ -6880,9 +6908,6 @@ yalexs yalexs-ble ]; - "yale_home" = - ps: with ps; [ - ]; "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient @@ -7060,6 +7085,7 @@ "airgradient" "airly" "airnow" + "airobot" "airos" "airq" "airthings" @@ -7085,6 +7111,7 @@ "android_ip_webcam" "androidtv" "androidtv_remote" + "anglian_water" "anova" "anthemav" "anthropic" @@ -7122,6 +7149,7 @@ "azure_devops" "azure_event_hub" "azure_storage" + "backblaze_b2" "backup" "baf" "balboa" @@ -7174,6 +7202,7 @@ "command_line" "compensation" "compit" + "concord232" "config" "configurator" "control4" @@ -7184,7 +7213,6 @@ "cover" "cpuspeed" "crownstone" - "cups" "cync" "daikin" "datadog" @@ -7211,8 +7239,6 @@ "directv" "discord" "discovergy" - "dlib_face_detect" - "dlib_face_identify" "dlink" "dlna_dmr" "dlna_dms" @@ -7238,7 +7264,6 @@ "econet" "ecovacs" "ecowitt" - "eddystone_temperature" "edl21" "efergy" "eheimdigital" @@ -7259,6 +7284,7 @@ "emulated_roku" "energenie_power_sockets" "energy" + "energyid" "energyzero" "enigma2" "enocean" @@ -7270,6 +7296,7 @@ "eq3btsmart" "escea" "esphome" + "essent" "eufylife_ble" "event" "everlights" @@ -7298,7 +7325,6 @@ "fjaraskupan" "flexit_bacnet" "flic" - "flick_electric" "flipr" "flo" "flume" @@ -7356,6 +7382,7 @@ "google_tasks" "google_translate" "google_travel_time" + "google_weather" "google_wifi" "govee_ble" "govee_light_local" @@ -7403,6 +7430,7 @@ "http" "huawei_lte" "hue" + "hue_ble" "huisbaasje" "humidifier" "hunterdouglas_powerview" @@ -7480,6 +7508,7 @@ "kostal_plenticore" "kraken" "kulersky" + "labs" "lacrosse_view" "lamarzocco" "lametric" @@ -7682,7 +7711,6 @@ "p1_monitor" "palazzetti" "panasonic_viera" - "pandora" "panel_custom" "paperless_ngx" "peblar" @@ -7842,10 +7870,8 @@ "smarty" "smhi" "smlight" - "sms" "smtp" "snapcast" - "snips" "snmp" "snoo" "snooz" diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix index 9b35e0ec219b..f3264b8837f5 100644 --- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "nielsfaber"; domain = "alarmo"; - version = "1.10.12"; + version = "1.10.13"; src = fetchFromGitHub { owner = "nielsfaber"; repo = "alarmo"; tag = "v${version}"; - hash = "sha256-fzZJrPr1CO1zUlPA+cVNX+MCeMtcvIiz4NUM7q0wbFE="; + hash = "sha256-TIdgJBC2oGnxfdUHCaIlq6GYUiqLzc9F0ZF4RUILkog="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 070b6c44e602..32eb1f9766f3 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.2.13"; + version = "4.4.1"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-iMoXwcI9OlkamqxBs7AiecyB38kUS8PNq0n4SK85hu8="; + hash = "sha256-CGPc/6hpt+pBZtsNvyKffMwJkFNCPFajRiSMVwbXnls="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/ingress/package.nix b/pkgs/servers/home-assistant/custom-components/ingress/package.nix new file mode 100644 index 000000000000..9c24f074b074 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/ingress/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent rec { + owner = "lovelylain"; + domain = "ingress"; + version = "1.2.9"; + + src = fetchFromGitHub { + inherit owner; + repo = "hass_ingress"; + tag = version; + hash = "sha256-jjig0Dl/vdeuN7e25CH5L/Xvc60RM3BiAt3jUw/C9q4="; + }; + + meta = { + changelog = "https://github.com/lovelylain/hass_ingress/releases/tag/${src.tag}"; + description = "Add additional ingress panels to your Home Assistant frontend"; + homepage = "https://github.com/lovelylain/hass_ingress"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ David-Kopczynski ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix new file mode 100644 index 000000000000..e16c0fb998c8 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -0,0 +1,52 @@ +{ + buildHomeAssistantComponent, + fetchFromGitHub, + lib, + + # dependencies + mypyllant, + voluptuous, + + # tests + aioresponses, + polyfactory, + pytest-cov-stub, + pytest-homeassistant-custom-component, + pytest-xdist, + pytestCheckHook, +}: + +buildHomeAssistantComponent rec { + owner = "signalkraft"; + domain = "mypyllant"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "signalkraft"; + repo = "mypyllant-component"; + tag = "v${version}"; + hash = "sha256-6T8SGAP2535VqZmvSeITpMIa0SBJhnWsOKM1Y66WhHE="; + }; + + dependencies = [ + mypyllant + voluptuous + ]; + + nativeCheckInputs = [ + aioresponses + polyfactory + pytest-cov-stub + pytest-homeassistant-custom-component + pytest-xdist + pytestCheckHook + ]; + + meta = { + description = "Unofficial Home Assistant integration for interacting with myVAILLANT"; + changelog = "https://github.com/signalkraft/mypyllant-component/releases/tag/${src.tag}"; + homepage = "https://github.com/signalkraft/mypyllant-component"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ urbas ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index 909e5c4e1129..f70df37c19b1 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "4.1.1"; + version = "4.2.1"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30="; + hash = "sha256-mE39/f/2SmEJ5rTHhwmgGdQga4PQPGxoj/iKA1+Ou5k="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix b/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix index 82da77373fa5..295c6fd2a681 100644 --- a/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix +++ b/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "Lash-L"; domain = "roborock_custom_map"; - version = "0.1.1"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Lash-L"; repo = "RoborockCustomMap"; tag = version; - hash = "sha256-ZKaUTUTN0tTW8bks0TYixfmbEa7A7ERdJ+xZ365HEbU="; + hash = "sha256-jXkKjjof1/JeT0KDKIC4sX+P7JwWOzajbFOhlq772L8="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix index 7c8cd24dea4b..e12aaa385a76 100644 --- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "iprak"; domain = "sensi"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { inherit owner; repo = domain; tag = "v${version}"; - hash = "sha256-rF+BAP3Du+4Xoct63VzyGhQh933b8QyNMWk6qFj4e5s="; + hash = "sha256-WkXg+oIxkRIbU8L9kFJOQ798/2vR9yB0y/nuY1RWKJE="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index d0f834721577..16ca1005b9d2 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.2.2"; + version = "5.2.8"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-qXtZwiQRPNtxAsdp2gOoToqT4CHXS+76EWrzqp+9udk="; + hash = "sha256-rVlrfIKDojMV8FTVU9KlnBiWqs4vUJGhdA7W2NV42jQ="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 74b309f1cc70..8a47292cdc7e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.19.4"; + version = "7.20.0"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-fxNCF0mmfTo08UQJUF5ZGYi5EPN/SVKZI9Uo0TMRzw8="; + hash = "sha256-X92IztnaGh7rLIzYiFSGagVi8o1xM/FFuu9YmNRUhSg="; }; # TODO: build from source once yarn berry support lands in nixpkgs diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix index 5807c6220f50..ec2dd2328ea1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "lovelace-card-mod"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "thomasloven"; repo = "lovelace-card-mod"; rev = "v${version}"; - hash = "sha256-BXyNXxCSEY0/AUD+6ggTvXPyPQYnAjkEgAVFmui6FAs="; + hash = "sha256-w2ky3jSHRbIaTzl0b0aJq4pzuCNUV8GqYsI2U/eoGfs="; }; - npmDepsHash = "sha256-afIJbUNKKCWckL60cpj4V2SMCOX0Kn56AkVK9t923D0="; + npmDepsHash = "sha256-7VoPQGUQLuQYaB3xAbvv0Ux7kiE/usnIxX2+jYGQXqA="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix index eab96764ebc4..97546a17ef2d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "material-you-utilities"; - version = "2.0.26"; + version = "2.0.27"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "material-you-utilities"; tag = version; - hash = "sha256-eIPZhSft0myWkJgv20Ryt9XMMKKYgJunDZYwl4D2l3I="; + hash = "sha256-EUihU3qH4IyUoOZdLTne7/iK5AFwIJNoGu69gig+WHw="; }; - npmDepsHash = "sha256-seCHRwf0VSYEZN6CAsXZoj0KQPUCMWTU9pB6Bez76uk="; + npmDepsHash = "sha256-qIckMQ2d65vCU9Yx+vFzTTWLJjjtlpQg1h12wiDimqA="; postPatch = '' # Remove git dependency from rspack config diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 153b0a298fe8..f5b7aa7bfe47 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-HvTxuC+qjljFPjRkEjdf+Jy7atpTVtZRU7y05Rcvhps="; + hash = "sha256-vAg45lELCh/oB0h8SWWTUmPGezjODPQAW+fzojIKxy8="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-h3E2dJTdR6b+TwkXPdK0+hrMZ+Zj5b27oMDD413cBKM="; + npmDepsHash = "sha256-xtVf1/K0gqgYYzU0MbPhmWzKRvaDGEMN8ipwVwAmS44="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ebfc5e9c7d2a..edb335c54dd9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -87,8 +87,6 @@ let ]; }); - av = self.av_13; - imageio = super.imageio.overridePythonAttrs (oldAttrs: { disabledTests = oldAttrs.disabledTests or [ ] ++ [ # broken by pyav pin @@ -293,7 +291,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.11.3"; + hassVersion = "2025.12.2"; in python.pkgs.buildPythonApplication rec { @@ -314,13 +312,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-Wd+q2ooNguJMKnQ1uzLJtglAyBFXjBSj5hjEgY4bgzY="; + hash = "sha256-8JAI3urAl+RvAEV+C3sC0COSfK3oEGefT/dT6elIhRA="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-KxpjOPlusEHT+bRtgs/9EsIksTd4pRMKsXb7e5q+b2Q="; + hash = "sha256-glipo0eX5NHK0S0ktRtY6g1YUMU31nJB1YlIxIitzyY="; }; build-system = with python.pkgs; [ @@ -348,9 +346,11 @@ python.pkgs.buildPythonApplication rec { }) (fetchpatch { - # [2025.11.2] fix matter snapshots - url = "https://github.com/home-assistant/core/commit/04458e01be0748c3f6c980e126d5238d1ca915b6.patch"; - hash = "sha256-gzc0KmSZhOfHVRhIVmOTFTJMI+pAX+8LcOit4JUypyA="; + # pytest 9 renames some snapshots + name = "revert-to-pytest-8.patch"; + url = "https://github.com/home-assistant/core/commit/3f22dbaa2e1a7776185ec443bf26f90e90e55efa.patch"; + revert = true; + hash = "sha256-rHXpmHUNCr+lhYqiOVrCSQTWvWJ+jHNwPJzUeFtDPIw="; }) ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ec20d1ea367b..7f86786d442b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20251105.1"; + version = "20251203.2"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-keqQTQyo06xMUsZLf920n1eyu/iPrI2cNkXYMThhGFI="; + hash = "sha256-HFD/ShFRPLWzu9NmuMPauLlv41PmuH79AxMEB+EKMic="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index b9783b457519..70d148a252fd 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2025.11.7"; + version = "2025.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; tag = version; fetchSubmodules = true; - hash = "sha256-F6QctdjF6xoQ3d49MdOUb/8CHgV84wxZHUrGGmiYYcs="; + hash = "sha256-7fav3h8/Eu4Q4I0deDWov5UP5aEyS/ypIGLvuQlGWCI="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index a08886fa5119..0102e92a19d6 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.285"; + version = "0.13.300"; pyproject = true; disabled = pythonOlder "3.13"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; - rev = "refs/tags/${version}"; - hash = "sha256-pP8zUjOhhaXE+cbx3fKlJaoNBBprOfAKS0F92Tf8hjI="; + tag = version; + hash = "sha256-8SLhkzGKfT2RLWeKq3e8SZHD2H1Pm0uX/G3OqUGICxg="; }; build-system = [ setuptools ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/${src.tag}/CHANGELOG.md"; description = "Package to automatically extract testing plugins from Home Assistant for custom component testing"; homepage = "https://github.com/MatthewFlamm/pytest-homeassistant-custom-component"; license = lib.licenses.mit; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 7cdf4a01c776..33988f9022e3 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.11.3"; + version = "2025.12.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-Cl5wRdYGVGtDTsnlU5poHJA3F8wxh1e3Rb1Zhmfc2CI="; + hash = "sha256-9XGvZZ457dbnSiIvK1VAarjMtVUeUPkbYzSRkK2/TFc="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 0ba85f3d459b..179240bf4f78 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -13,6 +13,7 @@ let air_quality = getComponentDeps "camera" ++ getComponentDeps "conversation"; alexa = getComponentDeps "cloud" ++ getComponentDeps "frontend" ++ getComponentDeps "stream"; android_ip_webcam = getComponentDeps "camera"; + anthropic = getComponentDeps "ai_task"; assist_pipeline = getComponentDeps "frontend"; automation = getComponentDeps "frontend" ++ getComponentDeps "mobile_app"; axis = getComponentDeps "camera" ++ getComponentDeps "deconz"; @@ -84,6 +85,7 @@ let microsoft = getComponentDeps "tts"; microsoft_face_detect = getComponentDeps "conversation"; microsoft_face_identify = getComponentDeps "conversation"; + miele = getComponentDeps "cloud"; mjpeg = getComponentDeps "camera"; mobile_app = getComponentDeps "frontend"; motioneye = getComponentDeps "camera"; @@ -148,6 +150,7 @@ let arrow ]; yandextts = getComponentDeps "tts"; + yolink = getComponentDeps "cloud"; zeroconf = getComponentDeps "shelly"; zha = getComponentDeps "deconz" ++ getComponentDeps "frontend"; zwave_js = getComponentDeps "frontend"; @@ -178,15 +181,14 @@ let "tests/components/nzbget/test_config_flow.py::test_user_form_cannot_connect" "tests/components/nzbget/test_init.py::test_async_setup_raises_entry_not_ready" ]; - openai_conversation = [ - # Pydantic validation error - "tests/components/openai_conversation/test_conversation.py" - "tests/components/openai_conversation/test_ai_task.py" - ]; overseerr = [ # imports broken future module "tests/components/overseerr/test_event.py" ]; + systemmonitor = [ + # sandbox doesn't grant access to /sys/class/power_supply + "tests/components/systemmonitor/test_config_flow.py::test_add_and_remove_processes" + ]; youtube = [ # outdated snapshot "tests/components/youtube/test_sensor.py::test_sensor" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 829c39b33a6d..e8cb9ed3c53b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.65"; + version = "2.4.66"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - hash = "sha256-WLi+l9mUDsF/dlbAxrn0G2GKrEaLiUtTQUjjKWxTuLM="; + hash = "sha256-lNf/K0Ksu4KOhwuinky61I5VinnGI601luQRbvz+olo="; }; patches = [ diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index b7b8c50e7a21..c414553c676c 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -384,14 +384,14 @@ let lua = rec { name = "lua"; - version = "0.10.28"; + version = "0.10.29"; src = fetchFromGitHub { name = "lua"; owner = "openresty"; repo = "lua-nginx-module"; rev = "v${version}"; - hash = "sha256-GT1PpJWpEu5EciK4n9ZDz1gIU/ZdC/SAsIdu0niQy8o="; + hash = "sha256-z62Vwrthl1FJiTdrdhifZZe6crdi8c6sTkUim6KmVlU="; }; inputs = [ luajit_openresty ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 6c69af569fdb..ae38ad050f84 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -58,7 +58,6 @@ buildDotnetModule rec { changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - edwtjo nyanloutre purcell ]; diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix index 9c07ec416111..6e209851eacd 100644 --- a/pkgs/servers/kanidm/1_8.nix +++ b/pkgs/servers/kanidm/1_8.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.8.3"; - hash = "sha256-B4X5JtD1unfKUwMZVcZvFXfVcCjJ520YS79tVun8WrA="; - cargoHash = "sha256-PPAa1gH7MA8CHLCXF6k+tgMpfbVTyHGyKL7ZeR8nLpw="; + version = "1.8.4"; + hash = "sha256-pTDpVYUnw4JJ0lRNS21fRikAvKmfr9RtmlojT/b89XQ="; + cargoHash = "sha256-3X9ukrPo4bhMC9L7yjmcE8F684glYI/wd2kiH5kPFX8="; } diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index 3bef265103eb..352f7d9d5efe 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { A sendmail wrapper that calls the system sendmail. Do not install as system-wide sendmail! ''; platforms = platforms.unix; - maintainers = with maintainers; [ ekleog ]; mainProgram = "sendmail"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 78544423daf3..15f425c08bc6 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.5.2"; + version = "4.5.3"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-LePly+CcM+Dv6ipX9jIWWKhy2PiF1j8vgc9CXn2o+DQ="; + hash = "sha256-OOcy4eBGao2cVnRYhAogeSw0X234TEr50tFT2sSjmaQ="; passthru = { inherit version; yarnHash = "sha256-2MOl6kHidkGU2I/cZaUmbQCiEl9SDfL/j9fT/6eNdFA="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix index aba6765ee233..98259ec8d827 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-exploretraces-app"; - version = "1.2.0"; - zipHash = "sha256-QXBOODMgFJvPLgr1Gr6mkpW2YJwYlDO/ZXL3BlEhEJ0="; + version = "1.2.2"; + zipHash = "sha256-vQSnjSPiYvgwpbO7VvmG77DfP85+R6fRoGGpr+xslTc="; meta = with lib; { description = "Opinionated traces app"; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index f5389ce0185c..5d05663c516a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.23"; - zipHash = "sha256-ZQYVKLmIFsK9+u8lVR4Y/gVTtv0klDaSM7Yh+oe0qOE="; + version = "1.0.24"; + zipHash = "sha256-aoivPnxr8/8EQhz3hD/WAgvfwQ3nUXWjs22izx7yDp8="; meta = with lib; { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index ef82769dab22..5761984cbf0c 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.27.0"; + version = "0.28.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "sha256-oIsNqET3gHSajyWTxc+zoLiKQNCIXK77jtthOwYVtQg="; + sha256 = "sha256-Wt4AVBDptGJ4BlPzdaym5YyXRo0ApBDGEhoSrX7oRf4="; }; - vendorHash = "sha256-UHm3iIQ6/clPx/VBUG4j/WLoOhFN44nbAEZk94L/9EY="; + vendorHash = "sha256-WhXKBG1eCbXFQZmLwKsxjVV6uAfCMEIqco8Jr+vNdPI="; # dns-lookup is performed for the tests doCheck = false; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index bf93888c7b01..42f19bbcf136 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -30,7 +30,7 @@ let hash = "sha256-aC+GYMaxYKkY9GMaeRx22hQ3xi3kfWpaTLC9ajqOaAA="; }; - flux = rustPlatform.buildRustPackage { + flux = rustPlatform.buildRustPackage (finalAttrs: { pname = "libflux"; version = libflux_version; src = fetchFromGitHub { @@ -50,7 +50,7 @@ let substituteInPlace flux-core/Cargo.toml \ --replace-fail 'default = ["strict"]' 'default = []' ''; - sourceRoot = "${src.name}/libflux"; + sourceRoot = "${finalAttrs.src.name}/libflux"; cargoHash = "sha256-A6j/lb47Ob+Po8r1yvqBXDVP0Hf7cNz8WFZqiVUJj+Y="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; @@ -65,14 +65,14 @@ let passAsFile = [ "pkgcfg" ]; postInstall = '' mkdir -p $out/include $out/pkgconfig - cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include + cp -r $NIX_BUILD_TOP/${finalAttrs.src.name}/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace-fail /out $out '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; - }; + }); in buildGoModule { pname = "influxdb"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index f9bd9f94c3cf..be909083a0eb 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit (nixosTests) pulseaudio; + inherit (nixosTests) pulseaudio pulseaudio-tcp; }; meta = { diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index b10167d270bb..0d77f4d5729f 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { description = "Open Source Webmail Software"; maintainers = with lib.maintainers; [ vskilet - globin ma27 ]; license = lib.licenses.gpl3; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4a84ca165693..a9827881bf1f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -79,11 +79,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "samba"; - version = "4.22.5"; + version = "4.22.6"; src = fetchurl { url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; - hash = "sha256-2FZqFdPb/At3fR6Puy7umIoCTKnHhtysZd0QNHMHQA0="; + hash = "sha256-jmvrDM6H+zx2OvlMLcIf1HuP0C1Gs8sd6ypy35JZxCU="; }; outputs = [ @@ -332,6 +332,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.samba.org"; + changelog = "https://www.samba.org/samba/history/samba-${finalAttrs.version}.html"; description = "Standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 969cf26b5b4c..a53dc025b4c1 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { description = "Client library that can be used to connect to MySQL or MariaDB"; homepage = "https://github.com/mariadb-corporation/mariadb-connector-c"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ globin ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 238621d8ccfa..0fc9e58cbb83 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -14,13 +14,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg-gvm"; - version = "22.6.11"; + version = "22.6.12"; src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; tag = "v${finalAttrs.version}"; - hash = "sha256-jkpZg1LMWuH5R4I/kTO3cofL3uNt11yXSgfFppSNC+o="; + hash = "sha256-x+RTB4/Uj8Cif+JTVQjRU0UZxa3+LHwtooJi9eoB8vE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 03eb8bbed8b6..d5b80f792220 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pgmq"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; tag = "v${finalAttrs.version}"; - hash = "sha256-CnXweDsLO2yE+z1tPADqz54Q1rswsKoUVYbdiZFEbPs="; + hash = "sha256-oXsThqRs+nrNCb9A560gW3sm6LPQFucrlSolNCi0z3w="; }; sourceRoot = "${finalAttrs.src.name}/pgmq-extension"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 5cc4f21ea8db..67756050a004 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -176,7 +176,7 @@ let overrideCC llvmPackages.stdenv ( llvmPackages.stdenv.cc.override { # LLVM bintools are not used by default, but are needed to make -flto work below. - bintools = llvmPackages.bintools; + bintools = buildPackages."llvmPackages_${lib.versions.major llvmPackages.release_version}".bintools; } ) else @@ -572,7 +572,7 @@ let psqlSchema = lib.versions.major version; - withJIT = this.withPackages (_: [ this.jit ]); + withJIT = if jitSupport then this.withPackages (_: [ this.jit ]) else null; withoutJIT = this; pkgs = diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 1f4e17fe1622..db988be77b72 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -15,6 +15,7 @@ gem "activemodel", "~> 8.0.0" gem "activerecord", "~> 8.0.0" gem "activesupport", "~> 8.0.0" gem "railties", "~> 8.0.0" +gem "openssl", "~> 3.3.1" gem "propshaft" gem "json" diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 5958232a8a70..a4f1addb9a51 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -383,7 +383,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.3.0) + openssl (3.3.2) openssl-signature_algorithm (1.3.0) openssl (> 2.0) optimist (3.2.1) @@ -826,6 +826,7 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-oauth2 omniauth-twitter + openssl (~> 3.3.1) parallel parallel_tests pdf-reader @@ -1078,7 +1079,7 @@ CHECKSUMS omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8 omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745 omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264 - openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79 + openssl (3.3.2) sha256=7f4e01215dc9c4be1fca71d692406be3e6340b39c1f71a47fea9c497decd0f6c openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80 optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912 @@ -1243,4 +1244,4 @@ RUBY VERSION ruby 3.3.1p55 BUNDLED WITH - 2.5.22 + 2.7.2 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 248c7b7f5dcc..5a8dea76201b 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -2125,10 +2125,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz"; + sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz"; type = "gem"; }; - version = "3.3.0"; + version = "3.3.2"; }; openssl-signature_algorithm = { dependencies = [ "openssl" ]; diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index 0cfd51c1acfd..f3f564b73f31 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -7,13 +7,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-WA6DBrPBuXRIloO05UBunTJ9N01d6tO1K1uqojjO0mo="; + hash = "sha256-GXKchepYti5Pb1ODFeJL3apDGg7Tn69skQQhvV2nSeQ="; }; checkPlugins = [ fishtape ]; diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 333ea768fffe..52454d37e304 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "25.10.0"; + version = "25.12.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-MG60GzRG0NFQsGXBXBedSweucxo88S/NACXTme7ixRM="; + hash = "sha256-DN2QUxCVVjYn7b4xt/7+k5g1/7dfZ+cp5Yi0nJWh1mM="; }; postInstall = '' diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index d1b5547e59ab..9ac5cf6df732 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -100,7 +100,6 @@ rustPlatform.buildRustPackage { homepage = "https://www.nushell.sh/"; license = licenses.mit; maintainers = with maintainers; [ - Br1ght0ne johntitor joaquintrinanes ryan4yin diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5878cbb81a5a..d2efb4be73ef 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -310,9 +310,14 @@ rec { let bintools = stdenv.cc.bintools.override { extraBuildCommands = '' - wrap ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.buildPackages.mold}/bin/ld.mold - wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.buildPackages.mold}/bin/ld.mold - wrap ${stdenv.cc.bintools.targetPrefix}ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.buildPackages.mold}/bin/ld.mold + pushd $out/bin + ln -s ${pkgs.buildPackages.mold}/bin/${stdenv.cc.bintools.targetPrefix}ld.mold ${stdenv.cc.bintools.targetPrefix}ld.mold + '' # Pre-generated configure scripts call the linker binary without the target prefix when cross compiling. + + lib.optionalString (stdenv.cc.bintools.targetPrefix != "") '' + ln -s ${stdenv.cc.bintools.targetPrefix}ld.mold ld.mold + '' + + '' + popd ''; }; in diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 7d0381698465..a4b2ca42b780 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -178,12 +178,16 @@ in name = "cc-native"; nativeTools = true; nativeLibc = true; + expand-response-params = ""; inherit lib nativePrefix; + runtimeShell = shell; bintools = import ../../build-support/bintools-wrapper { name = "bintools"; inherit lib stdenvNoCC nativePrefix; nativeTools = true; nativeLibc = true; + expand-response-params = ""; + runtimeShell = shell; }; inherit stdenvNoCC; }; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8864de64dc76..4c613135e977 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -219,7 +219,7 @@ in }; }; - pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; }); + pkgs-lib = recurseIntoAttrs (callPackage ../pkgs-lib/tests { }); buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { }); diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index a2221183a8a6..3daa01b6247d 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -5,7 +5,13 @@ }: let - tests = tests-stdenv // test-extendMkDerivation // tests-fetchhg // tests-go // tests-python; + tests = + tests-stdenv + // test-extendMkDerivation + // tests-fetchhg + // tests-fetchurl + // tests-go + // tests-python; tests-stdenv = let @@ -131,6 +137,98 @@ let }; }; + tests-fetchgit = + let + src-with-sha256 = pkgs.fetchgit { + url = "https://example.com/source.git"; + sha256 = lib.fakeSha256; + }; + in + { + test-fetchgit-hash-compat = { + expr = { + inherit (src-with-sha256) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = lib.fakeSha256; + outputHashAlgo = "sha256"; + }; + }; + test-fetchgit-overrideAttrs-hash = { + expr = { + inherit (src-with-sha256.overrideAttrs { hash = pkgs.nix.src.hash; }) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = pkgs.nix.src.hash; + outputHashAlgo = null; + }; + }; + test-fetchurl-overrideAttrs-hash-empty = { + expr = { + inherit (src-with-sha256.overrideAttrs { hash = ""; }) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = lib.fakeHash; + outputHashAlgo = null; + }; + }; + }; + + tests-fetchurl = + let + src-with-sha256 = pkgs.fetchurl { + url = "https://example.com/source.tar.gz"; + sha256 = lib.fakeSha256; + }; + in + { + test-fetchurl-hash-compat = { + expr = { + inherit (src-with-sha256) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = lib.fakeSha256; + outputHashAlgo = "sha256"; + }; + }; + test-fetchurl-overrideAttrs-hash = { + expr = { + inherit (src-with-sha256.overrideAttrs { hash = pkgs.hello.src.hash; }) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = pkgs.hello.src.hash; + outputHashAlgo = null; + }; + }; + test-fetchurl-overrideAttrs-hash-empty = { + expr = { + inherit (src-with-sha256.overrideAttrs { hash = ""; }) + outputHash + outputHashAlgo + ; + }; + expected = { + outputHash = lib.fakeHash; + outputHashAlgo = null; + }; + }; + }; + tests-fetchhg = let ruamel_0_18_14-hash = "sha256-HDkPPp1xI3uoGYlS9mwPp1ZjG2gKvx6vog0Blj6tBuI="; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index cf09258d6fbc..3032b5d13b2b 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -10,12 +10,12 @@ let # early enough not to rebuild gcc but late enough to have patchelf - earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages; + earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages or pkgs; earlierPkgs = - stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages; + stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages + or earlyPkgs; # use a early stdenv so when hacking on stdenv this test can be run quickly - bootStdenv = - stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; + bootStdenv = earlyPkgs.stdenv.__bootPackages.stdenv.__bootPackages.stdenv or earlyPkgs.stdenv; pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; @@ -23,7 +23,8 @@ let inherit (stdenv.hostPlatform) system; }; bootStdenvStructuredAttrsByDefault = - pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; + pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv + or pkgsStructured.stdenv; runCommand = earlierPkgs.runCommand; diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index 653058dca130..33d84dab9875 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -10,6 +10,10 @@ # strictDeps has to be disabled because the shell isn't in buildInputs let + earlyBash = + stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive or pkgs.bashNonInteractive; + earlyCoreutils = stdenv.__bootPackages.stdenv.__bootPackages.coreutils or pkgs.coreutils; + tests = { bad-shebang = stdenv.mkDerivation { name = "bad-shebang"; @@ -110,9 +114,9 @@ let (derivation { name = "read-only-script"; system = stdenv.buildPlatform.system; - builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + builder = "${earlyBash}/bin/bash"; initialPath = [ - stdenv.__bootPackages.stdenv.__bootPackages.coreutils + earlyCoreutils ]; strictDeps = false; args = [ @@ -138,9 +142,9 @@ let (derivation { name = "preserves-read-only"; system = stdenv.buildPlatform.system; - builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + builder = "${earlyBash}/bin/bash"; initialPath = [ - stdenv.__bootPackages.stdenv.__bootPackages.coreutils + earlyCoreutils ]; strictDeps = false; args = [ @@ -173,9 +177,9 @@ let (derivation { name = "preserves-timestamp"; system = stdenv.buildPlatform.system; - builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + builder = "${earlyBash}/bin/bash"; initialPath = [ - stdenv.__bootPackages.stdenv.__bootPackages.coreutils + earlyCoreutils ]; strictDeps = false; args = [ @@ -209,9 +213,9 @@ let (derivation { name = "preserves-binary-data"; system = stdenv.buildPlatform.system; - builder = "${stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive}/bin/bash"; + builder = "${earlyBash}/bin/bash"; initialPath = [ - stdenv.__bootPackages.stdenv.__bootPackages.coreutils + earlyCoreutils ]; strictDeps = false; args = [ diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index feaca615d7e9..e76d535b94f7 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.208.0"; + version = "3.210.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.208.0-linux-x64.tar.gz"; - sha256 = "10nn8wxs6xzviszklkqh534xbpd3b62r20yvfi5sar06amzp22vn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.210.0-linux-x64.tar.gz"; + sha256 = "1jhmlpr418s4l4adand20gz6hr9jr513i498mjwlr6xcpdrgyl24"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.45.0-linux-amd64.tar.gz"; @@ -17,8 +17,8 @@ sha256 = "15csc079n5z76pizpxd7516npj5s75rmiaxd8fqgb19j07da68cc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.89.0-linux-amd64.tar.gz"; - sha256 = "11n20241g3fm6125rw8l1iadg9rjisk5yrnbklw0ccka2pb27s70"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.90.0-linux-amd64.tar.gz"; + sha256 = "1wi0fhl5vaiz89y48k0h3y9di7b8281mfmd76wrrkhql0hnglfw7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0vd6yb9wi3aa5mvvvfx2zx8f2k3dwvhsj35ykwy587n21jaii7vl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.5.0-linux-amd64.tar.gz"; - sha256 = "0hx0ngpgr042h0z7s12xripkyf98s617avbbsyzziyxf065q640k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.6.0-linux-amd64.tar.gz"; + sha256 = "0sd257n5cxlrrs1hwqzdfbzh8jpbswl0hggmn9ca9f75dj7ab7c5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.9.1-linux-amd64.tar.gz"; @@ -89,12 +89,12 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.28.0-linux-amd64.tar.gz"; - sha256 = "1450j3288p6yn26917jcw2kwf5b2qc3aa4qszmifch4m30m7rmvv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.29.0-linux-amd64.tar.gz"; + sha256 = "08ygsb58kz9lzq1zs2xkvi9prmfa7dm0kg4y5dfz2qdqb5bis5jr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-amd64.tar.gz"; - sha256 = "12b143kpb54nc543gdazpbl4bnslamsvz60iby03g0fsxjwhswpr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.1-linux-amd64.tar.gz"; + sha256 = "022r510d91nyjf5rigshmyq54pwkghdgm4r696nrg6bsgc5s1c7x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "06cjvv78card284z5bc3843pw54fjyhkjq053jgb0ls67wiy1nc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-amd64.tar.gz"; - sha256 = "05vxzsg0869rg0ap36pasxxwbslndns6jss9d0cydf8v0kna30hx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.127.0-linux-amd64.tar.gz"; + sha256 = "0sbvq6c26qvmpwgvzsvnqsbmb7y7ww5nr0zb1l95kxh6z0v7kh8g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.208.0-darwin-x64.tar.gz"; - sha256 = "11p1258gdhzv1wdyi90c4sn4qa8i4yqlmlyjx74ladfpkpmyr324"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.210.0-darwin-x64.tar.gz"; + sha256 = "1rysg8nvq722cg3ish2xsrh8bz3ps4qj7zg84m9yapsvys1nlnm1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.45.0-darwin-amd64.tar.gz"; @@ -175,8 +175,8 @@ sha256 = "1nxwp3xqa2gyd34f63izsb7mxqxwla8zxrqd4bk74frlmkna4yw8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.89.0-darwin-amd64.tar.gz"; - sha256 = "1lfdr22f9vpy7qlv1fbh6mxdfiqddp06mf1ikd61l9n0by1713f3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.90.0-darwin-amd64.tar.gz"; + sha256 = "1nxy211qcvddr2m4ngsrb94ngs5b3rmjlzsliglcdxqzfzw916vm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "1zkj59607r2d30baavqklliq8l7ifdbqyq6cjybdp8i04qkccdk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.5.0-darwin-amd64.tar.gz"; - sha256 = "00zcxfj6v6msjnnm7xdbq3mdl10kxdpqmz6dqwv4503b8vcv85gq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.6.0-darwin-amd64.tar.gz"; + sha256 = "1c07fldh78kbw0y3gbcxa3hpc8sc5h5fb8hgn0flbhzaj234dpay"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.9.1-darwin-amd64.tar.gz"; @@ -247,12 +247,12 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.28.0-darwin-amd64.tar.gz"; - sha256 = "0g4ai3iaqxnhm2qgmjn7911pri0gnyrbjmf487qn7db7lbra70ph"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.29.0-darwin-amd64.tar.gz"; + sha256 = "0hgnn2rq7pa1y3hs0r5pv2g6hsg0bg7gdj7xr8n563wp9ips8l8r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-amd64.tar.gz"; - sha256 = "11ra4b2jd2gkd5fhfhaxkyxgg8hwlmzhh036fr8l69l93nawi8c7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.1-darwin-amd64.tar.gz"; + sha256 = "02b7ch9w02q0d9xb6gw5akrrfgsr2xsvhdrwgmn8yf8pm0lqjzgz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1qqzy1q95zssllz1nh941x95jz4k258b9z09mpv5fhfwd3wjrq3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-amd64.tar.gz"; - sha256 = "0b62i9bmqdqjw0qk3m97x9274vn3ib8xwc6lxsshywkakf1zw0cg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.127.0-darwin-amd64.tar.gz"; + sha256 = "1y92577pa8qxgqm4kfhlfgfxi42z03kba95hw3539ksanlbw8dzw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.208.0-linux-arm64.tar.gz"; - sha256 = "0rpmsq9a7dvs4gxlb5zxs3m9hk88xq2lwlalh83rng43k58inhjf"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.210.0-linux-arm64.tar.gz"; + sha256 = "11b2r451rq9p3rjgk62lcp0fk4dhq6r518npiavqjh6y7i1drk2d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.45.0-linux-arm64.tar.gz"; @@ -333,8 +333,8 @@ sha256 = "0a4lzmv2k0raq4w7fw7kwbxg71rrcdvxdja5sg8ia1wacsdg8iiw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.89.0-linux-arm64.tar.gz"; - sha256 = "178ji6awa3wsrk5728d0v76l1v3hyharg5hlwsvgzx88xy13043i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.90.0-linux-arm64.tar.gz"; + sha256 = "0qv8v74javkyipyy1gps5qa677dzg39dhb0q4nni1wp15lx8cd1v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1gmnpcr8ds6vyg3p88m4kppanks9brin3lhjqshffvf33fd7pqas"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.5.0-linux-arm64.tar.gz"; - sha256 = "157waiz2lbw8y6xs4z33z4g32gicqcjaadm14rmyzs42rsbmyiy3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.6.0-linux-arm64.tar.gz"; + sha256 = "0bbbk6d2k8ywnh609hzhcviirr9sg8fm6fh1wggp7ygx1gsi6yad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.9.1-linux-arm64.tar.gz"; @@ -405,12 +405,12 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.28.0-linux-arm64.tar.gz"; - sha256 = "0wd981xnjji7fm31k3hx2msq766h968p17gzxp8gf3mv1l0fhc0w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.29.0-linux-arm64.tar.gz"; + sha256 = "14gxdfawflyxzikg2wi5r7g67z2x95vrxd27nf0v9isk9x0q4xhx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-arm64.tar.gz"; - sha256 = "12xf6nbvv4r5q93495cddfbyj0rg5slpbcqaykk5jydr45arms2y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.1-linux-arm64.tar.gz"; + sha256 = "03db83siv4a2xvz6gfx5zah2fmryipw7gwnsvgld6l4hw6frdf5q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "1gbnypsi339z9gizbwjakhvzxchljfkrwdpy4fjmy5424kwzm3wc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-arm64.tar.gz"; - sha256 = "1f983sfqqab9zfn30ypzmzixh65fjgpqd4v8id3zrh74k5mjil50"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.127.0-linux-arm64.tar.gz"; + sha256 = "07c1fz310yfjk8izlz56z0i0azwfw6fpmqb1larffcw1dgb733xz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.208.0-darwin-arm64.tar.gz"; - sha256 = "08hx54zmjryr9q34yw6zvfmyi0dgz4rjlkrwjyimdq7kdg8109pf"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.210.0-darwin-arm64.tar.gz"; + sha256 = "0v6wchl23ykib6zd62n45np2pnqkndbxd7msrqa52pr5rhl23x4c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.45.0-darwin-arm64.tar.gz"; @@ -491,8 +491,8 @@ sha256 = "15nhd0ysji9vwcydvqq9wnvivrphdmk3hh6qbnnzgzbx0qwl9i46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.89.0-darwin-arm64.tar.gz"; - sha256 = "1caw1marzyvlvfda07zszkgbi2634smgvlml76y8pgcil4bfd8d3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.90.0-darwin-arm64.tar.gz"; + sha256 = "1hdab4rk3d0v7zrqimnrkfmvbsawnhhdwld0mbxg5pcdb7w15gmm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "09l3lkl6mx9fmrwnmvpbl3ba1yz55lckf2jjgv410affn8w9vbwr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.5.0-darwin-arm64.tar.gz"; - sha256 = "0jkf4ki4n2gc6dh8xdp3p2y8f5xgn8j88pnql75m9ph2l0zhfjkp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.6.0-darwin-arm64.tar.gz"; + sha256 = "0dgvrqn4mfsrlrvg5hq349578p4qblcw6d88mwj3g6w56hzd6gjs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.9.1-darwin-arm64.tar.gz"; @@ -563,12 +563,12 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.28.0-darwin-arm64.tar.gz"; - sha256 = "0wd1ajx8hsprwkybp32vm2vp5c86ars7ckwbg4hs1zakrnz7fspy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.29.0-darwin-arm64.tar.gz"; + sha256 = "07x130w0agsxyzn5rmi0lwr315gz97ygp0g1903bw6r7im79qb9p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-arm64.tar.gz"; - sha256 = "0z66mps5rm42ga6c9n59zahkj3pg78583p4cmf73fap3y8gpfmd2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.1-darwin-arm64.tar.gz"; + sha256 = "1jw3p6rjqprmwzmq61fbmv1dwlp6sdkia1zwqy425sc1bpv1yh8k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "09icryd59qz0iqlk0c5m2plfj50c135njgdzglrajpqc9nmhhsvw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-arm64.tar.gz"; - sha256 = "09xwsyjlrrci8gn0zg97jlx0fa9mnzbz0v42myzzdrq6vvidss9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.127.0-darwin-arm64.tar.gz"; + sha256 = "0s66wj7c56f7s9jgxii9knx507ycsr7ni69bjvmkyimsd08f5mvw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix deleted file mode 100644 index 389ef9ad734d..000000000000 --- a/pkgs/tools/backup/httrack/qt.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv, - mkDerivation, - lib, - fetchurl, - cmake, - pkg-config, - makeWrapper, - httrack, - qtbase, - qtmultimedia, -}: - -mkDerivation rec { - pname = "httraqt"; - version = "1.4.9"; - - src = fetchurl { - url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz"; - sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b"; - }; - - buildInputs = [ - httrack - qtbase - qtmultimedia - ]; - - nativeBuildInputs = [ - cmake - makeWrapper - pkg-config - ]; - - prePatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)" \ - "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" \ - --replace-fail "CMAKE_POLICY(SET CMP0003 OLD)" "" \ - --replace-fail "CMAKE_POLICY(SET CMP0015 OLD)" "" - - substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ - --replace /usr/include/httrack/ ${httrack}/include/httrack/ - - substituteInPlace distribution/posix/CMakeLists.txt \ - --replace /usr/share $out/share - - substituteInPlace desktop/httraqt.desktop \ - --replace Exec=httraqt Exec=$out/bin/httraqt - - substituteInPlace sources/main/httraqt.cpp \ - --replace /usr/share/httraqt/ $out/share/httraqt - ''; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; - mainProgram = "httraqt"; - homepage = "http://www.httrack.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index a039143821e1..dd3eb8a0baa3 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index f7c98d2f2cdd..2668c1693292 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ sander ]; platforms = platforms.all; pkgConfigModules = [ "liblzma" ]; }; diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix index f145b666d21d..30de45679491 100644 --- a/pkgs/tools/misc/bat-extras/modules/core.nix +++ b/pkgs/tools/misc/bat-extras/modules/core.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bbigras - perchun + PerchunPak ]; platforms = lib.platforms.all; }; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 29929257d726..e589e33f60a8 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -510,6 +510,24 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c448f511e74cb7c776b314fcb7943f98d3f22b6d"; hash = "sha256-64gMhCEW0aYHt46crX/qN/3Hj8MgvWLazgQlVXqe8LE="; }) + # Required to apply the GCC-15 patch + (fetchpatch { + name = "gnulib_Add_patch_to_allow_GRUB_w_GCC-15_compile_0_1.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=bba7dd7363402157034e9c94ee3d9ea82e37861d"; + hash = "sha256-KO9rE/9xRkIGi/Y6jv1gVPiAJZUejwaUW6kIWthPUhw="; + }) + # Required to apply the GCC-11 patch + (fetchpatch { + name = "gnulib_Add_patch_to_allow_GRUB_w_GCC-15_compile_0_2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=db506b3b83640ab166a782e1ca47c47836afddcd"; + hash = "sha256-4ucCu+9OZ8NoicLF9hCgUpX4xgJk4Gzu6F3P4zl9J3U="; + }) + # Required to build grub 2.12 with GCC 15 + (fetchpatch { + name = "gnulib_Add_patch_to_allow_GRUB_w_GCC-15_compile_1_2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ac1512b872af8567b408518a7efa01607a0219ae"; + hash = "sha256-deyp6Yatlgv86bYMt7WcWhKg8J6StDPUEy4UPHqJYIc="; + }) ]; postPatch = diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix index dea4fe118699..0dd0d4510afc 100644 --- a/pkgs/tools/misc/opentelemetry-collector/releases.nix +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -136,7 +136,6 @@ let ''; license = licenses.asl20; maintainers = with maintainers; [ - uri-canva jk zimbatm ]; diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix index e484a68d852f..194c804fd990 100644 --- a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix +++ b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -28,7 +28,10 @@ buildPythonApplication rec { homepage = "https://github.com/timofurrer/pandoc-plantuml-filter"; description = "Pandoc filter which converts PlantUML code blocks to PlantUML images"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ cmcdragonkai ]; + maintainers = with lib.maintainers; [ + cmcdragonkai + l33tname + ]; mainProgram = "pandoc-plantuml"; }; } diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix new file mode 100644 index 000000000000..1768772ab381 --- /dev/null +++ b/pkgs/tools/networking/iroh/default.nix @@ -0,0 +1,58 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +let + mkIrohPackage = + { + name, + cargoFeatures ? [ ], + }: + rustPlatform.buildRustPackage rec { + pname = name; + version = "0.95.1"; + + src = fetchFromGitHub { + owner = "n0-computer"; + repo = "iroh"; + rev = "v${version}"; + hash = "sha256-YxifH/mH6x6b8J5xyG+/f18o9ngmiLVKvRaDgIv3ok8="; + }; + + cargoHash = "sha256-MdJpGCLf90fTjbJKHCrLLZbLyb4gmQn4SsF5iCqNVVI="; + + buildFeatures = cargoFeatures; + cargoBuildFlags = [ + "--bin" + name + ]; + + # Some tests require network access which is not available in nix build sandbox. + doCheck = false; + + meta = with lib; { + description = "Efficient IPFS for the whole world right now"; + homepage = "https://iroh.computer"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ + andreashgk + cameronfyfe + ]; + mainProgram = name; + }; + }; +in +{ + iroh-dns-server = mkIrohPackage { + name = "iroh-dns-server"; + }; + + iroh-relay = mkIrohPackage { + name = "iroh-relay"; + cargoFeatures = [ "server" ]; + }; +} diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 21d6dc440ac1..c5a268c7f1fa 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { description = "Nix-based distributed service deployment tool"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ - sander tomberek ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index a4c4f40b99d3..059a7246b63d 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -103,7 +103,6 @@ stdenv.mkDerivation rec { meta = { description = "Automated deployment of mutable components and services for Disnix"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 3d402d6fd06e..ebf4a6fd6b09 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -23,6 +23,7 @@ nix-serve-ng, colmena, nix-update, + nix-init, storeDir ? "/nix/store", stateDir ? "/nix/var", @@ -136,6 +137,10 @@ let nix = self.lix; inherit (self) nixpkgs-review; }; + + nix-init = nix-init.override { + nix = self.lix; + }; }; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0096d2f8dffc..877ab89b4a8e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,6 +5,7 @@ nixDependencies, generateSplicesForMkScope, fetchFromGitHub, + fetchpatch2, runCommand, pkgs, pkgsi686Linux, @@ -165,17 +166,26 @@ lib.makeExtensible ( nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; - nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.31.2"; - inherit (self.nix_2_30.meta) maintainers teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI="; - }; - }; + nixComponents_2_31 = + (nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.31.2"; + inherit (self.nix_2_30.meta) maintainers teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI="; + }; + }).appendPatches + ( + # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109 + lib.optional stdenv.isLinux (fetchpatch2 { + name = "nix-2.31-14240-sri-error-message.patch"; + url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch"; + hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18="; + }) + ); nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix index d8dcf40ebfa4..c8254f56afab 100644 --- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix +++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix @@ -40,7 +40,7 @@ mkMesonDerivation (finalAttrs: { python3 rsync ] - ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [ + ++ lib.optionals (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [ json-schema-for-humans ] ++ [ diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index fc24d6bccf59..30312d05fdba 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -21,6 +21,10 @@ version, embeddedSandboxShell ? stdenv.hostPlatform.isStatic, + + withAWS ? + # Default is this way because there have been issues building this dependency + stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin), }: mkMesonLibrary (finalAttrs: { @@ -39,7 +43,7 @@ mkMesonLibrary (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux libseccomp # There have been issues building these dependencies ++ - lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) + lib.optional withAWS # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests. (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp); @@ -52,6 +56,9 @@ mkMesonLibrary (finalAttrs: { (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) ] + ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") ( + lib.mesonEnable "s3-aws-auth" withAWS + ) ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ab2ad78f66f9..6cbac8c1fa93 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -47,7 +47,6 @@ buildGoModule rec { avaq np rvolosatovs - Br1ght0ne shofius ryand56 ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 366dc2ac2aac..41093199dc83 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { rvolosatovs puffnfresh np - Br1ght0ne shofius ryand56 ]; diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index b8901d433da5..753fc2233c0c 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fpletz - globin ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c6db26d29989..f6b308d6ebc1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -288,6 +288,10 @@ mapAliases { androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09 ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24 ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24 + ansible_2_16 = throw "ansible_2_16 has been removed, as it is EOL"; # Added 2025-11-10 + ansible_2_17 = throw "ansible_2_17 has been removed, as it is EOL"; # Added 2025-11-10 + ansible_2_18 = throw "ansible_2_18 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 + ansible_2_19 = throw "ansible_2_19 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20 ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27 apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27 @@ -309,6 +313,7 @@ mapAliases { artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04 artim-dark = aritim-dark; # Added 2025-07-27 aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27 + asio_1_10 = throw "'asio_1_10' has been removed as it is outdated and unused. Use 'asio' instead"; # Added 2025-12-03 asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27 asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19 atlassian-cli = appfire-cli; # Added 2025-09-29 @@ -745,6 +750,7 @@ mapAliases { ipfs-migrator-all-fs-repo-migrations = throw "'ipfs-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27 ipfs-migrator-unwrapped = throw "'ipfs-migrator-unwrapped' has been renamed to/replaced by 'kubo-migrator-unwrapped'"; # Converted to throw 2025-10-27 ir.lv2 = ir-lv2; # Added 2025-09-37 + iroh = throw "iroh has been split into iroh-dns-server and iroh-relay"; # Added 2025-11-06 isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18 iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27 itktcl = throw "'itktcl' has been renamed to/replaced by 'tclPackages.itktcl'"; # Converted to throw 2025-10-27 @@ -762,10 +768,12 @@ mapAliases { jing = jing-trang; # Added 2025-09-18 joplin = joplin-cli; # Added 2025-11-03 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25 + jsduck = throw "jsduck has been removed, as it was broken and and unmaintained upstream."; # Added 2025-12-02 julia_19 = throw "Julia 1.9 has reached its end of life and 'julia_19' has been removed. Please use a supported version."; # Added 2025-10-29 julia_19-bin = throw "Julia 1.9 has reached its end of life and 'julia_19-bin' has been removed. Please use a supported version."; # Added 2025-10-29 k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27 k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 + k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27 kanidm = warnAlias "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 @@ -779,6 +787,7 @@ mapAliases { kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27 khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 + knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30 kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27 kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2025-10-27 kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2025-10-27 @@ -1068,6 +1077,7 @@ mapAliases { mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07 mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29 moar = warnAlias "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02 + mold-wrapped = warnAlias "'mold-wrapped' has been renamed to 'mold'" pkgs.mold; # Added 2025-11-12 mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23 monitor = pantheon.elementary-monitor; # Added 2025-10-10 mono4 = mono6; # Added 2025-08-25 @@ -1200,6 +1210,7 @@ mapAliases { opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10 openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27 openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27 + openhmd = throw "'openhmd' has been removed due to being unmaintained upstream"; # Added 2025-11-05 openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27 openjdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 @@ -1234,6 +1245,7 @@ mapAliases { pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27 + pdf2djvu = throw "pdf2djvu has been removed because it was broken and archived upstream"; # added 2025-12-06 pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27 pds = warnAlias "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20 pdsadmin = warnAlias "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20 @@ -1388,6 +1400,7 @@ mapAliases { river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30 rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05 rke2_1_30 = throw "'rke2_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-11-04 + rke2_1_31 = throw "'rke2_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 rl_json = throw "'rl_json' has been renamed to/replaced by 'tclPackages.rl_json'"; # Converted to throw 2025-10-27 rockbox_utility = throw "'rockbox_utility' has been renamed to/replaced by 'rockbox-utility'"; # Converted to throw 2025-10-27 rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 @@ -1434,6 +1447,7 @@ mapAliases { sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27 simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17 + sioclient = throw "'sioclient' has been removed as it is no longer used by freedv, and doesn't build with newer asio"; # Added 2025-12-03 siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18 sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26 @@ -1482,6 +1496,7 @@ mapAliases { spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16 springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16 sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 + src = throw "The \"src\" package has been renamed to \"simple-revision-control\". If you encounter this error and did not intend to use that package you may have a falsely constructed overlay."; # Added 2025-11-19 ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27 stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08 starpls-bin = throw "'starpls-bin' has been renamed to/replaced by 'starpls'"; # Converted to throw 2025-10-27 @@ -1600,13 +1615,6 @@ mapAliases { trilium-next-server = trilium-server; # Added 2025-08-30 trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 trust-dns = throw "'trust-dns' has been renamed to/replaced by 'hickory-dns'"; # Converted to throw 2025-10-27 - tt-rss = throw "'tt-rss' has been removed, as it was discontinued on 2025-11-01"; # Added 2025-10-03 - tt-rss-plugin-auth-ldap = throw "'tt-rss-plugin-auth-ldap' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 - tt-rss-plugin-data-migration = throw "'tt-rss-plugin-data-migration' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 - tt-rss-plugin-feediron = throw "'tt-rss-plugin-feediron' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 - tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 - tt-rss-plugin-ff-instagram = throw "'tt-rss-plugin-ff-instagram' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 - tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03 tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27 typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27 typstfmt = throw "'typstfmt' has been removed due to lack of upstream maintenance, consider using 'typstyle' instead"; # Added 2025-10-26 @@ -1722,6 +1730,7 @@ mapAliases { zinc = throw "'zinc' has been renamed to/replaced by 'zincsearch'"; # Converted to throw 2025-10-27 zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27 zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20 + zotero_7 = throw "'zotero_7' has been renamed to/replaced by 'zotero'"; # Added 2025-12-09 zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26 zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26 zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ff2404eb4ca..3a4b3203986a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -403,8 +403,6 @@ with pkgs; name = "die-hook"; } ../build-support/setup-hooks/die.sh; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - devShellTools = callPackage ../build-support/dev-shell-tools { }; dockerTools = callPackage ../build-support/docker { @@ -506,8 +504,6 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; - magika = with python3Packages; toPythonApplication magika; mysql-shell = mysql-shell_8; @@ -1065,6 +1061,11 @@ with pkgs; } ); + inherit (callPackages ../tools/networking/iroh/default.nix { }) + iroh-relay + iroh-dns-server + ; + inherit (callPackages ../tools/networking/ivpn/default.nix { }) ivpn ivpn-service @@ -1078,8 +1079,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; - openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; openusd = python3Packages.openusd.override { @@ -1103,8 +1102,6 @@ with pkgs; ufolint = with python3Packages; toPythonApplication ufolint; - veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; - ventoy-full = ventoy.override { withCryptsetup = true; withXfs = true; @@ -1422,8 +1419,6 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS - cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - kitty = callPackage ../by-name/ki/kitty/package.nix { inherit (darwin) autoSignDarwinBinariesHook; }; @@ -1500,8 +1495,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; - authelia = callPackage ../servers/authelia { buildGoModule = buildGo124Module; pnpm = pnpm_10; @@ -1513,6 +1506,8 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; + azure-sdk-for-cpp = recurseIntoAttrs (callPackage ../development/libraries/azure-sdk-for-cpp { }); + # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build @@ -1632,8 +1627,6 @@ with pkgs; go2tv-lite = go2tv.override { withGui = false; }; - guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; - hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hwi = with python3Packages; toPythonApplication hwi; @@ -1707,10 +1700,6 @@ with pkgs; bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras)); - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - beautysh = with python3.pkgs; toPythonApplication beautysh; inherit (callPackages ../misc/logging/beats/7.x.nix { }) @@ -2144,8 +2133,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }; - mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; - nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { }); seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; @@ -2320,8 +2307,6 @@ with pkgs; ; citrix_workspace = citrix_workspace_25_05_0; - cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - colord-gtk4 = colord-gtk.override { withGtk4 = true; }; connmanFull = connman.override { @@ -3218,9 +3203,12 @@ with pkgs; nodejs-slim_24 = callPackage ../development/web/nodejs/v24.nix { enableNpm = false; }; corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; }; + nodejs_25 = callPackage ../development/web/nodejs/v25.nix { }; + nodejs-slim_25 = callPackage ../development/web/nodejs/v25.nix { enableNpm = false; }; + # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs_24; - nodejs-slim_latest = nodejs-slim_24; + nodejs_latest = nodejs_25; + nodejs-slim_latest = nodejs-slim_25; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; @@ -5982,38 +5970,7 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; - ansible = ansible_2_19; - ansible_2_19 = python3Packages.toPythonApplication python3Packages.ansible-core; - ansible_2_18 = python3Packages.toPythonApplication ( - python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.18.8"; - src = fetchPypi { - pname = "ansible_core"; - inherit version; - hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0="; - }; - }) - ); - ansible_2_17 = python3Packages.toPythonApplication ( - python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.17.8"; - src = fetchPypi { - pname = "ansible_core"; - inherit version; - hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; - }; - }) - ); - ansible_2_16 = python3Packages.toPythonApplication ( - python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.16.14"; - src = fetchPypi { - pname = "ansible_core"; - inherit version; - hash = "sha256-gCef/9mGhrrfqjLh7HhdmKbfGy/B5Al97AWXZA10ZBU="; - }; - }) - ); + ansible = python3Packages.toPythonApplication python3Packages.ansible-core; ansible-builder = with python3Packages; toPythonApplication ansible-builder; @@ -6323,8 +6280,6 @@ with pkgs; ]; }; - cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - # Does not actually depend on Qt 5 inherit (plasma5Packages) extra-cmake-modules; @@ -6532,11 +6487,11 @@ with pkgs; mkdocs = with python3Packages; toPythonApplication mkdocs; - mold-wrapped = wrapBintoolsWith { - bintools = mold; + mold = wrapBintoolsWith { + bintools = mold-unwrapped; extraBuildCommands = '' - wrap ${targetPackages.stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${mold}/bin/ld.mold - wrap ${targetPackages.stdenv.cc.bintools.targetPrefix}mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${mold}/bin/mold + wrap ${targetPackages.stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${mold-unwrapped}/bin/ld.mold + wrap ${targetPackages.stdenv.cc.bintools.targetPrefix}mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${mold-unwrapped}/bin/mold ''; }; @@ -6851,8 +6806,8 @@ with pkgs; argparse-manpage = with python3Packages; toPythonApplication argparse-manpage; - asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio = callPackage ../development/libraries/asio { }; + asio_1_32_0 = callPackage ../by-name/as/asio/package.nix { asioVersion = "1.32.0"; }; + asio_1_36_0 = callPackage ../by-name/as/asio/package.nix { asioVersion = "1.36.0"; }; aspell = callPackage ../development/libraries/aspell { }; @@ -6911,12 +6866,6 @@ with pkgs; c-blosc2 ; - cachix = (lib.getBin haskellPackages.cachix).overrideAttrs (old: { - meta = (old.meta or { }) // { - mainProgram = old.meta.mainProgram or "cachix"; - }; - }); - niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); @@ -7474,6 +7423,7 @@ with pkgs; icu75 icu76 icu77 + icu78 ; icu = icu76; @@ -9231,10 +9181,6 @@ with pkgs; kanidmWithSecretProvisioning_1_8 ; - knot-resolver = callPackage ../servers/dns/knot-resolver { - systemd = systemdMinimal; # in closure already anyway - }; - leafnode = callPackage ../servers/news/leafnode { }; leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; @@ -9827,8 +9773,6 @@ with pkgs; libuuid = if stdenv.hostPlatform.isLinux then util-linuxMinimal else null; - elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { }; - error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { }); ffado = callPackage ../os-specific/linux/ffado { }; @@ -10027,7 +9971,9 @@ with pkgs; ); net-tools = - if stdenv.hostPlatform.isLinux then + # some platforms refer back to this from unixtools, so this is needed to + # break the cycle + if stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin then callPackage ../os-specific/linux/net-tools { } else unixtools.net-tools; @@ -10051,7 +9997,9 @@ with pkgs; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) procps = - if stdenv.hostPlatform.isLinux then + # some platforms refer back to this from unixtools, so this is needed to + # break the cycle + if stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -10079,12 +10027,6 @@ with pkgs; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - sddm-astronaut = qt6Packages.callPackage ../data/themes/sddm-astronaut { }; - - sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { }; - - sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; - sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; sgx-psw = callPackage ../os-specific/linux/sgx/psw { @@ -10304,10 +10246,6 @@ with pkgs; androguard = with python3.pkgs; toPythonApplication androguard; - andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { }; - - bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; - dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 @@ -10343,9 +10281,6 @@ with pkgs; moeli = eduli; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5; font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6; @@ -10379,10 +10314,6 @@ with pkgs; gruppled-white-lite-cursors ; - gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { - inherit (plasma5Packages) breeze-icons; - }; - iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix { }); /** @@ -10392,15 +10323,6 @@ with pkgs; */ inherit (callPackage ../data/json-schema/default.nix { }) jsonSchemaCatalogs; - kde-rounded-corners = - kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners - { }; - - la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { - inherit (plasma5Packages) breeze-icons; - inherit (pantheon) elementary-icon-theme; - }; - inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 @@ -10417,8 +10339,6 @@ with pkgs; # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs (callPackages ../data/fonts/lohit-fonts { }); - maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; - marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { inherit (kdePackages) breeze-icons; }; @@ -10454,24 +10374,14 @@ with pkgs; stdenv = gccStdenv; }; - numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf_colr_0" ]; }; openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf" ]; }; - papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - papis = with python3Packages; toPythonApplication papis; polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; - qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { }; - ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 }; @@ -10512,10 +10422,6 @@ with pkgs; source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf; source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = res.gtk2; - }; - themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { }; tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { }); @@ -10750,9 +10656,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_25 docker_28 + docker_29 ; - docker = docker_28; + docker = docker_29; docker-client = docker.override { clientOnly = true; }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -11377,7 +11284,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_31 k3s_1_32 k3s_1_33 k3s_1_34 @@ -11948,8 +11854,6 @@ with pkgs; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override { @@ -12041,7 +11945,6 @@ with pkgs; callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; inherit (callPackage ../applications/networking/cluster/rke2 { }) - rke2_1_31 rke2_1_32 rke2_1_33 rke2_1_34 @@ -12654,10 +12557,6 @@ with pkgs; ; }; - xournalpp = callPackage ../applications/graphics/xournalpp { - lua = lua5_3; - }; - xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; xmobar = haskellPackages.xmobar.bin; @@ -12730,8 +12629,6 @@ with pkgs; SDL_image = SDL_image.override { SDL = SDL_sixel; }; }; - zotero_7 = pkgs.zotero; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; @@ -14261,8 +14158,6 @@ with pkgs; dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { }); - httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { }; - inherit (callPackage ../applications/networking/instant-messengers/discord { }) discord discord-ptb diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 3bf0437b183f..9a87aa6555ba 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -3,6 +3,9 @@ buildPackages, pkgs, targetPackages, + libc, + preLibcHeaders, + darwin, generateSplicesForMkScope, makeScopeWithSplicing', stdenv, @@ -53,7 +56,7 @@ makeScopeWithSplicing' { }; binutils = pkgs.wrapBintoolsWith { - inherit (targetPackages) libc; + libc = targetPackages.libc or libc; bintools = self.binutils-unwrapped; }; @@ -84,7 +87,7 @@ makeScopeWithSplicing' { }; binutilsNoLibc = pkgs.wrapBintoolsWith { - libc = targetPackages.preLibcHeaders; + libc = targetPackages.preLibcHeaders or preLibcHeaders; bintools = self.binutils-unwrapped; }; @@ -110,7 +113,7 @@ makeScopeWithSplicing' { iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; - targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; + targetIosSdkPkgs = (targetPackages.darwin or darwin).iosSdkPkgs; inherit (pkgs.llvmPackages) clang-unwrapped; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index cdf6e9f9439a..d796a2739c91 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -580,6 +580,8 @@ in mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; + morse-driver = callPackage ../os-specific/linux/morse-driver { }; + # compiles but has to be integrated into the kernel somehow # Let's have it uncommented and finish it.. ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 6ac705ba1ade..e034c781aa36 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -160,13 +160,13 @@ rec { { fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-core"; - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { owner = "openresty"; repo = "lua-resty-core"; rev = "v${version}"; - sha256 = "sha256-WUiBFJ8L8NzSGoEwTAw/iHAzPqJqaOUSFyqGeEf+f94=="; + sha256 = "sha256-ba/ahIl8BDfyXIbaN6zVCh3UwY6JbAqqZEpXktOfeYo="; }; propagatedBuildInputs = [ lua-resty-lrucache ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f109780364a2..1d8c79728cfe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1394,8 +1394,6 @@ let ocaml-lua = callPackage ../development/ocaml-modules/ocaml-lua { }; - ocaml_lwt = lwt; - ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; ocaml-migrate-parsetree-1-8 = @@ -1767,6 +1765,8 @@ let prometheus = callPackage ../development/ocaml-modules/prometheus { }; + prometheus-app = callPackage ../development/ocaml-modules/prometheus/app.nix { }; + progress = callPackage ../development/ocaml-modules/progress { }; promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { }; @@ -2251,6 +2251,7 @@ let chacha = throw "chacha has been removed because it has been marked as broken since at least November 2024. It is now vendored inside mirage-crypto, consider using that instead."; # Added 2025-10-11 gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; + ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05 } )).overrideScope liftJaneStreet; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 635664447ddd..72b09d91b201 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1269,7 +1269,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; mainProgram = "cpm"; }; }; @@ -5721,7 +5720,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -6690,7 +6688,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -14482,7 +14479,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -14505,7 +14501,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -17385,7 +17380,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -21313,7 +21307,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -21759,7 +21752,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -22856,7 +22848,6 @@ with self; description = "(DISCOURAGED) Promises/A+ and flow-control helpers"; homepage = "https://github.com/jberger/Mojo-IOLoop-Delay"; license = with lib.licenses; [ artistic2 ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -22884,7 +22875,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -25156,7 +25146,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -25237,7 +25226,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -26597,7 +26585,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -27076,7 +27063,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -32358,7 +32344,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -39100,7 +39085,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; @@ -39119,7 +39103,6 @@ with self; artistic1 gpl1Plus ]; - maintainers = [ maintainers.zakame ]; }; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 321d01c9ba12..44d1093b1bc6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -301,6 +301,7 @@ mapAliases { pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29 percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25 pillow-avif-plugin = throw "'pillow-avif-plugin' has been removed because 'pillow' has native avif support since 11.3"; # added 2025-11-26 + pizzapi = throw "pizzapi was removed because it no longer works"; # added 2025-12-03 plumlightpad = throw "plumlightpad has been removed because the API was shut down"; # added 2025-11-04 Polygon3 = throw "'Polygon3' has been renamed to/replaced by 'polygon3'"; # Converted to throw 2025-10-29 posix_ipc = throw "'posix_ipc' has been renamed to/replaced by 'posix-ipc'"; # Converted to throw 2025-10-29 @@ -327,6 +328,7 @@ mapAliases { pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26 pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11 pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25 + pyflick = throw "pyflick was removed because Flick Electric no longer exists"; # added 2025-12-03 pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29 pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29 PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29 @@ -504,6 +506,7 @@ mapAliases { wxPython_4_2 = throw "'wxPython_4_2' has been renamed to/replaced by 'wxpython'"; # Converted to throw 2025-10-29 x11_hash = throw "'x11_hash' has been renamed to/replaced by 'x11-hash'"; # Converted to throw 2025-10-29 xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29 + xbox-webapi = throw "xbox-webapi was removed because Home Assistant switched to python-xbox"; # added 2025-12-03 XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29 Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29 z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bbc973724f6..eaad41ccd0b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3136,6 +3136,8 @@ self: super: with self; { cot = callPackage ../development/python-modules/cot { inherit (pkgs) qemu; }; + country-list = callPackage ../development/python-modules/country-list { }; + countryguess = callPackage ../development/python-modules/countryguess { }; courlan = callPackage ../development/python-modules/courlan { }; @@ -3230,6 +3232,8 @@ self: super: with self; { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + cs50 = callPackage ../development/python-modules/cs50 { }; + csaf-tool = callPackage ../development/python-modules/csaf-tool { }; csaps = callPackage ../development/python-modules/csaps { }; @@ -4837,6 +4841,8 @@ self: super: with self; { emoji = callPackage ../development/python-modules/emoji { }; + emoji-country-flag = callPackage ../development/python-modules/emoji-country-flag { }; + emojis = callPackage ../development/python-modules/emojis { }; empty-files = callPackage ../development/python-modules/empty-files { }; @@ -4857,6 +4863,8 @@ self: super: with self; { energyflow = callPackage ../development/python-modules/energyflow { }; + energyid-webhooks = callPackage ../development/python-modules/energyid-webhooks { }; + energyzero = callPackage ../development/python-modules/energyzero { }; enlighten = callPackage ../development/python-modules/enlighten { }; @@ -4943,6 +4951,8 @@ self: super: with self; { esprima = callPackage ../development/python-modules/esprima { }; + essent-dynamic-pricing = callPackage ../development/python-modules/essent-dynamic-pricing { }; + essentials = callPackage ../development/python-modules/essentials { }; essentials-openapi = callPackage ../development/python-modules/essentials-openapi { }; @@ -5376,6 +5386,8 @@ self: super: with self; { first = callPackage ../development/python-modules/first { }; + fiscalyear = callPackage ../development/python-modules/fiscalyear { }; + fissix = callPackage ../development/python-modules/fissix { }; fitbit = callPackage ../development/python-modules/fitbit { }; @@ -5384,6 +5396,8 @@ self: super: with self; { fitfile = callPackage ../development/python-modules/fitfile { }; + fitparse = callPackage ../development/python-modules/fitparse { }; + fivem-api = callPackage ../development/python-modules/fivem-api { }; fixerio = callPackage ../development/python-modules/fixerio { }; @@ -5673,6 +5687,8 @@ self: super: with self; { forecast-solar = callPackage ../development/python-modules/forecast-solar { }; + formatron = callPackage ../development/python-modules/formatron { }; + formbox = callPackage ../development/python-modules/formbox { }; formencode = callPackage ../development/python-modules/formencode { }; @@ -5731,8 +5747,6 @@ self: super: with self; { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - froide = toPythonModule (pkgs.froide.override { python3Packages = self; }); - frozendict = callPackage ../development/python-modules/frozendict { }; frozenlist = callPackage ../development/python-modules/frozenlist { }; @@ -5873,6 +5887,8 @@ self: super: with self; { gdsfactory = callPackage ../development/python-modules/gdsfactory { }; + gdstk = callPackage ../development/python-modules/gdstk { }; + ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule ( @@ -5901,6 +5917,8 @@ self: super: with self; { genanki = callPackage ../development/python-modules/genanki { }; + general-sam = callPackage ../development/python-modules/general-sam { }; + generic = callPackage ../development/python-modules/generic { }; genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { }; @@ -6671,6 +6689,8 @@ self: super: with self; { hatch-babel = callPackage ../development/python-modules/hatch-babel { }; + hatch-deps-selector = callPackage ../development/python-modules/hatch-deps-selector { }; + hatch-docstring-description = callPackage ../development/python-modules/hatch-docstring-description { }; @@ -6977,6 +6997,8 @@ self: super: with self; { huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; + hueble = callPackage ../development/python-modules/hueble { }; + huepy = callPackage ../development/python-modules/huepy { }; huey = callPackage ../development/python-modules/huey { }; @@ -7083,6 +7105,8 @@ self: super: with self; { icalendar-compatibility = callPackage ../development/python-modules/icalendar-compatibility { }; + icalendar-searcher = callPackage ../development/python-modules/icalendar-searcher { }; + icalevents = callPackage ../development/python-modules/icalevents { }; icdiff = callPackage ../development/python-modules/icdiff { }; @@ -7940,6 +7964,8 @@ self: super: with self; { kbcstorage = callPackage ../development/python-modules/kbcstorage { }; + kbnf = callPackage ../development/python-modules/kbnf { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { }; @@ -8964,6 +8990,8 @@ self: super: with self; { logbook = callPackage ../development/python-modules/logbook { }; + logboth = callPackage ../development/python-modules/logboth { }; + logfury = callPackage ../development/python-modules/logfury { }; logging-journald = callPackage ../development/python-modules/logging-journald { }; @@ -10431,6 +10459,8 @@ self: super: with self; { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; + mypyllant = callPackage ../development/python-modules/mypyllant { }; + mysql-connector = callPackage ../development/python-modules/mysql-connector { }; mysqlclient = callPackage ../development/python-modules/mysqlclient { }; @@ -12108,8 +12138,6 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; - pizzapi = callPackage ../development/python-modules/pizzapi { }; - pjsua2 = (toPythonModule ( pkgs.pjsip.override { @@ -12793,6 +12821,8 @@ self: super: with self; { pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairobotrest = callPackage ../development/python-modules/pyairobotrest { }; + pyairports = callPackage ../development/python-modules/pyairports { }; pyairtable = callPackage ../development/python-modules/pyairtable { }; @@ -12811,6 +12841,8 @@ self: super: with self; { pyaml-env = callPackage ../development/python-modules/pyaml-env { }; + pyanglianwater = callPackage ../development/python-modules/pyanglianwater { }; + pyannotate = callPackage ../development/python-modules/pyannotate { }; pyannote-audio = callPackage ../development/python-modules/pyannote-audio { }; @@ -13277,8 +13309,6 @@ self: super: with self; { pyflic = callPackage ../development/python-modules/pyflic { }; - pyflick = callPackage ../development/python-modules/pyflick { }; - pyflipper = callPackage ../development/python-modules/pyflipper { }; pyfluidsynth = callPackage ../development/python-modules/pyfluidsynth { }; @@ -13926,12 +13956,20 @@ self: super: with self; { pyobjc-framework-Cocoa = callPackage ../development/python-modules/pyobjc-framework-Cocoa { }; + pyobjc-framework-CoreBluetooth = + callPackage ../development/python-modules/pyobjc-framework-CoreBluetooth + { }; + pyobjc-framework-Quartz = callPackage ../development/python-modules/pyobjc-framework-Quartz { }; pyobjc-framework-Security = callPackage ../development/python-modules/pyobjc-framework-Security { }; pyobjc-framework-WebKit = callPackage ../development/python-modules/pyobjc-framework-WebKit { }; + pyobjc-framework-libdispatch = + callPackage ../development/python-modules/pyobjc-framework-libdispatch + { }; + pyocd = callPackage ../development/python-modules/pyocd { }; pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; @@ -15139,6 +15177,8 @@ self: super: with self; { python-google-nest = callPackage ../development/python-modules/python-google-nest { }; + python-google-weather-api = callPackage ../development/python-modules/python-google-weather-api { }; + python-gvm = callPackage ../development/python-modules/python-gvm { }; python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; @@ -15471,6 +15511,8 @@ self: super: with self; { ; }; + python-xbox = callPackage ../development/python-modules/python-xbox { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; python-xz = callPackage ../development/python-modules/python-xz { }; @@ -20581,8 +20623,6 @@ self: super: with self; { xattr = callPackage ../development/python-modules/xattr { }; - xbox-webapi = callPackage ../development/python-modules/xbox-webapi { }; - xboxapi = callPackage ../development/python-modules/xboxapi { }; xcaplib = callPackage ../development/python-modules/xcaplib { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index db6955850668..0dbfa8b80938 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -112,7 +112,6 @@ let manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; - pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; darwin-tested = if supportDarwin.x86_64 || supportDarwin.aarch64 then @@ -222,7 +221,7 @@ let jobs.metrics jobs.manual jobs.lib-tests - jobs.pkgs-lib-tests + jobs.tests.pkgs-lib.formats-tests.x86_64-linux jobs.stdenv.x86_64-linux jobs.cargo.x86_64-linux jobs.go.x86_64-linux